From 564212ce56b955568f49ad15ce26fe31579af115 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 31 Aug 2018 12:10:58 -0500 Subject: [PATCH] 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 --- src/osd/PG.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 4ba31413ba3d7..a2466a99cb7d3 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; -- 2.39.5