Commit Graph

394 Commits

Author SHA1 Message Date
KomachiSion
cf5a171ac5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	NOTICE
#	api/pom.xml
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
#	naming/src/test/java/com/alibaba/nacos/naming/consistency/persistent/impl/NamingSnapshotOperationTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskTest.java
#	pom.xml
#	test/src/test/java/com/alibaba/nacos/test/core/JacksonUtils.java
2021-05-14 11:04:52 +08:00
孙继峰
4ecf293fa7
[ISSUE #5704] adjust code style (#5705) 2021-05-14 10:07:52 +08:00
孙继峰
7ed7b45772
[ISSUE #5538] fix test case fail (#5620) 2021-05-14 09:38:20 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +08:00
wql
a713203c66
IPv6 and IPv4 check rules are optimized. splitIPPortStr method adds IPv4 check, and the optimized method does not affect the startup of container environment (#5514)
* The IPv6 judgment logic in this method will obtain IP address according to the host. In the container environment, K8S has not allocated IP to this pod, and then the judgment will report an error. After finding this problem, I gave feedback to remove the IPv4 judgment, but this problem still exists in IPv6. Suggested to remove the verification logic can be in other ways to optimize.

* Revert "The IPv6 judgment logic in this method will obtain IP address according to the host. In the container environment, K8S has not allocated IP to this pod, and then the judgment will report an error. After finding this problem, I gave feedback to remove the IPv4 judgment, but this problem still exists in IPv6. Suggested to remove the verification logic can be in other ways to optimize."

This reverts commit a112e52

* Both IPv4 and IPv6 validation rules adopt regular validation. In order to prevent the container from adding domain name rule validation in the case of domain name resolution deployment, the logic of removing Chinese slogan should be added before the rule validation in IPv6.

* Optimize and add licenses according to Ali's protocol

* The isDomain method is changed to validate only rules

* Format to optimize
2021-04-30 09:14:08 +08:00
brothelul
d65453f163
format the code in DefaultPublisher.java, log.error and @Override issue (#5515) 2021-04-29 18:57:20 +08:00
KomachiSion
2847373fd0 Solve conflict 2021-04-27 16:19:56 +08:00
KomachiSion
92da848375 Merge remote-tracking branch 'upstream/develop' into merge-1.X-to-2.0
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/PushReceiver.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/SubscribeManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/BaseTest.java
2021-04-27 15:57:24 +08:00
孙继峰
da3a1ea796
[ISSUE #5380] Use assert instead of System.out (#5472)
* use assert instead of System.out

* move test case, there is no file named ParamCheckUtil.java
2021-04-25 10:03:28 +08:00
孙继峰
3ce1cbab8b
fix #5390 (#5391) 2021-04-19 10:56:43 +08:00
杨翊 SionYang
73eea9c0bb
Use ThreadUtil and EnvUtil replace Runtime.availableProcessor (#5388) 2021-04-16 17:32:14 +08:00
xiaoheng1
acb02f6bf3
[ISSUE #5370]Modify the Chinese comments in MD5Utils to English (#5371)
* fix #5370 Modify the Chinese comments in MD5Utils to English

* code format
2021-04-16 11:00:11 +08:00
KomachiSion
51cc2b1b4b Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/test/java/com/alibaba/nacos/client/config/common/GroupKeyTest.java
#	common/src/test/resources/META-INF/services/com.alibaba.nacos.common.spi.SpiTestInterface
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	istio/src/main/java/com/alibaba/nacos/istio/mcp/NacosMcpService.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ApiController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
2021-04-13 14:28:30 +08:00
杨翊 SionYang
e689c1a3a1
Remove blocked thread for Protocol metadata (#5354) 2021-04-13 14:12:19 +08:00
Wu Zhiguo
9bcb901174
Fix some typo (#5260)
* fix some typo

* rollback some comment format
2021-04-03 12:57:57 +08:00
nov.lzf
46179d6664
fix cluster reconnection bug. (#5265) 2021-04-01 18:45:23 +08:00
杨翊 SionYang
d146e057c4
Fix ThreadPool usage problem and add some monitor for distro (#5237) 2021-03-30 16:27:41 +08:00
nov.lzf
a6a254a1c0
fix thread pool (#5233)
* fix thread pool

* fix log
2021-03-29 21:31:06 +08:00
赵延
cb289d31f7
fix thread name generate strategy. (#5139) 2021-03-23 09:25:35 +08:00
nov.lzf
9bb08d9f4d
remote reconnect bugfix (#5136)
* remote reconnect bugfix

* remote reconnect bugfix
2021-03-19 09:30:08 +08:00
KomachiSion
bd4b63d834 Merge remote-tracking branch 'upstream/feature_support_grpc_core' into develop-merge-to-2.0 2021-03-18 13:38:35 +08:00
nov.lzf
5fc13e9654
add client ip (#5134)
* add client  ip

* checkstyle fix

* wait to register connection setup
2021-03-18 13:22:10 +08:00
KomachiSion
6cda5ad55a Merge remote-tracking branch 'upstream/develop' into develop-merge-to-2.0
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	client/src/test/java/com/alibaba/nacos/client/config/impl/YmlChangeParserTest.java
#	common/src/main/java/com/alibaba/nacos/common/http/param/Header.java
#	common/src/main/java/com/alibaba/nacos/common/utils/ConcurrentHashSet.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	console/src/main/resources/static/js/main.js
#	core/src/main/java/com/alibaba/nacos/core/cluster/ServerMemberManager.java
#	core/src/main/java/com/alibaba/nacos/core/utils/Loggers.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
#	pom.xml
2021-03-18 12:08:45 +08:00
haoyann
4029d32e01
fix ConcurrentHashSet compatibility problems (#5122) 2021-03-17 09:49:38 +08:00
nov.lzf
5247548e86
shade client and using remote ip from header (#5068)
* shade client

* shade client

* fix default cluster port

* rollback client ip

* using remote ip from header

* using remote ip from header

* using remote ip from header
2021-03-10 11:18:37 +08:00
haoyann
d80a272646
Remove extra semicolons (#5063) 2021-03-10 10:00:04 +08:00
nov.lzf
3afa7eac89
shutdown long connection where server rollback; use client submit client ip (#5013)
* use  client ip from connection setup request.

* reset remote connection for rollback

* npe bugfix

* npe bugfix

* stop long connection where server rollback

* stop long connection where server rollback
2021-03-05 09:28:01 +08:00
haoyann
6870e57e2a
Closeable interface remove public (#4971) 2021-03-01 10:01:45 +08:00
nov.lzf
2315a745d3
tag publish bugfix; ignore server port for connection reset request. (#4947)
* grpc port modified;change notify bugfix.

* default member port fix

* modify grpc port to offset

* modify grpc port to offset
2021-02-25 10:38:25 +08:00
杨翊 SionYang
3a82d5d987
Add some enhancements (#4881)
* Add some enhancements

* Add tps monitor for naming push

* Add some enhancement for client
2021-02-05 10:15:31 +08:00
mai.jh
6379ba25bf
[ISSUE-#4854] Modify Header to support Keys Ignore Case (#4870)
* Modify header key Ignore Case, Replace LinkedHashMap with TreeMap(String.case_insensitive_order)

* Delete redundant import

* add junit test case
2021-02-04 19:13:56 +08:00
nov.lzf
c272d78890
add client sign header and nacos default port;sync code with diamnd over nacos 2.0 (#4857)
* add client sign header and nacos default port

* sync code with diamnd over nacos 2.0

* pmd and check style
2021-02-02 17:31:01 +08:00
杨翊 SionYang
5626b2be1f
Add switch to close double write in 2.0.0 (#4845)
* Add close double write

* Add an async service check task when upgrading.
2021-02-01 11:19:19 +08:00
邪影oO
0881af3f32
fix-4787 (#4802) 2021-01-28 09:52:36 +08:00
KomachiSion
cecf0c0893 Add double write logic for upgrade 2021-01-27 20:33:42 +08:00
nov.lzf
3cfa183400
convert payload type from full name to simple name;abilities both on client-server& server cluster submit (#4791)
* convert payload type from full name  to simple name.

* abilities both on client-server& server cluster submit

* Cas of update config, beta,tag publish

* tenant support on connection.

* modify health check tps point name
2021-01-25 14:11:35 +08:00
nov.lzf
7e58b5cb7b
fuzzy match support of tps control;remove http transport of client worker ; add internal executors of CacheData notifier (#4783)
* keepalive time adjust

* fuzzy match support of tps control;remove http transport of client worker ; add internal executors of CacheData notifier
2021-01-22 18:34:37 +08:00
nov.lzf
c4ffbab21f
connection manager ,active send interval increase (#4776)
* connection manager ,active send interval increase

* adjust sync all interval
2021-01-21 20:47:23 +08:00
nov.lzf
4e7346db1d
tps monitor key use self define submit;active detection both on client and server (#4767)
* tps monitor key use self define submit

* pmd and check style.

* active detection of client and server

* connection manager ,active send interval increase
2021-01-21 14:40:07 +08:00
nov.lzf
91bf227c4a
tps control submit; connection rule (#4752)
* tps reporter submit

* tps reporter submit

* log optimize; listen concurrent bugfix; async request exception fix

* server loader bugfix;increase keep alive default time

* tps report bugfix, tps log bugfix;

* rpc server push ack notify bugfix.

* change rule store dir ;add local file change event of connection rule.

* remove client side request meta; reduce client parameters

* 简化冗余代码

* 优化异常日志

* md5 sync bugfix

* client metrics submit; tps monitor ip list support

* client metrics submit; tps monitor ip list support
2021-01-20 09:21:40 +08:00
KomachiSion
fd06b5a7b6 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core
# Conflicts:
#	address/pom.xml
#	api/pom.xml
#	auth/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	consistency/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	istio/pom.xml
#	naming/pom.xml
#	pom.xml
#	sys/pom.xml
#	test/pom.xml
2021-01-18 10:32:57 +08:00
杨翊 SionYang
1bd67269cd
Use revision to set version and upgrade to 1.4.2-SNAPSHOT (#4711)
* Use revision set version

* Use revision set version

* Add flatten plugin
2021-01-15 14:37:47 +08:00
杨翊 SionYang
67eb36976e
Upgrade to 1.4.1 (#4695) 2021-01-14 11:36:57 +08:00
杨翊 SionYang
4370882813
Add auth for naming rpc api and ix some bugs for 2.0.0 (#4675)
* Add auth for naming rpc api

* Fix Callback do not execute problem

* Fix client distro do not retry problem.
2021-01-12 16:37:08 +08:00
nov.lzf
6027d36222
client use same executor during different connection;metrics count bugfix.;recommend server check (#4659)
* client use same executor during different connection.

* metrics count bugfix.

* recommend server check

* remove rsocket ;add client metrics

* add client metrics to get cache value

* rpc tps control basic api submit.

* check style ,pmd fix.
2021-01-11 14:11:32 +08:00
杨翊 SionYang
c66aba5f4d
Remove service cache data when service removed (#4656)
* Fix instance count no decrement problem

* Dispatch naming event to difference Publisher

* Remove service cache data when service removed
2021-01-09 13:19:12 +08:00
nov.lzf
2d8d4c5f5a
onnectionLimitRule submit.client use same executor during different … (#4651)
* ConnectionLimitRule submit.

* ConnectionLimitRule submit.client use same executor during different connection.
2021-01-08 09:59:03 +08:00
KomachiSion
11210c057d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-dev 2021-01-07 17:09:30 +08:00
nov.lzf
afb1a28135
log optimize; config re sync request (#4638) 2021-01-06 21:25:14 +08:00
mai.jh
2af6784f55
for #4594,#4594 Fix IO close problem. (#4606) 2020-12-31 15:48:26 +08:00