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

mgr: misc minor changes #11386

Merged
merged 6 commits into from Oct 19, 2016
Merged

mgr: misc minor changes #11386

merged 6 commits into from Oct 19, 2016

Conversation

xiexingguo
Copy link
Member

No description provided.

@xiexingguo
Copy link
Member Author

@jcsp Can you take a look?(Just some cleanups, simple and easy)

Thanks!

@xiexingguo
Copy link
Member Author

retest this please

Copy link
Contributor

@jcsp jcsp left a comment

Choose a reason for hiding this comment

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

All looks good, please could you just add a Fixes line in the commit where I commented.

@@ -112,8 +112,7 @@ void MgrStandby::send_beacon()
available);

monc->send_mon_message(m);
// TODO configure period
timer.add_event_after(5, new C_StdFunction(
timer.add_event_after(g_conf->mgr_beacon_period, new C_StdFunction(
Copy link
Contributor

Choose a reason for hiding this comment

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

Please could you add "Fixes: http://tracker.ceph.com/issues/17455" to the commit message

Copy link
Member Author

Choose a reason for hiding this comment

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

@jcsp Done. Thanks for the review.

Fixes: http://tracker.ceph.com/issues/17455
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Which can fail due to missing keyring.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
@xiexingguo
Copy link
Member Author

@jcsp Ping

@jcsp jcsp merged commit b1e652c into ceph:master Oct 19, 2016
@xiexingguo xiexingguo deleted the xxg-wip-mgr-1008 branch October 19, 2016 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
2 participants