You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by ji...@apache.org on 2022/08/18 03:49:45 UTC
[incubator-pegasus] branch v2.4 updated (6e6d8eb57 -> 2175e3e4a)
This is an automated email from the ASF dual-hosted git repository.
jiashuo pushed a change to branch v2.4
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
from 6e6d8eb57 fix(go-client): scan will not recover when encounter `error_invalid_state` (#1106)
new 00aadc71c fix(github): fix the conditions for file changes that trigger workflows (#1123)
new a1b499fc0 chore: update NOTICE year to 2022 (#1119)
new 2175e3e4a chore: update file paths in LICENSE (#1121)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/lint_and_test_cpp.yaml | 154 +++++++++++++++++++++----------
.licenserc.yaml | 5 -
LICENSE | 134 ++++++++++++---------------
NOTICE | 2 +-
4 files changed, 162 insertions(+), 133 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 03/03: chore: update file paths in LICENSE (#1121)
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiashuo pushed a commit to branch v2.4
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 2175e3e4ab92b73c4e2294e2c6ad91c8a66411e2
Author: Dan Wang <wa...@apache.org>
AuthorDate: Wed Aug 17 19:38:32 2022 +0800
chore: update file paths in LICENSE (#1121)
---
.licenserc.yaml | 5 ---
LICENSE | 134 ++++++++++++++++++++++++--------------------------------
2 files changed, 57 insertions(+), 82 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 9750ec90b..829c95705 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -29,9 +29,6 @@ header:
- '.github/ISSUE_TEMPLATE/general_question.md'
- '.rat-excludes'
- 'DISCLAIMER-WIP'
- # TODO(yingchun): rrdb_types.* files can be automatic generated when build, we can remove them later.
- - 'src/base/rrdb_types.cpp'
- - 'src/include/rrdb/rrdb_types.h'
# TODO(yingchun): shell/* files are import from thirdparties, we can move them to thirdparty later.
- 'src/shell/argh.h'
- 'src/shell/linenoise/linenoise.c'
@@ -60,8 +57,6 @@ header:
- 'src/rdsn/src/runtime/build_config.h'
- 'src/rdsn/src/utils/test/autoref_ptr_test.cpp'
- 'src/rdsn/include/dsn/utility/safe_strerror_posix.h'
- - 'src/rdsn/src/runtime/build_config.h'
- - 'src/rdsn/src/utils/test/autoref_ptr_test.cpp'
- 'src/rdsn/src/utils/safe_strerror_posix.cpp'
# Copyright 2017 The Abseil Authors
- 'src/rdsn/include/dsn/utility/absl/base/internal/invoke.h'
diff --git a/LICENSE b/LICENSE
index 4ae5059d2..5353d7729 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,7 +203,7 @@ limitations under the License.
--------------------------------------------------------------------------------
-rdsn/** - MIT License
+src/rdsn/** - MIT License
The MIT License (MIT)
@@ -296,7 +296,7 @@ src/shell/sds/* - BSD-2-Clause License
--------------------------------------------------------------------------------
-src/shell/argh.h - BSD 3-Clause
+src/shell/argh.h - BSD-3-Clause License
Copyright (c) 2016, Adi Shavit
All rights reserved.
@@ -327,15 +327,15 @@ src/shell/argh.h - BSD 3-Clause
--------------------------------------------------------------------------------
-rdsn/include/dsn/utility/smart_pointers.h - Apache 2.0 License
-rdsn/include/dsn/utility/string_view.h
-rdsn/include/dsn/utility/absl/base/internal/invoke.h
-rdsn/include/dsn/utility/absl/utility/utility.h
-rdsn/src/utils/memutil.h
-rdsn/src/utils/string_view.cpp
-rdsn/src/utils/test/memutil_test.cpp
-rdsn/src/utils/test/smart_pointers_test.cpp
-rdsn/src/utils/test/string_view_test.cpp
+src/rdsn/include/dsn/utility/smart_pointers.h - Apache 2.0 License
+src/rdsn/include/dsn/utility/string_view.h
+src/rdsn/include/dsn/utility/absl/base/internal/invoke.h
+src/rdsn/include/dsn/utility/absl/utility/utility.h
+src/rdsn/src/utils/memutil.h
+src/rdsn/src/utils/string_view.cpp
+src/rdsn/src/utils/test/memutil_test.cpp
+src/rdsn/src/utils/test/smart_pointers_test.cpp
+src/rdsn/src/utils/test/string_view_test.cpp
Copyright 2017 The Abseil Authors.
@@ -353,29 +353,7 @@ limitations under the License.
--------------------------------------------------------------------------------
-rdsn/src/http/pprof_http_service.cpp - Apache 2.0 License
-rdsn/include/dsn/utility/timer.h
-rdsn/include/dsn/utility/string_splitter.h
-
-Copyright (c) 2011 Baidu, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------------------------------------
-
-rdsn/include/dsn/utility/safe_strerror_posix.h - 3-clause BSD
-rdsn/src/runtime/build_config.h
-rdsn/src/utils/test/autoref_ptr_test.cpp
+src/rdsn/src/utils/safe_strerror_posix.cpp - BSD-3-Clause License
Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
@@ -407,9 +385,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
-rdsn/include/dsn/utility/TokenBucket.h - Apache License, Version 2.0
-rdsn/src/utils/test/TokenBucketTest.cpp
-rdsn/src/utils/test/TokenBucketTest.h
+src/rdsn/include/dsn/utility/TokenBucket.h - Apache License, Version 2.0
+src/rdsn/src/utils/test/TokenBucketTest.cpp
+src/rdsn/src/utils/test/TokenBucketTest.h
Copyright (c) Facebook, Inc. and its affiliates.
@@ -427,12 +405,12 @@ limitations under the License.
--------------------------------------------------------------------------------
-rdsn/include/dsn/utility/hpc_locks/autoreseteventcondvar.h - zlib License
-rdsn/include/dsn/utility/hpc_locks/rwlock.h
-rdsn/include/dsn/utility/hpc_locks/autoresetevent.h
-rdsn/include/dsn/utility/hpc_locks/sema.h
-rdsn/include/dsn/utility/hpc_locks/bitfield.h
-rdsn/include/dsn/utility/hpc_locks/benaphore.h
+src/rdsn/include/dsn/utility/hpc_locks/autoreseteventcondvar.h - zlib License
+src/rdsn/include/dsn/utility/hpc_locks/rwlock.h
+src/rdsn/include/dsn/utility/hpc_locks/autoresetevent.h
+src/rdsn/include/dsn/utility/hpc_locks/sema.h
+src/rdsn/include/dsn/utility/hpc_locks/bitfield.h
+src/rdsn/include/dsn/utility/hpc_locks/benaphore.h
Copyright (c) 2015 Jeff Preshing
@@ -454,12 +432,8 @@ freely, subject to the following restrictions:
--------------------------------------------------------------------------------
-rdsn/src/runtime/build_config.h - BSD-3-Clause license
-rdsn/src/utils/test/autoref_ptr_test.cpp
-rdsn/include/dsn/utility/safe_strerror_posix.h
-rdsn/src/runtime/build_config.h
-rdsn/src/utils/test/autoref_ptr_test.cpp
-rdsn/src/utils/safe_strerror_posix.cpp
+src/rdsn/src/runtime/build_config.h - BSD-3-Clause License
+src/rdsn/src/utils/test/autoref_ptr_test.cpp
Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -491,34 +465,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
-rdsn/include/dsn/utility/absl/base/internal/invoke.h - Apache License, Version 2.0
-rdsn/include/dsn/utility/absl/utility/utility.h
-rdsn/include/dsn/utility/smart_pointers.h
-rdsn/include/dsn/utility/string_view.h
-rdsn/src/utils/test/memutil_test.cpp
-rdsn/src/utils/test/string_view_test.cpp
-rdsn/src/utils/test/smart_pointers_test.cpp
-rdsn/src/utils/memutil.h
-rdsn/src/utils/string_view.cpp
-
-Copyright 2017 The Abseil Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------------------------------------
-
-rdsn/bin/FindRT.cmake - BSD-3-Clause license
-rdsn/bin/FindDL.cmake
+cmake_modules/FindRT.cmake - BSD-3-Clause license
+cmake_modules/FindDL.cmake
Copyright (c) 2010-2011, Rob Jansen
@@ -582,3 +530,35 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+--------------------------------------------------------------------------------
+
+src/rdsn/include/dsn/utility/safe_strerror_posix.h - BSD-3-Clause License
+
+Copyright (c) 2011 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 01/03: fix(github): fix the conditions for file changes that trigger workflows (#1123)
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiashuo pushed a commit to branch v2.4
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit 00aadc71cec14a7386dca268d9fc6175c111f606
Author: Dan Wang <wa...@apache.org>
AuthorDate: Wed Aug 17 11:03:10 2022 +0800
fix(github): fix the conditions for file changes that trigger workflows (#1123)
---
.github/workflows/lint_and_test_cpp.yaml | 154 +++++++++++++++++++++----------
1 file changed, 104 insertions(+), 50 deletions(-)
diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml
index 2a8cace2d..4d4f38eb3 100644
--- a/.github/workflows/lint_and_test_cpp.yaml
+++ b/.github/workflows/lint_and_test_cpp.yaml
@@ -32,6 +32,13 @@ on:
- 'v[0-9]+.*' # release branch
- ci-test # testing branch for github action
- '*dev'
+ paths:
+ - '.github/workflows/lint_and_test_cpp.yaml'
+ - 'CMakeLists.txt'
+ - 'run.sh'
+ - 'cmake_modules/**'
+ - 'src/**'
+ - 'thirdparty/**'
# for manually triggering workflow
workflow_dispatch:
@@ -74,12 +81,6 @@ jobs:
id: changes
with:
filters: |
- base:
- - 'cmake_modules/**'
- - 'CMakeLists.txt'
- - 'run.sh'
- rdsn:
- - 'src/rdsn/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
@@ -93,14 +94,24 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
- run: ./run.sh build -c --rdsn --test --skip_thirdparty -j $(($(nproc)/2+1))
- - name: Unit Testing
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
- export LD_LIBRARY_PATH=`pwd`/thirdparty/output/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- ulimit -s unlimited
- ./run.sh test --rdsn
+ ccache -p
+ ccache -z
+ ./run.sh build --test --skip_thirdparty -j $(nproc) -t release
+ ccache -s
+ - name: Pack Server
+ run: ./run.sh pack_server
+ - name: Pack Tools
+ run: ./run.sh pack_tools
+ - name: Tar files
+ run: |
+ rm -rf thirdparty
+ tar -zcvhf release__builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini --exclude='*CMakeFiles*'
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: release_artifact_${{ github.sha }}
+ path: release__builder.tar
test_rdsn_ASAN:
name: Test rdsn with ASAN
@@ -170,12 +181,6 @@ jobs:
id: changes
with:
filters: |
- base:
- - 'cmake_modules/**'
- - 'CMakeLists.txt'
- - 'run.sh'
- rdsn:
- - 'src/rdsn/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
@@ -189,14 +194,20 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
- run: ./run.sh build -c --rdsn --test --sanitizer leak --skip_thirdparty --disable_gperf -j $(($(nproc)/2+1))
- - name: Unit Testing
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
- export LD_LIBRARY_PATH=`pwd`/thirdparty/output/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- ulimit -s unlimited
- ./run.sh test --rdsn
+ ccache -p
+ ccache -z
+ ./run.sh build --test --sanitizer address --skip_thirdparty --disable_gperf -j $(nproc)
+ ccache -s
+ - name: Tar files
+ run: |
+ rm -rf thirdparty
+ tar -zcvhf release_address_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini --exclude='*CMakeFiles*'
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: release_address_artifact_${{ github.sha }}
+ path: release_address_builder.tar
test_rdsn_UBSAN:
name: Test rdsn with UBSAN
@@ -262,12 +273,6 @@ jobs:
id: changes
with:
filters: |
- base:
- - 'cmake_modules/**'
- - 'CMakeLists.txt'
- - 'run.sh'
- pegasus:
- - 'src/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
@@ -281,14 +286,68 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
- run: ./run.sh build --test -c -j $(($(nproc)/2+1)) --skip_thirdparty
- - name: Packaging Server
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
- run: ./run.sh pack_server
- - name: Packaging Tools
- if: steps.changes.outputs.base == 'true' || steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
- run: ./run.sh pack_tools
+ run: |
+ ccache -p
+ ccache -z
+ ./run.sh build --test --sanitizer undefined --skip_thirdparty --disable_gperf -j $(nproc)
+ ccache -s
+ - name: Tar files
+ run: |
+ rm -rf thirdparty
+ tar -zcvhf release_undefined_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini --exclude='*CMakeFiles*'
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: release_undefined_artifact_${{ github.sha }}
+ path: release_undefined_builder.tar
+
+ test_UBSAN:
+ name: Test UBSAN
+ strategy:
+ fail-fast: false
+ matrix:
+ test_module:
+ - base_test
+ - dsn_aio_test
+ - dsn_block_service_test
+ - dsn.failure_detector.tests
+ - dsn_http_test
+ - dsn_meta_state_tests
+ - dsn.meta.test
+ - dsn_nfs_test
+ - dsn_perf_counter_test
+ - dsn_replica_backup_test
+ - dsn_replica_bulk_load_test
+ - dsn_replica_dup_test
+ - dsn_replica_split_test
+ - dsn.replica.test
+ - dsn_replication_common_test
+ - dsn.replication.simple_kv
+ - dsn.rep_tests.simple_kv
+ - dsn_runtime_tests
+ - dsn_utils_tests
+ - dsn.zookeeper.tests
+ - pegasus_function_test
+ - pegasus_geo_test
+ - pegasus_rproxy_test
+ - pegasus_unit_test
+ needs: build_UBSAN
+ runs-on: ubuntu-latest
+ container:
+ image: apache/pegasus:thirdparties-bin-ubuntu1804-${{ github.base_ref }}
+ options: --cap-add=SYS_PTRACE
+ steps:
+ - uses: actions/checkout@v2
+ - name: Unpack prebuilt third-parties
+ run: unzip /root/thirdparties-bin.zip -d ./thirdparty
+ - name: Download Artifact
+ uses: actions/download-artifact@v3
+ with:
+ name: release_undefined_artifact_${{ github.sha }}
+ path: .
+ - name: Tar files
+ run: |
+ tar -zxvf release_undefined_builder.tar
- name: Unit Testing
if: steps.changes.outputs.base == 'true' || steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
@@ -324,14 +383,9 @@ jobs:
mkdir -p build
cmake -DCMAKE_BUILD_TYPE=Release -B build/ -DMACOS_OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
cmake --build build/ -j $(sysctl -n hw.physicalcpu)
- - uses: dorny/paths-filter@v2
- id: changes
- with:
- filters: |
- pegasus:
- - 'src/**'
- thirdparty:
- - 'thirdparty/**'
- name: Compilation
- if: steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
- run: ./run.sh build --test --skip_thirdparty -c -j $(sysctl -n hw.physicalcpu)
+ run: |
+ ccache -p
+ ccache -z
+ ./run.sh build --test --skip_thirdparty -j $(sysctl -n hw.physicalcpu)
+ ccache -s
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org
[incubator-pegasus] 02/03: chore: update NOTICE year to 2022 (#1119)
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiashuo pushed a commit to branch v2.4
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit a1b499fc01e9cdf8d6b232ca6fe2967a2d6580c6
Author: Dan Wang <wa...@apache.org>
AuthorDate: Wed Aug 17 14:52:49 2022 +0800
chore: update NOTICE year to 2022 (#1119)
---
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index f7f6c5d98..6b69a1ad1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Pegasus
-Copyright 2021 The Apache Software Foundation
+Copyright 2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org