summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2014-07-17 23:44:42 +0530
committerVijay Bellur <vbellur@redhat.com>2014-07-18 09:31:11 -0700
commit6aafb3a64a661e0f8e61ca3f5bfdf15089ea8df0 (patch)
treed3a7ff3e549e664a517d55c201634f7bddde7816
parent950f9d8abe714708ca62b86f304e7417127e1132 (diff)
Update rfc.sh to release-3.6v3.6.0alpha1
Change-Id: I4421b2891309d797d8fb7c14d1eb78e483453660 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/8328 Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rwxr-xr-xrfc.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/rfc.sh b/rfc.sh
index 04efa6f3e5f..bafda37d78a 100755
--- a/rfc.sh
+++ b/rfc.sh
@@ -1,7 +1,7 @@
#!/bin/sh -e
-branch="master";
+branch="release-3.6";
set_hooks_commit_msg()
64963a8a244fc5cb7028315e458529'>xlators/cluster/dht/src/dht-common.c
@@ -1578,12 +1578,27 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
local->inode = inode_ref (loc->inode);
- /* NOTE: we don't require 'trusted.glusterfs.dht.linkto' attribute,
- * revalidates directly go to the cached-subvolume.
- */
ret = dict_set_uint32 (local->xattr_req,
conf->xattr_name, 4 * 4);
-
+ if (ret) {
+ gf_msg (this->name, GF_LOG_WARNING, ENOMEM,
+ DHT_MSG_DICT_SET_FAILED,
+ "Failed to set dictionary value:key = %s for "
+ "path %s", conf->xattr_name, loc->path);
+ goto err;
+ }
+ /* need it in case file is not found on cached file
+ * on revalidate path and we may encounter linkto files on
+ * with dht_lookup_everywhere*/
+ ret = dict_set_uint32 (local->xattr_req,
+ conf->link_xattr_name, 256);
+ if (ret < 0) {
+ gf_msg (this->name, GF_LOG_WARNING, ENOMEM,
+ DHT_MSG_DICT_SET_FAILED,
+ "Failed to set dictionary value:key = %s for "
+ "path %s", conf->link_xattr_name, loc->path);
+ goto err;
+ }
if (IA_ISDIR (local->inode->ia_type)) {
local->call_cnt = call_cnt = conf->subvolume_cnt;
for (i = 0; i < call_cnt; i++) {
@@ -1601,7 +1616,13 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
'in-migration' state */
ret = dict_set_uint32 (local->xattr_req,
GLUSTERFS_OPEN_FD_COUNT, 4);
-
+ if (ret) {
+ gf_msg (this->name, GF_LOG_WARNING, ENOMEM,
+ DHT_MSG_DICT_SET_FAILED,
+ "Failed to set dictionary value:key = %s for "
+ "path %s", GLUSTERFS_OPEN_FD_COUNT, loc->path);
+ goto err;
+ }
/* need it for dir self-heal */
dht_check_and_set_acl_xattr_req (loc->inode, local->xattr_req);
@@ -1618,15 +1639,34 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
/* TODO: remove the hard-coding */
ret = dict_set_uint32 (local->xattr_req,
conf->xattr_name, 4 * 4);
+ if (ret) {
+ gf_msg (this->name, GF_LOG_WARNING, ENOMEM,
+ DHT_MSG_DICT_SET_FAILED,
+ "Failed to set dictionary value:key = %s for "
+ "path %s", conf->xattr_name, loc->path);
+ goto err;
+ }
ret = dict_set_uint32 (local->xattr_req,
conf->link_xattr_name, 256);
-
+ if (ret) {
+ gf_msg (this->name, GF_LOG_WARNING, ENOMEM,
+ DHT_MSG_DICT_SET_FAILED,
+ "Failed to set dictionary value:key = %s for "
+ "path %s", conf->link_xattr_name, loc->path);
+ goto err;
+ }
/* need it for self-healing linkfiles which is
'in-migration' state */
ret = dict_set_uint32 (local->xattr_req,
GLUSTERFS_OPEN_FD_COUNT, 4);
-
+ if (ret) {
+ gf_msg (this->name, GF_LOG_WARNING, ENOMEM,
+ DHT_MSG_DICT_SET_FAILED,
+ "Failed to set dictionary value:key = %s for "
+ "path %s", GLUSTERFS_OPEN_FD_COUNT, loc->path);
+ goto err;
+ }
/* need it for dir self-heal */
dht_check_and_set_acl_xattr_req (loc->inode, local->xattr_req);