From 9723d353c6ca41aec620da21563a6ade79c71c59 Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Fri, 19 Aug 2016 10:33:50 +0530 Subject: dht: "replica.split-brain-status" attribute value is not correct Problem: In a distributed-replicate volume attribute "replica.split-brain-status" value does not display split-brain condition though directory is in split-brain. If directory is in split brain on mutiple replica-pairs it does not show full list of replica pairs. Solution: Update the dht_aggregate code to aggregate the xattr value in this specific condition. Fix: 1) function getChoices returns the choices from split-brain status string. 2) function add_opt adding the choices to local buffer to store in dictionary 3) For the key "replica.split-brain-status" function dht_aggregate call dht_aggregate_split_brain_xattr to prepare the list. Test: To verify the patch followed below steps 1) Create a distributed replica volume and create mount point 2) Stop heal daemon 3) Touch file and directories on mount point mkdir test{1..5};touch tmp{1..5} 4) Down brick process on one of the replica set pkill -9 glusterfsd 5) Change permission of dir on mount point chmod 755 test{1..5} 6) Restart brick process on node with force option 7) kill brick process on other node in same replica set 8) Change permission of dir again on mount point chmod 766 test{1..5} 9) Reexecute same step from 4-9 on other replica set also 10) After check heal status on server it will show dir's are in split brain on all replica sets 11) After check the replica.split-brain-status attr on mount point it will show wrong status of split brain. 12) After apply the patch the attribute shows correct value. > Change-Id: Icdfd72005a4aa82337c342762775a3d1761bbe4a > Signed-off-by: Mohit Agrawal > Reviewed-on: http://review.gluster.org/15201 > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: Raghavendra G > (cherry picked from commit c4e9ec653c946002ab6d4c71ee8e6df056438a04) Change-Id: Ia5234e8a2291a7e8a7211c82368f4df1c99fa099 Backport of commit c4e9ec653c946002ab6d4c71ee8e6df056438a04 BUG: 1375099 Signed-off-by: Mohit Agrawal Reviewed-on: http://review.gluster.org/15466 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra G --- xlators/cluster/dht/src/dht-common.c | 212 +++++++++++++++++++++++++++++++++-- xlators/cluster/dht/src/dht-common.h | 10 ++ 2 files changed, 210 insertions(+), 12 deletions(-) (limited to 'xlators') diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 7ff757a634d..83a2fe8d138 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -131,6 +131,190 @@ out: } +int add_opt(char **optsp, const char *opt) +{ + char *newopts = NULL; + unsigned oldsize = 0; + unsigned newsize = 0; + + if (*optsp == NULL) + newopts = gf_strdup (opt); + else { + oldsize = strlen (*optsp); + newsize = oldsize + 1 + strlen (opt) + 1; + newopts = GF_REALLOC (*optsp, newsize); + if (newopts) + sprintf (newopts + oldsize, ",%s", opt); + } + if (newopts == NULL) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_NO_MEMORY, + "Error to add choices in buffer in add_opt"); + return -1; + } + *optsp = newopts; + return 0; +} + +/* Return Choice list from Split brain status */ +char * +getChoices (const char *value) +{ + int i = 0; + char *ptr = NULL; + char *tok = NULL; + char *result = NULL; + char *newval = NULL; + + ptr = strstr (value, "Choices:"); + if (!ptr) { + result = ptr; + goto out; + } + + newval = gf_strdup (ptr); + if (!newval) { + result = newval; + goto out; + } + + tok = strtok (newval, ":"); + if (!tok) { + result = tok; + goto out; + } + + while (tok) { + i++; + if (i == 2) + break; + tok = strtok (NULL, ":"); + } + + result = gf_strdup (tok); + +out: + if (newval) + GF_FREE (newval); + + return result; +} + +/* This function prepare a list of choices for key + (replica.split-brain-status) in case of metadata split brain + only on the basis of key-value passed to this function. + After prepare the list of choices it update the same key in dict + with this value to reflect the same in + replica.split-brain-status attr for file. + +*/ + +int +dht_aggregate_split_brain_xattr (dict_t *dst, char *key, data_t *value) +{ + + int ret = 0; + char *oldvalue = NULL; + char *old_choice = NULL; + char *new_choice = NULL; + char *full_choice = NULL; + char *status = NULL; + + if (value == NULL) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_DATA_NULL, + "GF_AFR_SBRAIN_STATUS value is NULL"); + ret = -1; + goto out; + } + + ret = dict_get_str (dst, key, &oldvalue); + if (ret) + goto out; + + if (oldvalue && (strstr (oldvalue, "not"))) { + gf_msg_debug ("dht", 0, + "Need to update split-brain status in dict"); + ret = -1; + goto out; + } + if (oldvalue && (strstr (oldvalue, "metadata-split-brain:yes")) + && (strstr (oldvalue, "data-split-brain:no"))) { + if (strstr (value->data, "not")) { + gf_msg_debug ("dht", 0, + "No need to update split-brain status"); + ret = 0; + goto out; + } + if (strstr (value->data, "yes") && + (strncmp (oldvalue, value->data, strlen(oldvalue)))) { + old_choice = getChoices (oldvalue); + if (!old_choice) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_NO_MEMORY, + "Error to get choices"); + ret = -1; + goto out; + } + + ret = add_opt (&full_choice, old_choice); + if (ret) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_NO_MEMORY, + "Error to add choices"); + ret = -1; + goto out; + } + + new_choice = getChoices (value->data); + if (!new_choice) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_NO_MEMORY, + "Error to get choices"); + ret = -1; + goto out; + } + + ret = add_opt (&full_choice, new_choice); + if (ret) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_NO_MEMORY, + "Error to add choices "); + ret = -1; + goto out; + } + ret = gf_asprintf (&status, + "data-split-brain:%s " + "metadata-split-brain:%s Choices:%s", + "no", "yes", full_choice); + + if (-1 == ret) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_NO_MEMORY, + "Error to prepare status "); + goto out; + } + ret = dict_set_dynstr (dst, key, status); + if (ret) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_DICT_SET_FAILED, + "Failed to set full choice"); + } + } + } + +out: + if (old_choice) + GF_FREE (old_choice); + if (new_choice) + GF_FREE (new_choice); + if (full_choice) + GF_FREE (full_choice); + + return ret; +} + + int dht_aggregate (dict_t *this, char *key, data_t *value, void *data) @@ -141,18 +325,22 @@ dht_aggregate (dict_t *this, char *key, data_t *value, void *data) dst = data; - if (strcmp (key, QUOTA_SIZE_KEY) == 0) { + /* compare split brain xattr only */ + if (strcmp (key, GF_AFR_SBRAIN_STATUS) == 0) { + ret = dht_aggregate_split_brain_xattr(dst, key, value); + if (!ret) + goto out; + } else if (strcmp (key, QUOTA_SIZE_KEY) == 0) { ret = dht_aggregate_quota_xattr (dst, key, value); if (ret) { gf_msg ("dht", GF_LOG_WARNING, 0, DHT_MSG_AGGREGATE_QUOTA_XATTR_FAILED, "Failed to aggregate quota xattr"); - goto out; } + goto out; } else if (fnmatch (GF_XATTR_STIME_PATTERN, key, FNM_NOESCAPE) == 0) { ret = gf_get_min_stime (THIS, dst, key, value); - if (ret < 0) - goto out; + goto out; } else { /* compare user xattrs only */ if (!strncmp (key, "user.", strlen ("user."))) { @@ -165,16 +353,16 @@ dht_aggregate (dict_t *this, char *key, data_t *value, void *data) key); } } - ret = dict_set (dst, key, value); - if (ret) { - gf_msg ("dht", GF_LOG_WARNING, 0, - DHT_MSG_DICT_SET_FAILED, - "Failed to set dictionary value: key = %s", - key); - } } - ret = 0; + ret = dict_set (dst, key, value); + if (ret) { + gf_msg ("dht", GF_LOG_WARNING, 0, + DHT_MSG_DICT_SET_FAILED, + "Failed to set dictionary value: key = %s", + key); + } + out: return ret; } diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index b15c2064226..6ea610cd1ef 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -1215,4 +1215,14 @@ dht_get_lock_subvolume (xlator_t *this, struct gf_flock *lock, int dht_lk_inode_unref (call_frame_t *frame, int32_t op_ret); +int +add_opt(char **optsp, const char *opt); + +char * +getChoices (const char *value); + +int +dht_aggregate_split_brain_xattr (dict_t *dst, char *key, data_t *value); + + #endif/* _DHT_H */ -- cgit