tasks/cephfs/filesystem: ceph_file_layout -> file_layout_t

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

diff --git a/tasks/cephfs/filesystem.py b/tasks/cephfs/filesystem.py
index d32d85e6f0591f0aca65ea39a6283181e0ffa718..438ab6728cdf44449e1bc8c624802f80e1e538ac 100644 (file)
--- a/tasks/cephfs/filesystem.py
+++ b/tasks/cephfs/filesystem.py
@@ -570,13 +570,14 @@ class Filesystem(object):
                 "stripe_unit": 4194304,
                 "stripe_count": 1,
                 "object_size": 4194304,
-                "pg_pool": 1
+                "pool_id": 1,
+                "pool_ns": "",
             }
 
         :param pool: name of pool to read backtrace from.  If omitted, FS must have only
                      one data pool and that will be used.
         """
-        return self._read_data_xattr(ino_no, "layout", "ceph_file_layout_wrapper", pool)
+        return self._read_data_xattr(ino_no, "layout", "file_layout_t", pool)
 
     def _enumerate_data_objects(self, ino, size):
         """

diff --git a/tasks/cephfs/test_backtrace.py b/tasks/cephfs/test_backtrace.py
index 72a07b16c63a01ad6dedfd62f10c84cdc4882ce1..6d7308ec70d1f79b57b219b16a0662a8150258ae 100644 (file)
--- a/tasks/cephfs/test_backtrace.py
+++ b/tasks/cephfs/test_backtrace.py
@@ -29,7 +29,8 @@ class TestBacktrace(CephFSTestCase):
             "stripe_unit": 4194304,
             "stripe_count": 1,
             "object_size": 4194304,
-            "pg_pool": old_pool_id
+            "pool_id": old_pool_id,
+            "pool_ns": "",
         })
         self.assertEqual(backtrace['pool'], old_pool_id)
 
@@ -56,7 +57,8 @@ class TestBacktrace(CephFSTestCase):
         backtrace_new_pool = self.fs.read_backtrace(file_ino, pool=new_pool_name)
         self.assertEqual(backtrace_new_pool['pool'], new_pool_id)
         new_pool_layout = self.fs.read_layout(file_ino, pool=new_pool_name)
-        self.assertEqual(new_pool_layout['pg_pool'], new_pool_id)
+        self.assertEqual(new_pool_layout['pool_id'], new_pool_id)
+        self.assertEqual(new_pool_layout['pool_ns'], '')
 
         # That subsequent linkage changes are only written to new pool backtrace
         self.mount_a.run_shell(["mkdir", "parent_c"])