Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rbd-mirror: fix missing increment for iterators #8352

Merged
merged 1 commit into from
Mar 30, 2016

Conversation

runsisi
Copy link
Contributor

@runsisi runsisi commented Mar 29, 2016

rbd-mirror: fix missing increment of iterators in Replayer::set_sources.

Signed-off-by: runsisi runsisi@hust.edu.cn

@runsisi runsisi force-pushed the wip-fix-missing-iter branch 4 times, most recently from b71ee7f to dca09c3 Compare March 29, 2016 14:09
@xiexingguo
Copy link
Member

This change looks good. @dillaman What do you think?

@@ -273,10 +273,14 @@ void Replayer::set_sources(const map<int64_t, set<string> > &images)
images_it != pool_images.end();) {
if (stop_image_replayer(images_it->second)) {
pool_images.erase(images_it++);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While fixing this, can we also switch this (and below) to something like images_it = pool_images.erase(images_it)?

@dillaman dillaman added this to the jewel milestone Mar 30, 2016
@runsisi runsisi force-pushed the wip-fix-missing-iter branch 3 times, most recently from ea4fc58 to 23e4504 Compare March 30, 2016 01:47
@runsisi
Copy link
Contributor Author

runsisi commented Mar 30, 2016

@dillaman ok, fixed it, thx~

@xiexingguo
Copy link
Member

LGTM

Signed-off-by: runsisi <runsisi@hust.edu.cn>
@dillaman dillaman self-assigned this Mar 30, 2016
@dillaman dillaman merged commit d53f941 into ceph:master Mar 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants