From: xinxin shu <xinxin.shu@intel.com>
Date: Sun, 26 Oct 2014 21:25:54 +0000 (+0800)
Subject: check to_remove before setting transaction
X-Git-Tag: v0.88~23^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a05dedc644502ebe136cde2e8b8dddc22a33a356;p=ceph.git

check to_remove before setting transaction

currently if you dump transaction for a single rbd write, a transaction
of OMAP_RMKEYS will be listed even if to_remove is empty.

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 60390a2a5962f..65dfb800bcbc8 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -799,7 +799,8 @@ void PGLog::_write_log(
   }
   ::encode(log.can_rollback_to, keys["can_rollback_to"]);
 
-  t.omap_rmkeys(META_COLL, log_oid, to_remove);
+  if (to_remove.size())
+    t.omap_rmkeys(META_COLL, log_oid, to_remove);
   t.omap_setkeys(META_COLL, log_oid, keys);
 }