From: John Spray <john.spray@redhat.com>
Date: Fri, 20 Jun 2014 15:45:12 +0000 (-0400)
Subject: qa: Update data pool ID for vxattrs test
X-Git-Tag: v0.84~161^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82d3fcc7c7afa58dfab9898f278a8ef0f933bb58;p=ceph.git

qa: Update data pool ID for vxattrs test

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/workunits/fs/misc/layout_vxattrs.sh b/qa/workunits/fs/misc/layout_vxattrs.sh
index 4bd543dd5a0..3cb611ded53 100755
--- a/qa/workunits/fs/misc/layout_vxattrs.sh
+++ b/qa/workunits/fs/misc/layout_vxattrs.sh
@@ -22,9 +22,13 @@ getfattr -n ceph.dir.layout file    2>&1 | grep -q 'No such attribute'
 setfattr -n ceph.file.layout.stripe_unit -v 1048576 file2
 setfattr -n ceph.file.layout.stripe_count -v 8 file2
 setfattr -n ceph.file.layout.object_size -v 10485760 file2
+
+# Assumption: that the data pool is called 'data' and has ID '2'
+# (see teuthology.task.ceph.cephfs_setup)
 setfattr -n ceph.file.layout.pool -v data file2
-setfattr -n ceph.file.layout.pool -v 0 file2
+setfattr -n ceph.file.layout.pool -v 2 file2
 getfattr -n ceph.file.layout.pool file2 | grep -q data
+
 getfattr -n ceph.file.layout.stripe_unit file2 | grep -q 1048576
 getfattr -n ceph.file.layout.stripe_count file2 | grep -q 8
 getfattr -n ceph.file.layout.object_size file2 | grep -q 10485760
@@ -52,8 +56,12 @@ getfattr -d -m - dir | grep -q ceph.file.layout      && exit 1 || true
 setfattr -n ceph.dir.layout.stripe_unit -v 1048576 dir
 setfattr -n ceph.dir.layout.stripe_count -v 8 dir
 setfattr -n ceph.dir.layout.object_size -v 10485760 dir
+
+# Assumption: that the data pool is called 'data' and has ID '2'
+# (see teuthology.task.ceph.cephfs_setup)
 setfattr -n ceph.dir.layout.pool -v data dir
-setfattr -n ceph.dir.layout.pool -v 0 dir
+setfattr -n ceph.dir.layout.pool -v 2 dir
+
 getfattr -n ceph.dir.layout dir
 getfattr -n ceph.dir.layout dir | grep -q object_size=10485760
 getfattr -n ceph.dir.layout dir | grep -q stripe_count=8