From: Samuel Just <sjust@redhat.com>
Date: Mon, 21 Nov 2016 23:37:25 +0000 (-0800)
Subject: ECTransaction: only write out the hinfo if not delete
X-Git-Tag: v11.1.0~203^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eb217558a9d7541ebc8705d8d00d7072c9ed07f9;p=ceph-ci.git

ECTransaction: only write out the hinfo if not delete

Fixes: http://tracker.ceph.com/issues/17983
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
index f808162caaf..4cb76d0f4ea 100644
--- a/src/osd/ECTransaction.cc
+++ b/src/osd/ECTransaction.cc
@@ -643,14 +643,16 @@ void ECTransaction::generate_transactions(
 	entry->mod_desc.append(append_after);
       }
 
-      bufferlist hbuf;
-      ::encode(*hinfo, hbuf);
-      for (auto &&i : *transactions) {
-	i.second.setattr(
-	  coll_t(spg_t(pgid, i.first)),
-	  ghobject_t(oid, ghobject_t::NO_GEN, i.first),
-	  ECUtil::get_hinfo_key(),
-	  hbuf);
+      if (!op.is_delete()) {
+	bufferlist hbuf;
+	::encode(*hinfo, hbuf);
+	for (auto &&i : *transactions) {
+	  i.second.setattr(
+	    coll_t(spg_t(pgid, i.first)),
+	    ghobject_t(oid, ghobject_t::NO_GEN, i.first),
+	    ECUtil::get_hinfo_key(),
+	    hbuf);
+	}
       }
     });
 }