diff options
| author | N Balachandran <nbalacha@redhat.com> | 2015-12-03 12:52:54 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-12-03 10:01:07 -0800 |
| commit | 96fc7f64da2ef09e82845a7ab97574f511a9aae5 (patch) | |
| tree | 625d0f3e162845acf5d1d0fb63a0cd929669bcb6 /xlators/cluster/dht/src/dht-rebalance.c | |
| parent | cae9512d60f5715459ea5883c657c679197982d9 (diff) | |
cluster/tier: fix loading tier.so into glusterd
glusterd occasionally loads shared libraries of 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
BUG: 1287842
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>
Diffstat (limited to 'xlators/cluster/dht/src/dht-rebalance.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index f33ba227797..eb9da77d978 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -3361,15 +3361,8 @@ gf_defrag_start_crawl (void *data) } if (defrag->cmd == GF_DEFRAG_CMD_START_TIER) { - methods = conf->methods; - if (!methods) { - gf_msg (this->name, GF_LOG_ERROR, 0, - DHT_MSG_LOG_TIER_ERROR, - "Methods invalid for translator."); - defrag->defrag_status = GF_DEFRAG_STATUS_FAILED; - ret = -1; - goto out; - } + methods = &(conf->methods); + methods->migration_other(this, defrag); if (defrag->cmd == GF_DEFRAG_CMD_START_DETACH_TIER) { |