From: David Zafman <dzafman@redhat.com>
Date: Fri, 18 May 2018 00:35:54 +0000 (-0700)
Subject: test: Luminous specifc changes
X-Git-Tag: v12.2.6~98^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a08dc75bf823a6670cf137bfba56acaed73e9a2;p=ceph.git

test: Luminous specifc changes

*** Not sure why this wasn't seen earlier

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
index eca467f20c58..a83cfe75c9a8 100755
--- a/qa/standalone/scrub/osd-scrub-snaps.sh
+++ b/qa/standalone/scrub/osd-scrub-snaps.sh
@@ -833,7 +833,7 @@ function _scrub_snaps_multi() {
     # Since all of the snapshots on the primary is consistent there are no errors here
     if [ $which = "replica" ];
     then
-        scruberrors="20"
+        scruberrors="21"
         jq "$jqfilter" << EOF | python -c "$sortkeys" > $dir/checkcsjson
 {
     "epoch": 23,
@@ -842,7 +842,7 @@ function _scrub_snaps_multi() {
 EOF
 
 else
-        scruberrors="30"
+        scruberrors="33"
         jq "$jqfilter" << EOF | python -c "$sortkeys" > $dir/checkcsjson
 {
     "epoch": 23,
@@ -917,6 +917,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 1,
                     "snaps": [
@@ -942,6 +943,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 1,
                     "snaps": [
@@ -957,12 +959,41 @@ else
                 1
             ]
         },
+        {
+           "errors": [
+             "head_mismatch"
+           ],
+           "locator": "",
+           "name": "obj12",
+           "nspace": "",
+           "snap": "head",
+           "snapset": {
+             "clones": [
+               {
+                 "overlap": "[]",
+                 "size": 1032,
+                 "snap": 1,
+                 "snaps": [
+                   1
+                 ]
+               }
+             ],
+             "head_exists": 0,
+              "snap_context": {
+              "seq": 1,
+              "snaps": [
+                1
+              ]
+            }
+          }
+        },
         {
             "name": "obj14",
             "nspace": "",
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 1,
                     "snaps": [
@@ -988,6 +1019,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 6,
                     "snaps": [
@@ -1049,6 +1081,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 1,
                     "snaps": [
@@ -1070,6 +1103,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 0,
                 "snap_context": {
                     "seq": 0,
                     "snaps": []
@@ -1077,6 +1111,7 @@ else
                 "clones": []
             },
             "errors": [
+                "head_mismatch",
                 "extra_clones"
             ],
             "extra clones": [
@@ -1089,6 +1124,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 0,
                     "snaps": [
@@ -1116,6 +1152,7 @@ else
             "locator": "",
             "snap": "head",
             "snapset": {
+                "head_exists": 1,
                 "snap_context": {
                     "seq": 1,
                     "snaps": [