andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: Log hostname of the peer where there is cksum/version mismatch

Browse Source 
Change-Id: I08065aaa3c140d4b02af4ca38f5f4d00d7f0c2bb
BUG: 958739
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/4937
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Krutika Dhananjay 2013-03-20 17:33:10 +05:30 committed by Vijay Bellur
parent b6e10801be
commit 254181428e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xlators/mgmt/glusterd/src/glusterd-sm.c
View File

@ -650,7 +650,8 @@ glusterd_ac_handle_friend_add_req (glusterd_friend_sm_event_t *event, void *ctx)
uuid_copy (peerinfo->uuid, ev_ctx->uuid);
//Build comparison logic here.
ret = glusterd_compare_friend_data (ev_ctx->vols, &status);
ret = glusterd_compare_friend_data (ev_ctx->vols, &status,
peerinfo->hostname);
if (ret)
goto out;

16
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -2107,7 +2107,8 @@ out:
}
int32_t
glusterd_compare_friend_volume (dict_t *vols, int32_t count, int32_t *status)
glusterd_compare_friend_volume (dict_t *vols, int32_t count, int32_t *status,
char *hostname)
{
int32_t ret = -1;
@ -2143,8 +2144,8 @@ glusterd_compare_friend_volume (dict_t *vols, int32_t count, int32_t *status)
//Mismatch detected
ret = 0;
gf_log ("", GF_LOG_ERROR, "Version of volume %s differ."
"local version = %d, remote version = %d",
volinfo->volname, volinfo->version, version);
"local version = %d, remote version = %d on peer %s",
volinfo->volname, volinfo->version, version, hostname);
*status = GLUSTERD_VOL_COMP_UPDATE_REQ;
goto out;
} else if (version < volinfo->version) {
@ -2163,8 +2164,8 @@ glusterd_compare_friend_volume (dict_t *vols, int32_t count, int32_t *status)
if (cksum != volinfo->cksum) {
ret = 0;
gf_log ("", GF_LOG_ERROR, "Cksums of volume %s differ."
" local cksum = %d, remote cksum = %d",
volinfo->volname, volinfo->cksum, cksum);
" local cksum = %u, remote cksum = %u on peer %s",
volinfo->volname, volinfo->cksum, cksum, hostname);
*status = GLUSTERD_VOL_COMP_RJT;
goto out;
}
@ -3154,7 +3155,7 @@ out:
}
int32_t
glusterd_compare_friend_data (dict_t *vols, int32_t *status)
glusterd_compare_friend_data (dict_t *vols, int32_t *status, char *hostname)
{
int32_t ret = -1;
int32_t count = 0;
@ -3171,7 +3172,8 @@ glusterd_compare_friend_data (dict_t *vols, int32_t *status)
goto out;
while (i <= count) {
ret = glusterd_compare_friend_volume (vols, i, status);
ret = glusterd_compare_friend_volume (vols, i, status,
hostname);
if (ret)
goto out;

2
xlators/mgmt/glusterd/src/glusterd-utils.h
View File

@ -155,7 +155,7 @@ int32_t
glusterd_build_volume_dict (dict_t **vols);
int32_t
glusterd_compare_friend_data (dict_t *vols, int32_t *status);
glusterd_compare_friend_data (dict_t *vols, int32_t *status, char *hostname);
int
glusterd_volume_compute_cksum (glusterd_volinfo_t *volinfo);