summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorshishir gowda <shishirng@gluster.com>2010-09-01 05:13:29 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-01 05:16:19 -0700
commit736d553ed7f98f783074b98499de5fb3c024c795 (patch)
tree42f88e689934b1ce09dc13d4e544a37d304417c8 /xlators
parente7b0551ef5eb9a17ab97c34fc148de880b546217 (diff)
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 <shishirng@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1498 (Peer status duplicate entries on restart of glusterd) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1498
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.c1
2 files changed, 2 insertions, 1 deletions
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);
}
}