diff options
| author | Yuri Weinstein <yweinste@redhat.com> | 2024-11-22 00:49:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-22 00:49:56 +0100 |
| commit | d4ed9e06dd48a6d3f02120fde365ad95bc2d964e (patch) | |
| tree | 43d86921ea816ea67719db5aec9681f4beb3e350 /qa/standalone | |
| parent | Merge pull request #60523 from ljflores/wip-tracker-68657 (diff) | |
| parent | qa/standalone: bugfix for wait_for_scrub (diff) | |
| download | ceph-d4ed9e06dd48a6d3f02120fde365ad95bc2d964e.tar.xz ceph-d4ed9e06dd48a6d3f02120fde365ad95bc2d964e.zip | |
Merge pull request #59524 from liangmingyuanneo/wip-standalone-test-pg-repair
qa/standalone: bugfix for wait_for_scrub
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Diffstat (limited to 'qa/standalone')
| -rwxr-xr-x | qa/standalone/ceph-helpers.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index 82bf7391a7d..72d70ca7ad5 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -1888,7 +1888,6 @@ function repair() { local last_scrub=$(get_last_scrub_stamp $pgid) ceph pg repair $pgid wait_for_scrub $pgid "$last_scrub" - sleep 2 } function test_repair() { @@ -1902,7 +1901,7 @@ function test_repair() { wait_for_clean || return 1 repair 1.0 || return 1 kill_daemons $dir KILL osd || return 1 - ! TIMEOUT=1 repair 1.0 || return 1 + ! TIMEOUT=2 repair 1.0 || return 1 teardown $dir || return 1 } ####################################################################### @@ -1949,7 +1948,7 @@ function test_pg_scrub() { wait_for_clean || return 1 pg_scrub 1.0 || return 1 kill_daemons $dir KILL osd || return 1 - ! TIMEOUT=1 pg_scrub 1.0 || return 1 + ! TIMEOUT=2 pg_scrub 1.0 || return 1 teardown $dir || return 1 } @@ -2089,7 +2088,7 @@ function test_wait_for_scrub() { wait_for_scrub $pgid "$last_scrub" || return 1 kill_daemons $dir KILL osd || return 1 last_scrub=$(get_last_scrub_stamp $pgid) - ! TIMEOUT=1 wait_for_scrub $pgid "$last_scrub" || return 1 + ! TIMEOUT=2 wait_for_scrub $pgid "$last_scrub" || return 1 teardown $dir || return 1 } |