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

luminous: mon,osd: fix "pg ls {forced_backfill, backfilling}" #18236

Merged
merged 2 commits into from Oct 17, 2017

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented Oct 11, 2017

mon/PGMap: let pg_string_state() return boost::optional<>
better to be specific, so we don't run into the same problem even we
are using the MSB of uint64_t for a pg state bit in future. we could,
however use uint64_t(-1) to indicate the pg_string_state()'s failure to
parse the state string, because pg_string_state() only translate a
single state a time. but it's always better to be explicit than
implicit.

Fixes: http://tracker.ceph.com/issues/21609
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 260f87a)

Conflicts:
	src/mon/PGMap.cc
	src/osd/osd_types.cc
	src/osd/osd_types.h: trivial resolution

@tchaikov tchaikov added this to the luminous milestone Oct 11, 2017

@tchaikov tchaikov requested review from liewegas and smithfarm Oct 11, 2017

@tchaikov

This comment has been minimized.

Show comment
Hide comment
@tchaikov

tchaikov Oct 11, 2017

Contributor

probably we should backport #18235 as well.

Contributor

tchaikov commented Oct 11, 2017

probably we should backport #18235 as well.

@tchaikov tchaikov changed the title from mon,osd: fix "pg ls {forced_backfill, backfilling}" to luminous: mon,osd: fix "pg ls {forced_backfill, backfilling}" Oct 11, 2017

@liewegas

This comment has been minimized.

Show comment
Hide comment
@liewegas

liewegas Oct 11, 2017

Member

The state rename commit is also in #18025, which will hopefully merge shortly.

Member

liewegas commented Oct 11, 2017

The state rename commit is also in #18025, which will hopefully merge shortly.

@tchaikov

This comment has been minimized.

Show comment
Hide comment
@tchaikov

tchaikov Oct 11, 2017

Contributor

cool, will remove it from this PR.

Contributor

tchaikov commented Oct 11, 2017

cool, will remove it from this PR.

qa: s/backfill/backfilling/
it's renamed "backfilling" in 4015343 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e211142)

@liewegas liewegas merged commit 345286b into ceph:luminous Oct 17, 2017

2 of 4 checks passed

Docs: build check Docs: failed with errors
Details
make check make check failed
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details

@tchaikov tchaikov deleted the tchaikov:wip-21609-luminous branch Oct 18, 2017

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