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

mon: fix crush testing for new pools #6192

Merged
5 commits merged into from Oct 7, 2015

Conversation

Projects
None yet
3 participants
@ghost
Copy link

ghost commented Oct 7, 2015

crush/CrushTester: allow testing by ruleset
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit aa238e5)

Conflicts:
	src/crush/CrushTester.cc
          in hammer the crushtool validation is via a shell
	  and not via an internal subprocess utility
	src/tools/crushtool.cc
	  ceph_argparse_withint is preferred to ceph_argparse_witharg

@ghost ghost self-assigned this Oct 7, 2015

@ghost ghost added this to the hammer milestone Oct 7, 2015

@ghost ghost added bug fix core labels Oct 7, 2015

liewegas and others added some commits Sep 18, 2015

mon/OSDMonitor: only test crush ruleset for the newly created pool
Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 524b0bd)

Conflicts:
	src/mon/OSDMonitor.cc : trivial resolution
mon/OSDMonitor: fix crush injection error message
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1b3090d)

Conflicts:
	src/mon/OSDMonitor.cc
	  hammer has a separate error message for EINTR
	  which is in the context of the fix for error message
tests: update to match crushmap validation message
http://tracker.ceph.com/issues/13182 Fixes: #13182

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 21a1e75)

Conflicts:
	qa/workunits/cephtool/test.sh
	  the test structure in hammer is different, adapt
	  the relevant test.
crush/CrushTester: test fewer inputs when running crushtool
If there are a lot of crush rules (say, 100) then the test can
take a long time.  100 values per rule should be enough to catch
most issues.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0f82f46)

Conflicts:
	src/crush/CrushTester.cc
	  in hammer the crushtool validation is via a shell
    	  and not via an internal subprocess utility
@liewegas

This comment has been minimized.

Copy link
Member

liewegas commented Oct 7, 2015

lgtm

@ghost

This comment has been minimized.

Copy link
Author

ghost commented Oct 7, 2015

passes make check manually, will run one of the failed job 20 times to verify

ghost pushed a commit that referenced this pull request Oct 7, 2015

Loic Dachary
Merge pull request #6192 from dachary/wip-13401-hammer
mon: fix crush testing for new pools

Reviewed-by: Sage Weil <sage@redhat.com>

@ghost ghost merged commit 70e612a into ceph:hammer Oct 7, 2015

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.