From 736d553ed7f98f783074b98499de5fb3c024c795 Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Wed, 1 Sep 2010 05:13:29 +0000 Subject: peer status returns duplicate peer info on restart removing the peerinfo file for hostname once peerinfo is stored in the uuid file name. Signed-off-by: shishir gowda Signed-off-by: Vijay Bellur BUG: 1498 (Peer status duplicate entries on restart of glusterd) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1498 --- xlators/mgmt/glusterd/src/glusterd-handler.c | 2 +- xlators/mgmt/glusterd/src/glusterd-store.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 28812538f..7ecebd051 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -1130,7 +1130,7 @@ brick_validation: hostname) && !strcmp(brickinfo->path, tmpbrkinfo->path))) { snprintf(err_str, 1048, "Brick %s already" - "in use", brick); + " in use", brick); gf_log ("glusterd", GF_LOG_ERROR, "%s", err_str); err_ret = 1; diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 122cb7320..5f65cf1cf 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1184,6 +1184,7 @@ glusterd_store_update_peerinfo (glusterd_peerinfo_t *peerinfo) gf_log ("", GF_LOG_DEBUG, "Destroying store handle"); glusterd_store_handle_destroy (peerinfo->shandle); peerinfo->shandle = NULL; + ret = remove (hostname_path); } } -- cgit