From: Sidharth Anupkrishnan Date: Wed, 3 Apr 2019 16:23:21 +0000 (-0400) Subject: qa: fs Ignore getfattr errors for ceph.dir.pin X-Git-Tag: v14.2.8~20^2~25^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=140aa533f7d2fd9197063d8b42f8f6eafd631e35;p=ceph.git qa: fs Ignore getfattr errors for ceph.dir.pin Signed-off-by: Sidharth Anupkrishnan (cherry picked from commit 9f40c783db146aa8ee55e4b11da38212f4d90328) Conflicts: qa/tasks/cephfs/test_exports.py - omitted cleanup in _wait_subtrees, a method that does not exist in nautilus. This cleanup does not seem to be related to the bug being fixed. --- diff --git a/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml b/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml index b5842b3ef1b..46334fe16d0 100644 --- a/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml +++ b/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml @@ -1,4 +1,5 @@ tasks: - cephfs_test_runner: + fail_on_skip: false modules: - tasks.cephfs.test_exports diff --git a/qa/tasks/cephfs/test_exports.py b/qa/tasks/cephfs/test_exports.py index 2d95667411d..3ffdb553cf0 100644 --- a/qa/tasks/cephfs/test_exports.py +++ b/qa/tasks/cephfs/test_exports.py @@ -1,5 +1,6 @@ import logging import time +from StringIO import StringIO from tasks.cephfs.fuse_mount import FuseMount from tasks.cephfs.cephfs_test_case import CephFSTestCase @@ -96,10 +97,45 @@ class TestExports(CephFSTestCase): else: self._wait_subtrees(status, 0, [('/1', 0), ('/1/4/5', 1), ('/a', 1), ('/a/b/aa/bb', 0)]) - # Test getfattr - self.assertTrue(self.mount_a.getfattr("1", "ceph.dir.pin") == "0") - self.assertTrue(self.mount_a.getfattr("1/4", "ceph.dir.pin") == "-1") - self.assertTrue(self.mount_a.getfattr("1/4/5", "ceph.dir.pin") == "1") + def test_export_pin_getfattr(self): + self.fs.set_max_mds(2) + self.fs.wait_for_daemons() + + status = self.fs.status() + + self.mount_a.run_shell(["mkdir", "-p", "1/2/3"]) + self._wait_subtrees(status, 0, []) + + # pin /1 to rank 0 + self.mount_a.setfattr("1", "ceph.dir.pin", "1") + self._wait_subtrees(status, 1, [('/1', 1)]) + + # pin /1/2 to rank 1 + self.mount_a.setfattr("1/2", "ceph.dir.pin", "1") + self._wait_subtrees(status, 1, [('/1', 1), ('/1/2', 1)]) + + # change pin /1/2 to rank 0 + self.mount_a.setfattr("1/2", "ceph.dir.pin", "0") + self._wait_subtrees(status, 1, [('/1', 1), ('/1/2', 0)]) + self._wait_subtrees(status, 0, [('/1', 1), ('/1/2', 0)]) + + # change pin /1/2/3 to (presently) non-existent rank 2 + self.mount_a.setfattr("1/2/3", "ceph.dir.pin", "2") + self._wait_subtrees(status, 0, [('/1', 1), ('/1/2', 0)]) + + if len(list(status.get_standbys())): + self.fs.set_max_mds(3) + self.fs.wait_for_state('up:active', rank=2) + self._wait_subtrees(status, 0, [('/1', 1), ('/1/2', 0), ('/1/2/3', 2)]) + + if not isinstance(self.mount_a, FuseMount): + p = self.mount_a.client_remote.run(args=['uname', '-r'], stdout=StringIO(), wait=True) + dir_pin = self.mount_a.getfattr("1", "ceph.dir.pin") + log.debug("mount.getfattr('1','ceph.dir.pin'): %s " % dir_pin) + if str(p.stdout.getvalue()) < "5" and not(dir_pin): + self.skipTest("Kernel does not support getting the extended attribute ceph.dir.pin") + self.assertTrue(self.mount_a.getfattr("1", "ceph.dir.pin") == "1") + self.assertTrue(self.mount_a.getfattr("1/2", "ceph.dir.pin") == "0") if (len(self.fs.get_active_names()) > 2): self.assertTrue(self.mount_a.getfattr("1/2/3", "ceph.dir.pin") == "2")