summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2013-05-22 11:59:27 +0530
committerVijay Bellur <vbellur@redhat.com>2013-06-05 05:22:52 -0700
commit7413ed951f9b5615dc63f94a8e702cb8f6a8bd98 (patch)
treef1960bb62fdd21912919b95e1a6498b15f2ac28c /libglusterfs
parent5c1710ed60ccb151ccd7a2890b24bb99518d36da (diff)
cluster/afr: Avoid order mismatch in blocking entrylks
Problem: When taking blocking entrylks, afr orders the entrylks based on uuid_compare of gfids of parent dirs, if they are equal then it orders them based on the basenames. While this approach works fine, the implementation assumes loc->gfids to be populated at the time of the comparison, but loc may have gfid in loc->inode->gfid instead of loc->gfid which was leading to order mismatches and dead-locks. Fix: Implemented loc_gfid which gives gfid by checking both loc->gfid, loc->inode->gfid. Used this for ordering the blocking entrylks. Change-Id: Ib0db36bbaf0df09fa87c3c3bb6a834db74fc2154 BUG: 965987 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/5062 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/xlator.c16
-rw-r--r--libglusterfs/src/xlator.h1
2 files changed, 14 insertions, 3 deletions
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
index d8997bc..f9e5db6 100644
--- a/libglusterfs/src/xlator.c
+++ b/libglusterfs/src/xlator.c
@@ -618,10 +618,12 @@ out:
return ret;
}
-char*
-loc_gfid_utoa (loc_t *loc)
+void
+loc_gfid (loc_t *loc, uuid_t gfid)
{
- uuid_t gfid={0};
+ if (!gfid)
+ goto out;
+ uuid_clear (gfid);
if (!loc)
goto out;
@@ -630,6 +632,14 @@ loc_gfid_utoa (loc_t *loc)
else if (loc->inode && (!uuid_is_null (loc->inode->gfid)))
uuid_copy (gfid, loc->inode->gfid);
out:
+ return;
+}
+
+char*
+loc_gfid_utoa (loc_t *loc)
+{
+ uuid_t gfid;
+ loc_gfid (loc, gfid);
return uuid_utoa (gfid);
}
diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h
index 071a4bd..43fd063 100644
--- a/libglusterfs/src/xlator.h
+++ b/libglusterfs/src/xlator.h
@@ -886,6 +886,7 @@ int loc_copy (loc_t *dst, loc_t *src);
#define loc_dup(src, dst) loc_copy(dst, src)
void loc_wipe (loc_t *loc);
int loc_path (loc_t *loc, const char *bname);
+void loc_gfid (loc_t *loc, uuid_t gfid);
char* loc_gfid_utoa (loc_t *loc);
int xlator_mem_acct_init (xlator_t *xl, int num_types);
int is_gf_log_command (xlator_t *trans, const char *name, char *value);