This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 3375f727e1bdf63f0bf25134842aef1eaaa819d8 Merge: f5df7edcdf f03f374397 Author: Albumen Kevin <[email protected]> AuthorDate: Fri Dec 30 15:53:09 2022 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # .github/workflows/build-and-test-pr.yml # dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java .github/workflows/build-and-test-pr.yml | 4 +- .../common/constants/LoggerCodeConstants.java | 29 ++++++-- .../org/apache/dubbo/common/utils/PojoUtils.java | 4 +- .../org/apache/dubbo/config/AbstractConfig.java | 4 +- .../rpc/model/ReflectionMethodDescriptor.java | 4 +- .../common/logger/support/FailsafeLoggerTest.java | 33 +++++---- .../dubbo/config/spring/EmbeddedZooKeeper.java | 8 +-- .../zookeeper/ZookeeperServiceDiscovery.java | 81 ++++++---------------- .../ZookeeperServiceDiscoveryChangeWatcher.java | 67 +++++++----------- .../zookeeper/util/CuratorFrameworkUtils.java | 59 ---------------- .../apache/dubbo/rpc/filter/GenericImplFilter.java | 4 +- .../org/apache/dubbo/rpc/support/RpcUtils.java | 6 +- .../protocol/tri/stream/TripleClientStream.java | 4 +- .../initializer/DownloadZookeeperInitializer.java | 4 +- .../processor/ZookeeperUnixProcessor.java | 8 +-- 15 files changed, 113 insertions(+), 206 deletions(-) diff --cc .github/workflows/build-and-test-pr.yml index ac29b0d51a,d01b0f0ece..583b3338be --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@@ -199,12 -198,12 +199,12 @@@ jobs GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | source ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip [...] - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -DtrimStackTrace=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat. [...] ++ ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -DtrimStackTrace=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false [...] - name: "Test with Maven without SonarCloud Scan" if: ${{ github.repository != 'apache/dubbo' }} timeout-minutes: 70 run: | - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco -DtrimStackTrace=false -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper ++ ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -DtrimStackTrace=false -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v3 diff --cc dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java index 35b9e27993,ef4be3c1a6..1c6b10fc94 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java @@@ -163,11 -170,7 +172,11 @@@ public interface LoggerCodeConstants String REGISTRY_FAILED_LOAD_METADATA = "1-39"; - // Cluster module + String REGISTRY_ROUTER_WAIT_LONG = "1-40"; + + String REGISTRY_ISTIO_EXCEPTION = "1-41"; + - // cluster module 2-x ++ // Cluster module 2-x String CLUSTER_FAILED_SITE_SELECTION = "2-1"; String CLUSTER_NO_VALID_PROVIDER = "2-2"; @@@ -393,8 -397,15 +405,17 @@@ String QOS_UNEXPECTED_EXCEPTION = "7-6"; + String QOS_PERMISSION_DENY_EXCEPTION = "7-7"; + + // Testing module (8[X], where [X] is number of the module to be tested.) + String TESTING_REGISTRY_FAILED_TO_START_ZOOKEEPER = "81-1"; + + String TESTING_REGISTRY_FAILED_TO_STOP_ZOOKEEPER = "81-2"; + + String TESTING_REGISTRY_FAILED_TO_DOWNLOAD_ZK_FILE = "81-3"; + + String TESTING_INIT_ZOOKEEPER_SERVER_ERROR = "81-4"; + // Internal unknown error. /**
