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: fix output func name in can_mark_out #14758

Merged
merged 1 commit into from Apr 29, 2017

Conversation

Projects
None yet
3 participants
@xiexingguo
Member

xiexingguo commented Apr 25, 2017

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

@xiexingguo xiexingguo requested a review from tchaikov Apr 25, 2017

@@ -1833,11 +1833,11 @@ bool OSDMonitor::can_mark_out(int i)
float in_ratio = (float)in / (float)num_osds;
if (in_ratio < g_conf->mon_osd_min_in_ratio) {
if (i >= 0)
dout(5) << "can_mark_down current in_ratio " << in_ratio << " < min "
dout(5) << "can_mark_out current in_ratio " << in_ratio << " < min "

This comment has been minimized.

@tchaikov

tchaikov Apr 25, 2017

Contributor

can we use __func__ here?

This comment has been minimized.

@xiexingguo

xiexingguo Apr 25, 2017

Member

The problem is that we manually output the function name everywhere within this file.
So I perfer to keep pace with others.

But I'll do it if you insist.

This comment has been minimized.

@tchaikov

tchaikov Apr 25, 2017

Contributor

please search for __func__ in this source file for more examples.

This comment has been minimized.

@xiexingguo

xiexingguo Apr 26, 2017

Member

Fixed. @tchaikov Can you look ,again?

mon/OSDMonitor: fix output func name in can_mark_out
use __func__ macro instead.

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

thanks! we'd like to move to func whenever we touch the code as it is less likely to be wrong after a future refactor :)

@liewegas liewegas added the needs-qa label Apr 27, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 27, 2017

retest this please

@liewegas liewegas merged commit a9bd266 into ceph:master Apr 29, 2017

3 of 4 checks passed

arm build Build triggered. sha1 is merged.
Details
Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@xiexingguo xiexingguo deleted the xiexingguo:fix-can_mark_out-output branch May 1, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment