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

osd: combine conditional statements #16391

Merged
merged 1 commit into from Jul 19, 2017

Conversation

Projects
None yet
4 participants
@Yan-waller
Contributor

Yan-waller commented Jul 18, 2017

Signed-off-by: Yan Jun yan.jun8@zte.com.cn

osd: combine conditional statement
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>

@joscollin joscollin self-requested a review Jul 18, 2017

@joscollin

This comment has been minimized.

Member

joscollin commented Jul 18, 2017

@Yan-waller Have you done your work in the latest code ? Is that the reason the Jenkins build failed ? When I checked your changes with the ceph:master manually, I found differences in line numbers. The github diff in this PR doesn't show that for some reason.

Please check and let me know.

@Yan-waller

This comment has been minimized.

Contributor

Yan-waller commented Jul 18, 2017

@joscollin thanks for reminding me, I did this commit on this morning's code, but the build failed has been seen many times, and it has nothing to do with my changes. I will retest it.

@Yan-waller

This comment has been minimized.

Contributor

Yan-waller commented Jul 18, 2017

retest this please

@gregsfortytwo

This comment has been minimized.

Member

gregsfortytwo commented Jul 18, 2017

Doubt this is your fault but if you could put your patch on top of a known-good offset we can make sure. (It's unlikely given the changes you're making, but there are some tests which match against debug output.)

@joscollin

An additional information: Last time it was hitting on objectstore.

@joscollin

This comment has been minimized.

Member

joscollin commented Jul 19, 2017

Anyway, I'm going to retest this again and see.

@joscollin

This comment has been minimized.

Member

joscollin commented Jul 19, 2017

Jenkins retest this please

@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Jul 19, 2017

This looks like a fine cleanup

@joscollin joscollin changed the title from osd: combine conditional statement to osd: combine conditional statements Jul 19, 2017

@joscollin joscollin merged commit 07223aa into ceph:master Jul 19, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment