From: David Zafman <dzafman@redhat.com>
Date: Sat, 15 Nov 2014 19:44:54 +0000 (-0800)
Subject: tests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling
X-Git-Tag: v0.80.10~69^2~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99ffd137f17c438e3ee9dbbc0ab73cdcd3a45a5c;p=ceph.git

tests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling

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

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index 97e50e7dd230..028ce09a42c4 100755
--- a/src/test/ceph_objectstore_tool.py
+++ b/src/test/ceph_objectstore_tool.py
@@ -292,7 +292,7 @@ def main(argv):
 
             db[nspace][NAME] = {}
 
-            if i < ATTR_OBJS:
+            if i < ATTR_OBJS + 1:
                 keys = range(i)
             else:
                 keys = range(0)
@@ -311,7 +311,7 @@ def main(argv):
                 db[nspace][NAME]["xattr"][mykey] = myval
 
             # Create omap header in all objects but REPobject1
-            if i < ATTR_OBJS and i != 1:
+            if i < ATTR_OBJS + 1 and i != 1:
                 myhdr = "hdr{i}".format(i=i)
                 cmd = "./rados -p {pool} -N '{nspace}' setomapheader {name} {hdr}".format(pool=REP_POOL, name=NAME, hdr=myhdr, nspace=nspace)
                 logging.debug(cmd)
@@ -370,7 +370,7 @@ def main(argv):
             db[nspace][NAME] = {}
 
             db[nspace][NAME]["xattr"] = {}
-            if i < ATTR_OBJS:
+            if i < ATTR_OBJS + 1:
                 keys = range(i)
             else:
                 keys = range(0)