tasks/scrub_test: match the NOSNAP with "head"

* rados cli prints "head" at seeing CEPH_NOSNAP, so update the test
  accordingly
* print inconsistent objs before testing them

Fixes: #14924
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/tasks/scrub_test.py b/tasks/scrub_test.py
index 34359a4665b7a798df83fd15ed4f92c347bb006b..a2ab2c46c69d8a27afccd17d99efe7e74d337ea2 100644 (file)
--- a/tasks/scrub_test.py
+++ b/tasks/scrub_test.py
@@ -6,7 +6,6 @@ import json
 import logging
 import os
 import time
-import ctypes
 import tempfile
 
 import ceph_manager
@@ -214,8 +213,6 @@ class MessUp:
 class InconsistentObjChecker:
     """Check the returned inconsistents/inconsistent info"""
 
-    CEPH_NOSNAP = ctypes.c_uint64(-2).value
-
     def __init__(self, osd, acting, obj_name):
         self.osd = osd
         self.acting = acting
@@ -224,7 +221,7 @@ class InconsistentObjChecker:
 
     def basic_checks(self, inc):
         assert inc['object']['name'] == self.obj
-        assert inc['object']['snap'] == self.CEPH_NOSNAP
+        assert inc['object']['snap'] == "head"
         assert len(inc['shards']) == len(self.acting), \
             "the number of returned shard does not match with the acting set"
 
@@ -309,9 +306,9 @@ def test_list_inconsistent_obj(ctx, manager, osd_remote, pg, acting, osd_id,
 
             checker = InconsistentObjChecker(osd_id, acting, obj_name)
             inc_obj = objs[0]
+            log.info('inc = %r', inc_obj)
             checker.basic_checks(inc_obj)
             for check in checks:
-                log.info('inc = %r', inc_obj)
                 checker.run(check, inc_obj)