diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2013-12-17 01:12:05 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-12-23 07:00:37 -0800 |
| commit | 592bf35c4b84df2693f3e113355d86316beaf26d (patch) | |
| tree | 3c47f82366b2cd3f163a997fdefb2a47e330d287 /xlators | |
| parent | 94ed403ec213ee955acc55cc4a04f7c39470855b (diff) | |
glusterd: rebalance to ref volinfo before starting
Backport of http://review.gluster.org/6522
Change-Id: Ib316897dcbd0748bfb3bfcda186b9fe30c07f80f
BUG: 1038051
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/6570
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index da29aaf0218..ae08dba6aaf 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -164,6 +164,9 @@ __glusterd_defrag_notify (struct rpc_clnt *rpc, void *mydata, rpc->conn.trans->name); break; } + case RPC_CLNT_DESTROY: + glusterd_volinfo_unref (volinfo); + break; default: gf_log ("", GF_LOG_TRACE, "got some other RPC event %d", event); @@ -329,6 +332,7 @@ glusterd_rebalance_rpc_create (glusterd_volinfo_t *volinfo) goto out; } + glusterd_volinfo_ref (volinfo); synclock_unlock (&priv->big_lock); ret = glusterd_rpc_create (&defrag->rpc, options, glusterd_defrag_notify, volinfo); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 9a4072ce819..be614f9bb48 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1189,7 +1189,7 @@ glusterd_service_stop (const char *service, char *pidfile, int sig, gf_log (this->name, GF_LOG_DEBUG, "%s is already stopped", service); ret = 0; - break; + goto out; default: gf_log (this->name, GF_LOG_ERROR, "Failed to kill %s: %s", service, strerror (errno)); @@ -3466,9 +3466,11 @@ gd_check_and_update_rebalance_info (glusterd_volinfo_t *old_volinfo, old = &(old_volinfo->rebal); new = &(new_volinfo->rebal); - /* If the old task-id is not null and the task-id's don't match, the old - * volinfo task is stale and should be cleaned up - */ + //Disconnect from rebalance process + if (old->defrag && old->defrag->rpc) { + rpc_transport_disconnect (old->defrag->rpc->conn.trans); + } + if (!uuid_is_null (old->rebalance_id) && uuid_compare (old->rebalance_id, new->rebalance_id)) { (void)gd_stop_rebalance_process (old_volinfo); @@ -3485,11 +3487,11 @@ gd_check_and_update_rebalance_info (glusterd_volinfo_t *old_volinfo, new->skipped_files = old->skipped_files; new->rebalance_failures = old->rebalance_failures; new->rebalance_time = old->rebalance_time; - new->defrag = old->defrag; new->dict = (old->dict ? dict_ref (old->dict) : NULL); /* glusterd_rebalance_t.{op, id, defrag_cmd} are copied during volume * import + * a new defrag object should come to life with rebalance being restarted */ out: return ret; |