diff options
author | N Balachandran <nbalacha@redhat.com> | 2015-12-04 10:34:37 +0530 |
---|---|---|
committer | Dan Lambright <dlambrig@redhat.com> | 2015-12-04 05:44:32 -0800 |
commit | 0ef60a5c371359d2a5d0d8684a8a58f1f5801525 (patch) | |
tree | 6f1cd62fc41f510525d047516c4e3d87ad351db8 /xlators/cluster/dht/src/dht-shared.c | |
parent | 543380147e7b035ac034672cf69a391e4d76e5ff (diff) |
cluster/tier: fix loading tier.so into glusterd
The glusterd process loads the shared libraries of client translators.
This failed for tiering due to a reference to dht_methods which is
defined as a global variable which is not necessary.
The global variable has been removed and this is now a member of
dht_conf and is now initialised in the *_init calls.
> Change-Id: Ifa0a21e3962b5cd8d9b927ef1d087d3b25312953
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
> Reviewed-on: http://review.gluster.org/12863
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
>Tested-by: Dan Lambright <dlambrig@redhat.com>
(cherry picked from commit 96fc7f64da2ef09e82845a7ab97574f511a9aae5)
Change-Id: If3cc908ebfcd1f165504f15db2e3079d97f3132e
BUG: 1288352
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12877
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-shared.c')
-rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 75957d587e5..9d869e39f0e 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -569,6 +569,32 @@ out: return ret; } + + +int +dht_init_methods (xlator_t *this) +{ + int ret = -1; + dht_conf_t *conf = NULL; + dht_methods_t *methods = NULL; + + GF_VALIDATE_OR_GOTO ("dht", this, err); + + conf = this->private; + methods = &(conf->methods); + + methods->migration_get_dst_subvol = dht_migration_get_dst_subvol; + methods->migration_needed = dht_migration_needed; + methods->migration_other = NULL; + methods->layout_search = dht_layout_search; + + ret = 0; +err: + return ret; +} + + + int dht_init (xlator_t *this) { @@ -808,7 +834,8 @@ dht_init (xlator_t *this) if (dht_set_subvol_range(this)) goto err; - conf->methods = &dht_methods; + if (dht_init_methods (this)) + goto err; return 0; |