diff options
| author | Laura Flores <lflores@redhat.com> | 2024-07-12 20:43:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-12 20:43:12 +0200 |
| commit | 415f7ca0e82865eb36d5de583c8e3b5307298175 (patch) | |
| tree | 6d6b2cd51d7942d0224d33179b5b991dd94795d8 /qa/standalone | |
| parent | Merge pull request #58554 from ceph/wip-yuriw-release-process-main (diff) | |
| parent | qa/standlone/mon/mon-cluster-log.sh: TEST_journald_cluster_log_level (diff) | |
| download | ceph-415f7ca0e82865eb36d5de583c8e3b5307298175.tar.xz ceph-415f7ca0e82865eb36d5de583c8e3b5307298175.zip | |
Merge pull request #58324 from kamoltat/wip-ksirivad-fix-63784
qa/standalone/mon: Fix mkfs test & TEST_LOG failures
Diffstat (limited to 'qa/standalone')
| -rwxr-xr-x | qa/standalone/mon/mkfs.sh | 3 | ||||
| -rwxr-xr-x | qa/standalone/mon/mon-cluster-log.sh | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/qa/standalone/mon/mkfs.sh b/qa/standalone/mon/mkfs.sh index 6650bdb499a..8461e2c05d0 100755 --- a/qa/standalone/mon/mkfs.sh +++ b/qa/standalone/mon/mkfs.sh @@ -129,8 +129,7 @@ function auth_cephx_key() { if mon_mkfs --key='corrupted key' ; then return 1 else - rm -fr $MON_DIR/store.db - rm -fr $MON_DIR/kv_backend + rm -fr $MON_DIR fi mon_mkfs --key=$key diff --git a/qa/standalone/mon/mon-cluster-log.sh b/qa/standalone/mon/mon-cluster-log.sh index 6e969596b20..863a97c7cab 100755 --- a/qa/standalone/mon/mon-cluster-log.sh +++ b/qa/standalone/mon/mon-cluster-log.sh @@ -59,6 +59,7 @@ function TEST_cluster_log_level() { ERRORS=$(($ERRORS + 1)) fi + ceph config set mon.a mon_cluster_log_level info ceph osd down 0 TIMEOUT=20 wait_for_osd up 0 || return 1 grep -q "cluster [[]INF[]] osd.0.*boot" $dir/log @@ -68,7 +69,6 @@ function TEST_cluster_log_level() { ERRORS=$(($ERRORS + 1)) fi - ceph config set mon.a mon_cluster_log_level info ceph pg deep-scrub 1.1 search_str="cluster [[]DBG[]] 1.1 deep-scrub" TIMEOUT=60 wait_for_string $dir/log "$search_str" @@ -134,7 +134,7 @@ function TEST_journald_cluster_log_level() { search_str="1.0 deep-scrub" TIMEOUT=60 sleep $TIMEOUT - journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=7 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log + sudo journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=7 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log grep -q "$search_str" $dir/journal.log return_code=$? if [ $return_code -ne 0 ]; then @@ -145,7 +145,7 @@ function TEST_journald_cluster_log_level() { ceph osd down 0 TIMEOUT=20 wait_for_osd up 0 || return 1 search_str="osd.0.*boot" - journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=6 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log + sudo journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=6 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log grep -q "$search_str" $dir/journal.log return_code=$? if [ $return_code -ne 0 ]; then @@ -158,7 +158,7 @@ function TEST_journald_cluster_log_level() { TIMEOUT=60 sleep $TIMEOUT search_str="1.1 deep-scrub" - journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=7 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log + sudo journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=7 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log grep -q "$search_str" $dir/journal.log return_code=$? if [ $return_code -eq 0 ]; then @@ -172,7 +172,7 @@ function TEST_journald_cluster_log_level() { ceph osd unset noup TIMEOUT=60 wait_for_osd up 0 || return 1 search_str="Health check failed: noup flag(s) set (OSDMAP_FLAGS)" - journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=4 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log + sudo journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=4 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log grep -q "$search_str" $dir/journal.log return_code=$? if [ $return_code -ne 0 ]; then @@ -185,7 +185,7 @@ function TEST_journald_cluster_log_level() { WAIT_FOR_CLEAN_TIMEOUT=60 wait_for_clean search_str="Client client.admin marked osd.0 out, while it was still marked up" ceph log last | grep -q "$search_str" || return 1 - journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=6 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log + sudo journalctl _COMM=ceph-mon CEPH_CHANNEL=cluster PRIORITY=6 --output=json-pretty --since "60 seconds ago" |jq '.MESSAGE' > $dir/journal.log grep -q "$search_str" $dir/journal.log return_code=$? if [ $return_code -eq 0 ]; then |