From bbbfd27be9bc0db4006eb110797e8590b477b88e Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 11 Jan 2018 15:27:47 -0500 Subject: [PATCH] rbd-mirror: fix valgrind false positive from new boost release Signed-off-by: Jason Dillaman --- src/tools/rbd_mirror/ImageReplayer.cc | 7 ++++--- src/tools/rbd_mirror/ImageReplayer.h | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 6da6639b0be..0b2bd6cce8d 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -1292,8 +1292,8 @@ void ImageReplayer::send_mirror_status_update(const OptionalState &opt_state) int last_r; bool stopping_replay; - OptionalMirrorImageStatusState mirror_image_status_state{ - boost::make_optional(false, cls::rbd::MirrorImageStatusState{})}; + OptionalMirrorImageStatusState mirror_image_status_state = + boost::make_optional(false, cls::rbd::MIRROR_IMAGE_STATUS_STATE_UNKNOWN); image_replayer::BootstrapRequest* bootstrap_request = nullptr; { Mutex::Locker locker(m_lock); @@ -1355,7 +1355,8 @@ void ImageReplayer::send_mirror_status_update(const OptionalState &opt_state) return; } status.description = "replaying, " + desc; - mirror_image_status_state = boost::none; + mirror_image_status_state = boost::make_optional( + false, cls::rbd::MIRROR_IMAGE_STATUS_STATE_UNKNOWN); } break; case STATE_STOPPING: diff --git a/src/tools/rbd_mirror/ImageReplayer.h b/src/tools/rbd_mirror/ImageReplayer.h index 2996fec1535..41aa3774d5f 100644 --- a/src/tools/rbd_mirror/ImageReplayer.h +++ b/src/tools/rbd_mirror/ImageReplayer.h @@ -285,7 +285,8 @@ private: State m_state = STATE_STOPPED; std::string m_state_desc; - OptionalMirrorImageStatusState m_mirror_image_status_state = boost::none; + OptionalMirrorImageStatusState m_mirror_image_status_state = + boost::make_optional(false, cls::rbd::MIRROR_IMAGE_STATUS_STATE_UNKNOWN); int m_last_r = 0; BootstrapProgressContext m_progress_cxt; -- 2.39.5