]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Update object state after removing watch from object info 3694/head
authorDavid Zafman <dzafman@redhat.com>
Wed, 11 Feb 2015 04:25:05 +0000 (20:25 -0800)
committerDavid Zafman <dzafman@redhat.com>
Wed, 11 Feb 2015 04:25:05 +0000 (20:25 -0800)
Fixes: #10784
Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/ReplicatedPG.cc

index 5fb847a219c0294ecf919848be45f281ec8475e4..5c21ff3ce5087c866ab05e7aa58ef8487b3cfe4b 100644 (file)
@@ -7990,6 +7990,9 @@ void ReplicatedPG::handle_watch_timeout(WatchRef watch)
 
   // obc ref swallowed by repop!
   simple_repop_submit(repop);
+
+  // apply new object state.
+  ctx->obc->obs = ctx->new_obs;
 }
 
 ObjectContextRef ReplicatedPG::create_object_context(const object_info_t& oi,