From bdf2d1b97308835bec038b10663bc438da013e9d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 22 Feb 2019 08:56:16 -0600 Subject: [PATCH] osd/PrimaryLogPG: handle object !exists in handle_watch_timeout - watch on object - watch timeout queued - rados op deletes object - handle_watch_timeout tries to delete it again Fixes: http://tracker.ceph.com/issues/38432 Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 3863ee21afdce..b588cba9cc85d 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -10911,6 +10911,10 @@ void PrimaryLogPG::handle_watch_timeout(WatchRef watch) dout(10) << "handle_watch_timeout not active, no-op" << dendl; return; } + if (!obc->obs.exists) { + dout(10) << __func__ << " object " << obc->obs.oi.soid << " dne" << dendl; + return; + } if (is_degraded_or_backfilling_object(obc->obs.oi.soid)) { callbacks_for_degraded_object[obc->obs.oi.soid].push_back( watch->get_delayed_cb() -- 2.39.5