From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Aug 2018 17:10:58 +0000 (-0500)
Subject: osd/PG: remove warn on delete+merge race
X-Git-Tag: v14.0.1~371^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=564212ce56b955568f49ad15ce26fe31579af115;p=ceph-ci.git

osd/PG: remove warn on delete+merge race

This was there just to confirm that this path was exercised by the
rados suite (it is, several hits per rados run of 1/666).

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 4ba31413ba3..a2466a99cb7 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6743,10 +6743,6 @@ void PG::_delete_some(ObjectStore::Transaction *t)
       _init(*t, info.pgid, &pool.info);
       dirty_info = true;
       dirty_big_info = true;
-
-#warning remove me before final merge
-      // REMOVE ME: trigger log error to ensure we exercise this in testing
-      osd->clog->error() << info.pgid << " delete merge race";
     } else {
       deleted = true;