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

mon/OSDMonitor: batch noup/noin osds support #15725

Merged
merged 1 commit into from Jun 18, 2017

Conversation

Projects
None yet
2 participants
@xiexingguo
Member

xiexingguo commented Jun 16, 2017

This is a follow-up change of #15381.
This patch also simplifies the original code logic a bit.

Signed-off-by: xie xingguo xie.xingguo@zte.com.cn

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 16, 2017

For noup you also need to update OSD.cc; there are two places where we respond to the global noup flag that also need to handle the per-OSD one.

@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Jun 16, 2017

there are two places where we respond to the global noup flag that also need to handle the per-OSD one.

Got that and updated.

@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Jun 17, 2017

retest this please

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 17, 2017

rebase please? (trivial conflict)

@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Jun 18, 2017

rebase please? (trivial conflict)

Ah, it conflicts with #15732. Resolved. @liewegas

mon/OSDMonitor: batch noup/noin osds support
This is a follow-up change of #15381.
This patch also simplifies the original code logic a bit.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

@liewegas liewegas merged commit 93317c9 into ceph:master Jun 18, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details
make check make check succeeded
Details

@xiexingguo xiexingguo deleted the xiexingguo:wip-noupin branch Jun 18, 2017

xiexingguo added a commit to xiexingguo/ceph that referenced this pull request Jun 19, 2017

src/common/ceph_string: stringify new osd states
In ceph#15725 I introduce
two more osd states.

This patch pulls them in.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment