]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: always format the pgid in hex 45159/head
authorXiubo Li <xiubli@redhat.com>
Mon, 24 May 2021 02:49:09 +0000 (10:49 +0800)
committerDan van der Ster <daniel.vanderster@cern.ch>
Fri, 25 Feb 2022 08:17:42 +0000 (09:17 +0100)
If the pg number is larger than 9, this won't match the array index,
which was in dec just before this.

Fixes: https://tracker.ceph.com/issues/50808
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 2b9b2a3fbd5d4e1f01b96a96d4abaccffb8b9e3a)

qa/tasks/cephfs/test_data_scan.py

index 7b6459de9230a92787e3b07b2735df8ba5a5c2f2..c14d28238dd7be32b727860938121811904b4a45 100644 (file)
@@ -548,7 +548,7 @@ class TestDataScan(CephFSTestCase):
 
         pg_count = self.fs.pgs_per_fs_pool
         for pg_n in range(0, pg_count):
-            pg_str = "{0}.{1}".format(self.fs.get_data_pool_id(), pg_n)
+            pg_str = "{0}.{1:x}".format(self.fs.get_data_pool_id(), pg_n)
             out = self.fs.data_scan(["pg_files", "mydir", pg_str])
             lines = [l for l in out.split("\n") if l]
             log.info("{0}: {1}".format(pg_str, lines))