diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9f5e9db9d..e682ae5b55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -233,10 +233,10 @@ jobs: path: | /tmp/ceresdb-stdout.log - recover-test: - name: recover-test + recovery-test: + name: recovery-test runs-on: ubuntu-latest - timeout-minutes: 120 + timeout-minutes: 60 steps: - uses: actions/checkout@v3 with: diff --git a/integration_tests/Makefile b/integration_tests/Makefile index 4f2ca8a628..84bb3454e1 100644 --- a/integration_tests/Makefile +++ b/integration_tests/Makefile @@ -71,4 +71,4 @@ run-prom: cd prom && ./run-tests.sh run-recovery: clean build-ceresdb kill-old-process - cd recovery && sh ./run.sh && sh ./run.sh shard_based + cd recovery && ./run.sh && ./run.sh shard_based diff --git a/integration_tests/prom/remote-query.py b/integration_tests/prom/remote-query.py index 8b2872dfd5..be66e7743e 100755 --- a/integration_tests/prom/remote-query.py +++ b/integration_tests/prom/remote-query.py @@ -82,7 +82,7 @@ def remote_query(ts): # uppercase table r = execute_pql(table2 + '{tag1="v1"}[5m]') result = r['data']['result'] - assert result == [{'metric': {'__name__': table2, 'tag1': 'v1', 'tag2': 'v2'}, 'values': [[ts-5, '10'], [ts, '110']]}] + assert result == [{'metric': {'__name__': table2, 'tag1': 'v1', 'tag2': 'v2'}, 'values': [[ts-4, '10'], [ts, '110']]}] def main(): ts = now() diff --git a/integration_tests/recovery/run.sh b/integration_tests/recovery/run.sh old mode 100644 new mode 100755 index 87640325da..666c9b8da2 --- a/integration_tests/recovery/run.sh +++ b/integration_tests/recovery/run.sh @@ -7,7 +7,7 @@ BINARY_PATH=${ROOT}/../../target/debug/ceresdb-server SERVER_HTTP_ENDPOINT=127.0.0.1:5440 CONFIG_FILE=${ROOT}/../../docs/minimal.toml -if [[ ${1} == "shard_based" ]]; then +if [ ${1} == 'shard_based' ]; then CONFIG_FILE=${ROOT}/../config/shard-based-recovery.toml fi @@ -25,7 +25,7 @@ python3 ./check.py -ts ${NOW} echo "Flush, restart and check..." curl -XPOST ${SERVER_HTTP_ENDPOINT}/debug/flush_memtable -echo "\nflush finish..." +echo "\nFlush finish..." killall ceresdb-server | true nohup ${BINARY_PATH} --config ${CONFIG_FILE} & sleep 10