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.

Sign up for GitHub

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

Jump to bottom

luminous: core: os/bluestore_tool: fix bluefs expand #25384

Merged
merged 5 commits into from Jan 16, 2019
Merged

luminous: core: os/bluestore_tool: fix bluefs expand #25384

merged 5 commits into from Jan 16, 2019

Conversation

ifed01
Copy link
Contributor

@ifed01 ifed01 commented Dec 3, 2018 •
edited

Fixes: https://tracker.ceph.com/issues/37495

For now additionally brings commits from #25187 which are required.

Signed-off-by: Igor Fedotov ifedotov@suse.com

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

@ifed01 ifed01 mentioned this pull request Dec 3, 2018
Closed
3 tasks
@tchaikov tchaikov added this to the luminous milestone Dec 17, 2018
@smithfarm
Copy link
Contributor

@ifed01 All the cherry-picks applied cleanly, no conflicts?

@smithfarm
Copy link
Contributor

smithfarm commented Dec 20, 2018 •
edited

I tried the first two commits - the first one cherry-picked cleanly, but the second one, 71c3b58, had a conflict in src/os/bluestore/bluestore_tool.cc.

The commits that required conflict resolution need a Conflicts: section listing at least the files that had conflicts requiring manual resolution, and preferably with a brief explanation of the conflict and/or how it was resolved.

(Note that git cherry-pick -x generates this Conflicts: section automatically - unfortunately, one has to remember to uncomment it. . . .)

@ifed01
tools/ceph-bluestore-tool: update size label on bluefs expand
ebff06d 
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 71c3b58)

Conflicts:
      src/os/bluestore/bluestore_tool.cc
@ifed01
tool/ceph-bluestore-tool: avoid mon/config access when calling global…
69612b1 
…_init

This caused a permanent stuck on tool's startup.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fa65e7b)

Conflicts:
      src/os/bluestore/bluestore_tool.cc
@ifed01
os/ceph-bluestore-tool: more strict control if bluefs device is expan…
2912a7a 
…dable

Fixes: https://tracker.ceph.com/issues/37495
This commit is specific for pre-Nautilius releases (mimic & luminous)
as we don't backport main device expansion feature. Which
makes this mimic/luminous commit completely different from nautilus one.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 69a730d)

Conflicts:
      src/os/bluestore/bluestore_tool.cc
      Needed to downgrade ceph_assert call to assert one
@ifed01
os/ceph-bluestore-tool: unify output for bluefs-bdev-expand command.
1c1784e 
This commit is specific for pre-Nautilius releases (mimic & luminous)
as we don't backport main device expansion feature. Which
makes this mimic/luminous commit completely different from nautilus one.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit c098f5f)
@ifed01 ifed01 force-pushed the wip-ifed-fix2-expand-luminous branch from 2887bdd to 1c1784e Compare December 20, 2018 22:18
@ifed01
Copy link
Contributor Author

ifed01 commented Dec 20, 2018

@smithfarm - updated commit messages with Conflicts section.

@ifed01
Copy link
Contributor Author

ifed01 commented Jan 9, 2019

jenkins retest this please

@ifed01
Copy link
Contributor Author

ifed01 commented Jan 9, 2019

@liewegas - ping! Should we target this to 12.2.11?

@yuriw
Copy link
Contributor

yuriw commented Jan 9, 2019

wip-yuri6-testing-2019-01-09-1618-luminous

@yuriw
Copy link
Contributor

yuriw commented Jan 12, 2019

I did not have issues merging this into wip-yuri6-testing-2019-01-09-1618-luminous

@liewegas @neha-ojha it passed tests, pls approve/merge

@liewegas
Copy link
Member

@yuriw @ifed01 yeah let's include this in .11. needs rebase, though?

@yuriw
Copy link
Contributor

yuriw commented Jan 14, 2019

test this please

@yuriw yuriw merged commit bff97ce into ceph:luminous Jan 16, 2019
@ifed01 ifed01 deleted the wip-ifed-fix2-expand-luminous branch January 16, 2019 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdurgin jdurgin jdurgin approved these changes

@liewegas liewegas Awaiting requested review from liewegas

Assignees
No one assigned
Labels
bluestore bug-fix luminous-batch-1 needs-qa wip-yuri6-testing
Projects
None yet
Milestone
luminous
6 participants
@ifed01 @smithfarm @yuriw @liewegas @jdurgin @tchaikov