From 697248d180976092cec5e31c85e111ff2bd125d7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Jun 2018 21:18:01 -0500 Subject: [PATCH] osd/PG: do not send notify to empty peer This is mostly paranoia to avoid doing something clearly silly if the add_source_info() implementation incorrectly decided we found something new (as it did in http://tracker.ceph.com/issues/24588). Signed-off-by: Sage Weil (cherry picked from commit 3407b39bf36cb5fa5b5bd91c25f571134b7b929b) Conflicts: src/osd/PG.cc (luminous does not have c1fbf350bcafab0ad94306302217eb39a66814b7) --- src/osd/PG.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 3a40b256639..ddb89237aa9 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -556,9 +556,14 @@ bool PG::search_for_missing( from, oinfo, omissing, ctx->handle); if (found_missing && num_unfound_before != missing_loc.num_unfound()) publish_stats_to_osd(); + // avoid doing this if the peer is empty. This is abit of paranoia + // to avoid doing something rash if add_source_info() above + // incorrectly decided we found something new. (if the peer has + // last_update=0'0 that's impossible.) if (found_missing && (get_osdmap()->get_features(CEPH_ENTITY_TYPE_OSD, NULL) & - CEPH_FEATURE_OSD_ERASURE_CODES)) { + CEPH_FEATURE_OSD_ERASURE_CODES) && + oinfo.last_update != eversion_t()) { pg_info_t tinfo(oinfo); tinfo.pgid.shard = pg_whoami.shard; (*(ctx->info_map))[from.osd].push_back( -- 2.47.3