RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd-mirror: fix valgrind false positive from new boost release

Browse Source 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2018-01-11 15:27:47 -05:00
parent 0088640173
commit bbbfd27be9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/rbd_mirror/ImageReplayer.cc
View File

@ -1292,8 +1292,8 @@ void ImageReplayer<I>::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<I>* bootstrap_request = nullptr;
{
Mutex::Locker locker(m_lock);
@ -1355,7 +1355,8 @@ void ImageReplayer<I>::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:

3
src/tools/rbd_mirror/ImageReplayer.h
View File

@ -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;