From 5d7a2f254eddea50f027609b83538d1408322758 Mon Sep 17 00:00:00 2001 From: heyuchen Date: Fri, 26 Mar 2021 11:33:00 +0800 Subject: [PATCH 1/6] fix: do not get master while raise a new pull request --- .github/workflows/ci-pull-request.yaml | 7 +++---- src/server/info_collector.h | 4 ++-- src/server/table_stats.h | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index d60ab024cd..9f84d03d4b 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -31,10 +31,9 @@ jobs: run: working-directory: /root/incubator-pegasus steps: - - name: Clone Apache Pegasus Source - working-directory: /root - run: | - git clone --recursive --depth=1 https://github.com/apache/incubator-pegasus.git + - uses: actions/checkout@v2 + with: + fetch-depth: 1 - name: clang-format run: ./rdsn/scripts/linux/run-clang-format.py --clang-format-executable clang-format-3.9 -e ./src/shell/linenoise -e ./src/shell/sds -e ./rdsn -r ./src diff --git a/src/server/info_collector.h b/src/server/info_collector.h index c8012321a5..65312a0957 100644 --- a/src/server/info_collector.h +++ b/src/server/info_collector.h @@ -76,9 +76,9 @@ class info_collector recent_write_throttling_reject_count->set( row_stats.total_recent_write_throttling_reject_count); recent_read_throttling_delay_count->set( - row_stats.total_recent_read_throttling_delay_count); + row_stats.total_recent_read_throttling_delay_count); recent_read_throttling_reject_count->set( - row_stats.total_recent_read_throttling_reject_count); + row_stats.total_recent_read_throttling_reject_count); storage_mb->set(row_stats.total_storage_mb); storage_count->set(row_stats.total_storage_count); rdb_block_cache_hit_rate->set( diff --git a/src/server/table_stats.h b/src/server/table_stats.h index cf9e10edac..c3bafcdc06 100644 --- a/src/server/table_stats.h +++ b/src/server/table_stats.h @@ -117,9 +117,9 @@ struct table_stats total_recent_write_throttling_reject_count += row_stats.total_recent_write_throttling_reject_count; total_recent_read_throttling_delay_count += - row_stats.total_recent_read_throttling_delay_count; + row_stats.total_recent_read_throttling_delay_count; total_recent_read_throttling_reject_count += - row_stats.total_recent_read_throttling_reject_count; + row_stats.total_recent_read_throttling_reject_count; total_storage_mb += row_stats.total_storage_mb; total_storage_count += row_stats.total_storage_count; total_rdb_block_cache_hit_count += row_stats.total_rdb_block_cache_hit_count; From 7e8877aa10f41bad53bd46e4054ecfe84cba904c Mon Sep 17 00:00:00 2001 From: heyuchen Date: Fri, 26 Mar 2021 11:36:27 +0800 Subject: [PATCH 2/6] small fix --- .github/workflows/ci-pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index 9f84d03d4b..b4696f980d 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - fetch-depth: 1 + fetch-depth: 1 - name: clang-format run: ./rdsn/scripts/linux/run-clang-format.py --clang-format-executable clang-format-3.9 -e ./src/shell/linenoise -e ./src/shell/sds -e ./rdsn -r ./src From 8207706a8ae09510f1df3ae915100a489629d587 Mon Sep 17 00:00:00 2001 From: heyuchen Date: Fri, 26 Mar 2021 11:50:58 +0800 Subject: [PATCH 3/6] fix --- .github/workflows/ci-pull-request.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index b4696f980d..fd0bfdb681 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -34,6 +34,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 + submodules: true - name: clang-format run: ./rdsn/scripts/linux/run-clang-format.py --clang-format-executable clang-format-3.9 -e ./src/shell/linenoise -e ./src/shell/sds -e ./rdsn -r ./src From 5338a46c4e8e82fb5036a4e38bdbab3d9aea47bd Mon Sep 17 00:00:00 2001 From: heyuchen Date: Fri, 26 Mar 2021 11:54:47 +0800 Subject: [PATCH 4/6] fix --- .github/workflows/ci-pull-request.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index fd0bfdb681..aa832521c3 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -33,6 +33,7 @@ jobs: steps: - uses: actions/checkout@v2 with: + working-directory: /root fetch-depth: 1 submodules: true - name: clang-format From f54bff794afb69837453385f5a0c261f006559f4 Mon Sep 17 00:00:00 2001 From: heyuchen Date: Fri, 26 Mar 2021 12:00:35 +0800 Subject: [PATCH 5/6] fix --- .github/workflows/ci-pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index aa832521c3..ff0a17300a 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - working-directory: /root + path: /root/incubator-pegasus fetch-depth: 1 submodules: true - name: clang-format From a9201f9088eb8288073ce14b7befb5b342ba398c Mon Sep 17 00:00:00 2001 From: heyuchen Date: Fri, 26 Mar 2021 12:02:26 +0800 Subject: [PATCH 6/6] fix --- .github/workflows/ci-pull-request.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index ff0a17300a..0509499f71 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -27,13 +27,9 @@ jobs: runs-on: ubuntu-latest container: image: apachepegasus/clang-format-3.9 - defaults: - run: - working-directory: /root/incubator-pegasus steps: - uses: actions/checkout@v2 with: - path: /root/incubator-pegasus fetch-depth: 1 submodules: true - name: clang-format