Commit Graph

6050 Commits

Author SHA1 Message Date
Albumen Kevin b8ea46d038 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/ConnectionHandler.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java
2023-01-04 17:36:49 +08:00
Andy Cheung 34168e6d0e
Merge error code 3-3 to 3-8, 6-4 to 99-0. (#11225)
* Replace LoggerCodeConstants.java with 3.2 branch.

* Add hints in the constant file.

* Add hints in the constant file. (2)

* Merge 3-3 to 3-8.

* 6-4 -> 99-0.

* 6-4 -> 99-0.

* 6-4 -> 99-0.

* 6-4 -> 99-0. (4)

* 6-4 -> 99-0. (5, Compatible)

* Change AbstractH2TransportListener's error code per @EarthChen's request.
2023-01-03 15:03:55 +08:00
earthchen 2765deb98d
fix tri upper error (#11214)
* fix error

* fix

* fix

* fix

* fix

* fix
2022-12-31 13:41:31 +08:00
Albumen Kevin 73969703b1
Add some qos command logs (#11224)
* Add some qos command logs

* Add some qos command logs

* Fix tests
2022-12-30 20:34:44 +08:00
ShenFeng312 854d85953d
fix #11033 (#11144) 2022-12-30 16:27:16 +08:00
Albumen Kevin 3375f727e1 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
2022-12-30 15:53:09 +08:00
Albumen Kevin f03f374397
Enhance Zookeeper ServiceDiscovery update (#11220) 2022-12-30 15:52:26 +08:00
Andy Cheung 2c6a933d3a
Change some test-related error code to a separate series. (#11219)
* Revert changes in FailsafeLoggerTest.

* COMMON_FAILED_REFLECT -> COMMON_REFLECTIVE_OPERATION_FAILED. Add 81-1.

* 1-25 -> 81-2.

* 1-23 / 5-19 -> 81-3 / 81-4.
2022-12-30 15:50:42 +08:00
Albumen Kevin f5df7edcdf resolve conflict 2022-12-29 17:33:56 +08:00
Albumen Kevin 0e4997b252 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
#	dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
2022-12-29 17:33:02 +08:00
Albumen Kevin e86e6e3209
Fix zookeeper instance update (#11212) 2022-12-29 17:12:33 +08:00
Albumen Kevin 1ecc00a713
Fix Nacos empty ticket not work (#11213) 2022-12-29 11:14:08 +08:00
Andy Cheung 992e125a1a
Merge error code 1-36 to 99-0. (#11207)
* Merge 1-36 to 99-0.

* Merge 1-36 to 99-0. (2)

* Merge 1-36 to 99-0. (3)

* Merge 1-36 to 99-0. (4)
2022-12-27 11:43:51 +08:00
Albumen Kevin 58131051c3
Fix active limit filter not work (#11206) 2022-12-26 20:36:24 +08:00
Albumen Kevin a7592e3bea
Fix warn when port are the same (#11202) 2022-12-26 14:47:23 +08:00
wuwen 98c2f39090
Fix deadlocks in lazy-init situations. (#11194)
* Fix deadlocks in lazy-init situations.

* Fix deadlocks in lazy-init situations(Compatible with versions earlier than spring-4.2)
2022-12-25 21:17:20 +08:00
Albumen Kevin 0d02c79542
Fix Spring Cloud metadata override (#11197) 2022-12-25 21:07:01 +08:00
Albumen Kevin 2a7dd3dc29
Fix error code in 3.2 branch (#11199)
* Fix error code in 3.2 branch

* Fix error code in 3.2 branch
2022-12-25 20:33:15 +08:00
xieshouyu 513bdf56b0
1.test JSONObject to personMap pojo, the personMap extends HashMap (#11177)
* 1.test JSONObject to personMap pojo, the personMap extends HashMap

* 1.add LICENSE-2.0

* 1.update LICENSE-2.0 to first row

Co-authored-by: 水手 <xieshouyu@cai-inc.com>
2022-12-22 20:16:40 +08:00
Andy Cheung 0e549fb064
Turn on error reporting of Error Code Inspector. (#11182) 2022-12-22 20:16:19 +08:00
wxbty f5a5fa29a4
npe fix (#11192) 2022-12-22 20:15:02 +08:00
Albumen Kevin 459a0f915b Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-dependencies-bom/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#	pom.xml
2022-12-22 15:50:23 +08:00
Albumen Kevin 7ccb33ffa6 Bump to 3.2.0-beta.4-SNAPSHOT 2022-12-22 15:49:35 +08:00
Albumen Kevin 0683a286e1 Merge branch '3.2.0-beta.3-release' into apache-3.2 2022-12-22 15:49:05 +08:00
Albumen Kevin dd163ecf5a Bump to 3.1.5-SNAPSHOT 2022-12-22 15:48:05 +08:00
Albumen Kevin 873df39a79 Merge branch '3.1.4-release' into apache-3.1 2022-12-22 15:47:28 +08:00
Albumen Kevin 0df34a1a20
Remove ExtensionLoader getExtension usage (#10971) 2022-12-22 10:02:22 +08:00
Albumen Kevin bb05764dd3
Fix Consumer ClassLoader Change (#11179)
* Fix Consumer ClassLoader Change

* Add test cases

* Fix uts
2022-12-21 23:29:42 +08:00
Albumen Kevin eba39fd65b Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java
2022-12-21 23:25:53 +08:00
Andy Cheung 1bfd354d3d
Change constant name of error code 0-2, merge 4-19 to 0-2. Add error code of 'port is overridden' hint. (#11181)
* Change 4-19 to 0-2 (same actually).

* Use error code 4-19.

* Add cause.
2022-12-21 23:14:29 +08:00
huazhongming 6967ab4a9b
native support openjdk17 (#11183)
Signed-off-by: crazyhzm <crazyhzm@gmail.com>

Signed-off-by: crazyhzm <crazyhzm@gmail.com>
2022-12-21 14:32:42 +08:00
Albumen Kevin 4a2566d2db
Lazy init scope model in config (#11142) 2022-12-21 11:56:21 +08:00
一个不知名的Java靓仔 3c103d40cd
issue 5900:add bytebuddy support (#11117)
* issue 5900:add bytebuddy support

* remove unused import

* edit comment

* rename CompositeMethodInvoker

* add unit test

* fix ut
2022-12-20 23:38:08 +08:00
Andy Cheung 0b2a8f0396
Correct the logger's error statement to info. (#11165) 2022-12-20 22:29:11 +08:00
Albumen Kevin 522db68efe Merge branch 'apache-3.2' into 3.2.0-beta.3-release 2022-12-16 21:00:34 +08:00
Albumen Kevin fe4d99dfaa Merge branch 'apache-3.1' into apache-3.2 2022-12-16 21:00:17 +08:00
Albumen Kevin e7146d73ad
Remove provided scope of protobuf-java (#11164) 2022-12-16 20:58:18 +08:00
Albumen Kevin 69489b2675 Prepare 3.2.0-beta.3 Release 2022-12-16 13:43:58 +08:00
Albumen Kevin 80a15197e6 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
2022-12-16 12:56:56 +08:00
Albumen Kevin 941f1b4530 Merge branch 'apache-3.1' into 3.1.4-release 2022-12-16 12:55:51 +08:00
Albumen Kevin 705b327885
Revert #10839, #11082 and #11086 (#11160) 2022-12-16 12:53:22 +08:00
earthchen 5fdc88d09e
Fix tri convert upper header (#11075) 2022-12-16 11:06:00 +08:00
Albumen Kevin e40edb7081 Fix import 2022-12-15 20:20:41 +08:00
Albumen Kevin 6682df3772 Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
#	dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/ReflectionPackableMethod.java
#	dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocol.java
2022-12-15 20:16:16 +08:00
Albumen Kevin b58a06443e Temporally disable MultiInstanceTest 2022-12-15 18:11:23 +08:00
Albumen Kevin b1ae0def58 Fix uts 2022-12-15 18:10:10 +08:00
Albumen Kevin 078abfa9b3 Prepare 3.1.4 Release 2022-12-15 17:31:02 +08:00
Albumen Kevin cbb5b5a7c3 Remove debug log 2022-12-15 17:27:02 +08:00
Albumen Kevin 7ec01c0941 Fix testMultiProviderApplicationsStopOneByOne create new framework model 2022-12-15 17:26:17 +08:00
Albumen Kevin 5034baba00 Print stack trace when creating global shared handler 2022-12-15 17:02:22 +08:00