From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Jan 2016 14:19:36 +0000 (-0500)
Subject: test/osd/RadosModel: fix sparse read result check
X-Git-Tag: v10.0.3~88^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0de06139328666c50ce4f541f2cb5b4ceafd130;p=ceph.git

test/osd/RadosModel: fix sparse read result check

The object may have trailing zeros.

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

diff --git a/src/test/osd/Object.cc b/src/test/osd/Object.cc
index 4f791cd5e53a..699005381d80 100644
--- a/src/test/osd/Object.cc
+++ b/src/test/osd/Object.cc
@@ -210,9 +210,14 @@ bool ObjectDesc::check_sparse(const std::map<uint64_t, uint64_t>& extents,
   }
   uint64_t size = layers.empty() ? 0 :
     most_recent_gen()->get_length(most_recent());
-  if (pos != size) {
-    std::cout << "only read " << pos << " out of size " << size << std::endl;
-    return false;
+  while (pos < size) {
+    if (*i != '\0') {
+      std::cout << "sparse read omitted non-zero data at " << pos << std::endl;
+      return false;
+    }
+    ++i;
+    ++pos;
   }
+  assert(pos == size);
   return true;
 }