This is an automated email from the ASF dual-hosted git repository. jin pushed a commit to branch diasble-raft in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 1dc4812c781b763757ebe98edcba4c0a98356939 Author: imbajin <[email protected]> AuthorDate: Mon Nov 13 17:07:13 2023 +0800 chore: disable raft test in normal PR due to timeout problem And replace it in pd/store module --- .github/workflows/ci.yml | 6 ++++-- .../hugegraph-dist/src/assembly/static/bin/raft-tools.sh | 8 ++++---- .../hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 670831aa0..9451fc655 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,11 +20,12 @@ jobs: BASE_BRANCH_NAME: ${{ github.base_ref }} TARGET_BRANCH_NAME: ${{ github.base_ref != '' && github.base_ref || github.ref_name }} RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release-') || startsWith(github.ref_name, 'test-') }} + RAFT_MODE: ${{ startsWith(github.head_ref, 'test') || startsWith(github.head_ref, 'raft') }} strategy: fail-fast: false matrix: - BACKEND: [ memory, cassandra, scylladb, hbase, rocksdb, mysql, postgresql ] + BACKEND: [ memory, rocksdb, hbase, cassandra, mysql, postgresql, scylladb ] JAVA_VERSION: [ '8', '11' ] steps: @@ -77,8 +78,9 @@ jobs: run: | $TRAVIS_DIR/run-api-test.sh $BACKEND $REPORT_DIR + # TODO: disable raft test in normal PR due to the always timeout problem - name: Run raft test - if: ${{ env.BACKEND == 'rocksdb' }} + if: ${{ env.RAFT_MODE == 'true' && env.BACKEND == 'rocksdb' }} run: | $TRAVIS_DIR/run-api-test-for-raft.sh $BACKEND $REPORT_DIR diff --git a/hugegraph-server/hugegraph-dist/src/assembly/static/bin/raft-tools.sh b/hugegraph-server/hugegraph-dist/src/assembly/static/bin/raft-tools.sh index a5df8fb08..329361baa 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/static/bin/raft-tools.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/static/bin/raft-tools.sh @@ -18,9 +18,9 @@ export LANG=zh_CN.UTF-8 set -e -HOME_PATH=`dirname $0` -HOME_PATH=`cd ${HOME_PATH}/.. && pwd` -cd ${HOME_PATH} +HOME_PATH=$(dirname "$0") +HOME_PATH=$(cd "${HOME_PATH}"/.. && pwd) +cd "${HOME_PATH}" BIN_PATH=${HOME_PATH}/bin CONF_PATH=${HOME_PATH}/conf @@ -98,7 +98,7 @@ function remove_peer() { } if [ "${HUGEGRAPH_URL}" = "" ]; then - HUGEGRAPH_URL=`read_property ${CONF_PATH}/rest-server.properties restserver.url` + HUGEGRAPH_URL=$(read_property ${CONF_PATH}/rest-server.properties restserver.url) fi if [ "${HUGEGRAPH_GRAPH}" = "" ]; then diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh index 889b05e07..c8647d997 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh @@ -21,8 +21,8 @@ BACKEND=$1 REPORT_DIR=$2 REPORT_FILE=$REPORT_DIR/jacoco-api-test.xml -TRAVIS_DIR=`dirname $0` -VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` +TRAVIS_DIR=$(dirname $0) +VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) SERVER_DIR=hugegraph-server/apache-hugegraph-incubating-$VERSION RAFT1_DIR=hugegraph-raft1 RAFT2_DIR=hugegraph-raft2
