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

mon: fix crush testing for new pools #6192

Merged
5 commits merged into from Oct 7, 2015
Merged

mon: fix crush testing for new pools #6192

5 commits merged into from Oct 7, 2015

Commits on Oct 7, 2015

  1. 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
    @liewegas @ldachary
    liewegas authored and ldachary committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    cc1fedd View commit details
    Browse the repository at this point in the history

  2. 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
    @liewegas @ldachary
    liewegas authored and ldachary committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    6635530 View commit details
    Browse the repository at this point in the history

  3. 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
    @liewegas @ldachary
    liewegas authored and ldachary committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    25bd277 View commit details
    Browse the repository at this point in the history

  4. 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.
    @ldachary
    ldachary committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    abc5b5f View commit details
    Browse the repository at this point in the history

  5. 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 @ldachary
    liewegas authored and ldachary committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    2a28114 View commit details
    Browse the repository at this point in the history