summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2013-10-11 00:20:15 -0700
committerAnand Avati <avati@redhat.com>2013-11-21 13:08:32 -0800
commit544dee895a43ec9bb98fc8ace3d124d44bb617f2 (patch)
tree4575b15f4845e84100e7895b63e2f56975ff9618 /api
parentd13bf457d489559fd8c011533b2201a113243d71 (diff)
syncops: expose @flags in syncop_rmdir()
Change-Id: I9b73c1db728e4cb3948fc118cceb292b21d48b96 BUG: 1021686 Signed-off-by: Anand Avati <avati@redhat.com> Reviewed-on: http://review.gluster.org/6112 Reviewed-by: Amar Tumballi <amarts@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs-fops.c2
-rw-r--r--api/src/glfs-handleops.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index 93c5101a015..f3ac335fb39 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -1563,7 +1563,7 @@ retry:
goto out;
}
- ret = syncop_rmdir (subvol, &loc);
+ ret = syncop_rmdir (subvol, &loc, 0);
ESTALE_RETRY (ret, errno, reval, &loc, retry);
diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c
index 9c707a619a5..0f996d3a2da 100644
--- a/api/src/glfs-handleops.c
+++ b/api/src/glfs-handleops.c
@@ -680,7 +680,7 @@ glfs_h_unlink (struct glfs *fs, struct glfs_object *parent, const char *path)
goto out;
}
} else {
- ret = syncop_rmdir (subvol, &loc);
+ ret = syncop_rmdir (subvol, &loc, 0);
if (ret != 0) {
goto out;
}
d/fd | grep -iw $L3 | grep -v ".glusterfs" | wc -l`
+TEST [ $n -eq 0 ]
+
+# Mount the brick root
+TEST mkdir -p $brick_root
+TEST mount -t xfs -o nouuid /dev/test_vg_3/brick_lvm $brick_root
+
+# Replace brick_pid file to test brick_attach code
+TEST cp $b1_pid_file $b3_pid_file
+
+# Start the volume all brick should be up
+TEST $CLI volume start $V0 force
+
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 3 count_up_bricks
+EXPECT 1 count_brick_processes
+
+# Make sure every brick root should be consumed by a brick process
+n=`ls -lrth /proc/$brick_pid/fd | grep -iw $L1 | grep -v ".glusterfs" | wc -l`
+TEST [ $n -eq 1 ]
+n=`ls -lrth /proc/$brick_pid/fd | grep -iw $L2 | grep -v ".glusterfs" | wc -l`
+TEST [ $n -eq 1 ]
+n=`ls -lrth /proc/$brick_pid/fd | grep -iw $L3 | grep -v ".glusterfs" | wc -l`
+TEST [ $n -eq 1 ]
+
+cleanup