From: Sage Weil <sage.weil@dreamhost.com>
Date: Tue, 7 Jun 2011 20:34:57 +0000 (-0700)
Subject: qa: add rename dir checks
X-Git-Tag: v0.30~102^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2969161b9e60a009e2a3884b5a1f46ca6338b2e9;p=ceph.git

qa: add rename dir checks

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/qa/mds/rename/pri_nul.sh b/qa/mds/rename/pri_nul.sh
index 42743b85e06..b3e407d046c 100755
--- a/qa/mds/rename/pri_nul.sh
+++ b/qa/mds/rename/pri_nul.sh
@@ -1,11 +1,30 @@
 #!/bin/sh -ex
 
-touch mnt/a/file1
-touch mnt/a/file2
-
 # srcdn=destdn
+touch mnt/a/file1
 mv mnt/a/file1 mnt/a/file1.renamed
 
 # different
+touch mnt/a/file2
 mv mnt/a/file2 mnt/b
 
+# dir: srcdn=destdn
+mkdir mnt/a/dir1
+mv mnt/a/dir1 mnt/a/dir1.renamed
+
+# dir: diff
+mkdir mnt/a/dir2
+mv mnt/a/dir2 mnt/b/dir2
+
+# dir: diff, child subtree on target
+mkdir -p mnt/a/dir3/child/foo
+./ceph mds tell 0 export_dir /a/dir3/child 1
+sleep 5
+mv mnt/a/dir3 mnt/b/dir3
+
+# dir: diff, child subtree on other
+mkdir -p mnt/a/dir4/child/foo
+./ceph mds tell 0 export_dir /a/dir4/child 2
+sleep 5
+mv mnt/a/dir4 mnt/b/dir4
+
diff --git a/qa/mds/rename/pri_pri.sh b/qa/mds/rename/pri_pri.sh
index c5c550c9eb6..86ea43da143 100755
--- a/qa/mds/rename/pri_pri.sh
+++ b/qa/mds/rename/pri_pri.sh
@@ -1,13 +1,21 @@
 #!/bin/sh -ex
 
+# srcdn=destdn
 touch mnt/a/file1
 touch mnt/a/file2
-touch mnt/a/file3
-touch mnt/b/file4
-
-# srcdn=destdn
 mv mnt/a/file1 mnt/a/file2
 
 # different (srcdn != destdn)
+touch mnt/a/file3
+touch mnt/b/file4
 mv mnt/a/file3 mnt/b/file4
 
+# dir, srcdn=destdn
+mkdir mnt/a/dir1
+mkdir mnt/a/dir2
+mv -T mnt/a/dir1 mnt/a/dir2
+
+# dir, different
+mkdir mnt/a/dir3
+mkdir mnt/b/dir4
+mv -T mnt/a/dir3 mnt/b/dir4