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 4ba31413ba3d71efa9e4a927329712c7491d4452..a2466a99cb7d330a112f13ec098356e06ce3752a 100644 (file)
--- 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;