Merge pull request #456 from dalgaaf/wip-da-CID-1

Fix CID issues

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

3 files changed, 19 insertions, 2 deletions

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index de2abe5665b..6cda4cba5c3 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -815,7 +815,7 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
   map<string, bufferlist> keys;
   string filter_prefix, end_key;
   bufferlist start_bl;
-  bool start_key_added;
+  bool start_key_added = false;
   uint32_t i = 0;
   string key;
 
diff --git a/src/test/cls_statelog/test_cls_statelog.cc b/src/test/cls_statelog/test_cls_statelog.cc
index 294b528f5db..33028f4fbad 100644
--- a/src/test/cls_statelog/test_cls_statelog.cc
+++ b/src/test/cls_statelog/test_cls_statelog.cc
@@ -84,6 +84,7 @@ static void get_entries_by_client_id(librados::IoCtx& ioctx, string& oid,
   cls_statelog_list(*rop, client_id, op_id, empty_str, marker, 0, entries, &marker, &truncated);
   ASSERT_EQ(0, ioctx.operate(oid, rop, &obl));
   ASSERT_EQ(expected, (int)entries.size());
+  delete rop;
 }
 
 static void get_all_entries(librados::IoCtx& ioctx, string& oid, list<cls_statelog_entry>& entries, int expected)
@@ -203,5 +204,7 @@ TEST(cls_rgw, test_statelog_basic)
   string empty_str;
   get_entries_by_client_id(ioctx, oid, entries, e.client_id, empty_str, 4);
   get_entries_by_object(ioctx, oid, entries, e.object, empty_str, 1);
+  delete op;
+  delete rop;
 }
 
diff --git a/src/test/cls_version/test_cls_version.cc b/src/test/cls_version/test_cls_version.cc
index caa0a36cd74..acce4f00cf4 100644
--- a/src/test/cls_version/test_cls_version.cc
+++ b/src/test/cls_version/test_cls_version.cc
@@ -55,6 +55,7 @@ TEST(cls_rgw, test_version_inc_read)
   ASSERT_NE(0, (int)ver.tag.size());
 
   /* inc version again! */
+  delete op;
   op = new_op();
   cls_version_inc(*op);
   ASSERT_EQ(0, ioctx.operate(oid, op));
@@ -136,7 +137,6 @@ TEST(cls_rgw, test_version_inc_cond)
   /* add chains */
   string oid = "obj";
 
-
   /* create object */
 
   ASSERT_EQ(0, ioctx.create(oid, true));
@@ -160,6 +160,7 @@ TEST(cls_rgw, test_version_inc_cond)
 
 
   /* inc version again! */
+  delete op;
   op = new_op();
   cls_version_inc(*op);
   ASSERT_EQ(0, ioctx.operate(oid, op));
@@ -180,18 +181,22 @@ TEST(cls_rgw, test_version_inc_cond)
   ASSERT_EQ(0, (int)ver2.tag.compare(ver.tag));
 
   /* a bunch of conditions that should fail */
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_EQ);
   ASSERT_EQ(-ECANCELED, ioctx.operate(oid, op));
 
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_LT);
   ASSERT_EQ(-ECANCELED, ioctx.operate(oid, op));
 
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_LE);
   ASSERT_EQ(-ECANCELED, ioctx.operate(oid, op));
 
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_TAG_NE);
   ASSERT_EQ(-ECANCELED, ioctx.operate(oid, op));
@@ -201,18 +206,22 @@ TEST(cls_rgw, test_version_inc_cond)
   ASSERT_EQ(0, (int)ver2.tag.compare(ver.tag));
 
   /* a bunch of conditions that should succeed */
+  delete op;
   op = new_op();
   cls_version_inc(*op, ver2, VER_COND_EQ);
   ASSERT_EQ(0, ioctx.operate(oid, op));
 
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_GT);
   ASSERT_EQ(0, ioctx.operate(oid, op));
 
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_GE);
   ASSERT_EQ(0, ioctx.operate(oid, op));
 
+  delete op;
   op = new_op();
   cls_version_inc(*op, cond_ver, VER_COND_TAG_EQ);
   ASSERT_EQ(0, ioctx.operate(oid, op));
@@ -275,6 +284,7 @@ TEST(cls_rgw, test_version_inc_check)
 
   obj_version ver2;
 
+  delete op;
   op = new_op();
   cls_version_inc(*op);
   ASSERT_EQ(0, ioctx.operate(oid, op));
@@ -283,6 +293,8 @@ TEST(cls_rgw, test_version_inc_check)
   ASSERT_GT((long long)ver2.ver, (long long)ver.ver);
   ASSERT_EQ(0, (int)ver2.tag.compare(ver.tag));
 
+  delete op;
+
   /* a bunch of conditions that should fail */
   rop = new_rop();
   cls_version_check(*rop, ver, VER_COND_LT);
@@ -295,4 +307,6 @@ TEST(cls_rgw, test_version_inc_check)
   rop = new_rop();
   cls_version_check(*rop, cond_ver, VER_COND_TAG_NE);
   ASSERT_EQ(-ECANCELED, ioctx.operate(oid, rop, &bl));
+
+  delete rop;
 }