From: David Zafman <dzafman@redhat.com>
Date: Fri, 13 Apr 2018 22:01:52 +0000 (-0700)
Subject: osd: Change shard digests to hex like object info digests
X-Git-Tag: v12.2.5~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21397%2Fhead;p=ceph.git

osd: Change shard digests to hex like object info digests

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 22ddc6da5fd03e65a7baf96748a8893cc258d977)
---

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 28b1548a9b5a..52f171ff1e90 100755
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -672,8 +672,8 @@ function TEST_corrupt_scrub_replicated() {
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4126909126,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xf5fba2c6",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -717,8 +717,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4126909126,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xf5fba2c6",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -784,8 +784,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 108998762,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x067f306a",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -848,8 +848,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 1682015565,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x6441854d",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -932,8 +932,8 @@ function TEST_corrupt_scrub_replicated() {
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 757747054,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0x2d2a4d6e",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -982,8 +982,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 757747054,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x2d2a4d6e",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1079,8 +1079,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 11755005,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x00b35dfd",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1166,8 +1166,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 3602809308,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xd6be81dc",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1218,8 +1218,8 @@ function TEST_corrupt_scrub_replicated() {
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 727918093,
-            "omap_digest": 787268921,
+            "data_digest": "0x2b63260d",
+            "omap_digest": "0x2eecc539",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -1260,8 +1260,8 @@ function TEST_corrupt_scrub_replicated() {
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 787268921,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0x2eecc539",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -1304,8 +1304,8 @@ function TEST_corrupt_scrub_replicated() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 727918093,
-        "omap_digest": 787268921,
+        "data_digest": "0x2b63260d",
+        "omap_digest": "0x2eecc539",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1416,8 +1416,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4126909126,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xf5fba2c6",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -1464,8 +1464,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4126909126,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xf5fba2c6",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1516,7 +1516,7 @@ EOF
       ],
      "selected_object_info": {
        "alloc_hint_flags": 0,
-       "data_digest": 769390837,
+       "data_digest": "0x2ddbf8f5",
        "expected_object_size": 0,
        "expected_write_size": 0,
        "flags": [
@@ -1541,7 +1541,7 @@ EOF
          "pool": 3,
          "snapid": -2
        },
-       "omap_digest": 3254934052,
+       "omap_digest": "0xc2025a24",
        "prior_version": "41'33",
        "size": 7,
        "truncate_seq": 0,
@@ -1607,8 +1607,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 2688347907,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xa03cef03",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1673,8 +1673,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 108998762,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x067f306a",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1792,8 +1792,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 757747054,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0x2d2a4d6e",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -1846,8 +1846,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 757747054,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x2d2a4d6e",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -1952,8 +1952,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4175501592,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xf8e11918",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2020,8 +2020,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 11755005,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x00b35dfd",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2089,8 +2089,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 3805572772,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xe2d46ea4",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2160,8 +2160,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 445000257,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x1a862a41",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2231,8 +2231,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 396136863,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0x179c919f",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2302,8 +2302,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4023309690,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xefced57a",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2395,8 +2395,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 3602809308,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xd6be81dc",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2447,8 +2447,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 787268921,
+            "data_digest": "0x2ddbf8f5",
+           "omap_digest": "0x2eecc539",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -2493,8 +2493,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 522648358,
-            "omap_digest": 787268921,
+            "data_digest": "0x1f26fb26",
+            "omap_digest": "0x2eecc539",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -2537,8 +2537,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 522648358,
-        "omap_digest": 787268921,
+        "data_digest": "0x1f26fb26",
+        "omap_digest": "0x2eecc539",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2724,8 +2724,8 @@ function corrupt_scrub_erasure() {
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4294967295,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xffffffff",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -2776,8 +2776,8 @@ function corrupt_scrub_erasure() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2851,8 +2851,8 @@ function corrupt_scrub_erasure() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -2958,8 +2958,8 @@ function corrupt_scrub_erasure() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3016,8 +3016,8 @@ function corrupt_scrub_erasure() {
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4294967295,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xffffffff",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -3068,8 +3068,8 @@ function corrupt_scrub_erasure() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3127,8 +3127,8 @@ function corrupt_scrub_erasure() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3223,8 +3223,8 @@ function corrupt_scrub_erasure() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 325996071,
-        "omap_digest": 4294967295,
+        "data_digest": "0x136e4e27",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3380,8 +3380,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4294967295,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xffffffff",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -3435,8 +3435,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3515,8 +3515,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3628,8 +3628,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3690,8 +3690,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4294967295,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xffffffff",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -3744,8 +3744,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3808,8 +3808,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -3905,8 +3905,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 325996071,
-        "omap_digest": 4294967295,
+        "data_digest": "0x136e4e27",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4043,8 +4043,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4294967295,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xffffffff",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -4098,8 +4098,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4179,8 +4179,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4255,8 +4255,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4368,8 +4368,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4428,8 +4428,8 @@ EOF
             ],
             "truncate_seq": 0,
             "truncate_size": 0,
-            "data_digest": 769390837,
-            "omap_digest": 4294967295,
+            "data_digest": "0x2ddbf8f5",
+            "omap_digest": "0xffffffff",
             "expected_object_size": 0,
             "expected_write_size": 0,
             "alloc_hint_flags": 0,
@@ -4483,8 +4483,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4548,8 +4548,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 769390837,
-        "omap_digest": 4294967295,
+        "data_digest": "0x2ddbf8f5",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4647,8 +4647,8 @@ EOF
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 325996071,
-        "omap_digest": 4294967295,
+        "data_digest": "0x136e4e27",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -4970,8 +4970,8 @@ function TEST_corrupt_snapset_scrub_rep() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 1403826184,
-        "omap_digest": 4294967295,
+        "data_digest": "0x53acb008",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
@@ -5059,8 +5059,8 @@ function TEST_corrupt_snapset_scrub_rep() {
         ],
         "truncate_seq": 0,
         "truncate_size": 0,
-        "data_digest": 1403826184,
-        "omap_digest": 4294967295,
+        "data_digest": "0x53acb008",
+        "omap_digest": "0xffffffff",
         "expected_object_size": 0,
         "expected_write_size": 0,
         "alloc_hint_flags": 0,
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 8de69a821198..ffd92451d05d 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -5324,8 +5324,8 @@ void object_info_t::dump(Formatter *f) const
   f->close_section();
   f->dump_unsigned("truncate_seq", truncate_seq);
   f->dump_unsigned("truncate_size", truncate_size);
-  f->dump_unsigned("data_digest", data_digest);
-  f->dump_unsigned("omap_digest", omap_digest);
+  f->dump_format("data_digest", "0x%08x", data_digest);
+  f->dump_format("omap_digest", "0x%08x", omap_digest);
   f->dump_unsigned("expected_object_size", expected_object_size);
   f->dump_unsigned("expected_write_size", expected_write_size);
   f->dump_unsigned("alloc_hint_flags", alloc_hint_flags);