diff options
| author | N Balachandran <nbalacha@redhat.com> | 2017-06-01 22:13:41 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2017-06-07 04:02:24 +0000 |
| commit | c9860430a77f20ddfec532819542bb1d0187c06e (patch) | |
| tree | 6f5cbae651ae6c89363cb2a0dc109acdcbac016d /xlators/cluster/dht/src/dht-common.c | |
| parent | 88c67b72b1d5843d11ce7cba27dd242bd0c23c6a (diff) | |
cluster/dht: Include dirs in rebalance estimates
Empty directories were not being considered while
calculating rebalance estimates leading to negative
time-left values being displayed as part of the
rebalance status.
Change-Id: I48d41d702e72db30af10e6b87b628baa605afa98
BUG: 1457985
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: https://review.gluster.org/17448
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 109106082e6..dfc58e49c17 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -9056,7 +9056,7 @@ dht_notify (xlator_t *this, int event, void *data, ...) DHT_MSG_CHILD_DOWN, "Received CHILD_DOWN. Exiting"); if (conf->defrag) { - gf_defrag_stop (conf->defrag, + gf_defrag_stop (conf, GF_DEFRAG_STATUS_FAILED, NULL); } else { kill (getpid(), SIGTERM); @@ -9139,7 +9139,7 @@ dht_notify (xlator_t *this, int event, void *data, ...) if ((cmd == GF_DEFRAG_CMD_STATUS) || (cmd == GF_DEFRAG_CMD_STATUS_TIER) || (cmd == GF_DEFRAG_CMD_DETACH_STATUS)) - gf_defrag_status_get (defrag, output); + gf_defrag_status_get (conf, output); else if (cmd == GF_DEFRAG_CMD_START_DETACH_TIER) gf_defrag_start_detach_tier(defrag); else if (cmd == GF_DEFRAG_CMD_DETACH_START) @@ -9147,7 +9147,7 @@ dht_notify (xlator_t *this, int event, void *data, ...) else if (cmd == GF_DEFRAG_CMD_STOP || cmd == GF_DEFRAG_CMD_STOP_DETACH_TIER || cmd == GF_DEFRAG_CMD_DETACH_STOP) - gf_defrag_stop (defrag, + gf_defrag_stop (conf, GF_DEFRAG_STATUS_STOPPED, output); else if (cmd == GF_DEFRAG_CMD_PAUSE_TIER) ret = gf_defrag_pause_tier (this, defrag); |