Merge pull request #6982 from dillaman/wip-librbd-valgrind

librbd: uninitialized state in snap remove state machine Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Dec 18, 2015 · a2befde · a2befde
2 parents 28081d7 + 6d9da6a
commit a2befde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc
@@ -34,6 +34,9 @@ std::ostream& operator<<(std::ostream& os,
   case SnapshotRemoveRequest<I>::STATE_RELEASE_SNAP_ID:
     os << "RELEASE_SNAP_ID";
     break;
+  case SnapshotRemoveRequest<I>::STATE_ERROR:
+    os << "STATE_ERROR";
+    break;
   default:
     os << "UNKNOWN (" << static_cast<uint32_t>(state) << ")";
     break;
@@ -127,6 +130,8 @@ void SnapshotRemoveRequest<I>::send_remove_child() {
     int r = image_ctx.get_parent_spec(m_snap_id, &our_pspec);
     if (r < 0) {
       lderr(cct) << "failed to retrieve parent spec" << dendl;
+      m_state = STATE_ERROR;
+
       this->async_complete(r);
       return;
     }

diff --git a/src/librbd/operation/SnapshotRemoveRequest.h b/src/librbd/operation/SnapshotRemoveRequest.h
@@ -52,7 +52,8 @@ class SnapshotRemoveRequest : public Request<ImageCtxT> {
     STATE_REMOVE_OBJECT_MAP,
     STATE_REMOVE_CHILD,
     STATE_REMOVE_SNAP,
-    STATE_RELEASE_SNAP_ID
+    STATE_RELEASE_SNAP_ID,
+    STATE_ERROR
   };
 
   SnapshotRemoveRequest(ImageCtxT &image_ctx, Context *on_finish,