qa/workunits/ceph-helpers: display rejected string#14468
Merged
tchaikov merged 2 commits intoceph:masterfrom Apr 13, 2017
Merged
qa/workunits/ceph-helpers: display rejected string#14468tchaikov merged 2 commits intoceph:masterfrom
tchaikov merged 2 commits intoceph:masterfrom
Conversation
Contributor
Author
|
|
@tchaikov the idea is to not run another command to display the result because it may show something different, right ? |
253ce72 to
4d3af1b
Compare
Contributor
Author
|
@dachary exactly. |
Contributor
Author
Contributor
Author
|
and a side effect of this change is that we don't need to take the "pipefail option" into consideration when looking at this test anymore. |
ghost
suggested changes
Apr 12, 2017
qa/workunits/ceph-helpers.sh
Outdated
| local status=$? | ||
| if [ $status -eq 0 ]; then | ||
| ceph osd erasure-code-profile rm TESTPROFILE | ||
| elif [ ! echo $s | grep --quiet "$grepstr" ]; then |
There was a problem hiding this comment.
elif ! echo $s | grep --quiet "$grepstr" ; then status=1
Contributor
Author
so ceph failed to set the FAKE ec plugin, but it returned 0 nevertheless. |
4d3af1b to
9d27357
Compare
Signed-off-by: Kefu Chai <kchai@redhat.com>
9d27357 to
0196e15
Compare
tchaikov
commented
Apr 12, 2017
| local plugin=$1 | ||
| local status | ||
| local grepstr | ||
| local s |
Contributor
Author
Contributor
Author
ghost
approved these changes
Apr 12, 2017
it would be a race otherwise, because we cannot be sure that the cluster pgs are not all clean or not when run_osd() returns, but we can be sure that they are expected to active+clean after a while. that's what wait_for_clean() does. Signed-off-by: Kefu Chai <kchai@redhat.com>
Contributor
Author
see https://jenkins.ceph.com/job/ceph-pull-requests/21917/console |
Contributor
Author
retest this please. |
Contributor
Author
|
retest this please. |
ghost
approved these changes
Apr 13, 2017
| run_mon $dir a --osd_pool_default_size=1 || return 1 | ||
| run_mgr $dir x || return 1 | ||
| run_osd $dir 0 || return 1 | ||
| ! is_clean || return 1 |
Contributor
Contributor
Author
|
@smithfarm yes, i think so. |
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
http://tracker.ceph.com/issues/20344