zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,127 Commits 2 Branches 3 Tags 58 MiB
995dce0bc0
Commit Graph

3127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KomachiSion
995dce0bc0 Solve conflict from develop 2021-01-13 16:08:54 +08:00
KomachiSion
902f501fac Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	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
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/ClientInfo.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2021-01-13 15:53:50 +08:00
邪影oO
220d70a9dc
Merge pull request #4684 from KomachiSion/develop-fix-jraft-write-request-problem 
Cherry-pick jraft write request problem from nacos2.0.0
 2021-01-13 15:03:06 +08:00
KomachiSion
591350e5f6 For checkstyle 2021-01-13 14:46:03 +08:00
liaochuntao
2eac367970 fix: fix Jraft WriteRequest type problem. 2021-01-13 14:39:00 +08:00
杨翊 SionYang
998947315e
Add server identity to replace user-agent white list. (#4683) 2021-01-13 14:12:56 +08:00
liaochuntao
c6f04d4cf8
Merge pull request #4677 from lzp0412/develop 
[ISSUE #4429] Fix mcp  can't be open
 2021-01-12 20:56:03 +08:00
Catcher Wong
7b81ea666e
naming push service support CSharp client (#4670) 2021-01-12 19:45:56 +08:00
lzp0412
18f6378630 remove final 2021-01-12 19:13:08 +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
赵延
e2f7796d3a
[ISSUE-#3880] NamingService Client support pushEmptyProtection. (#4665) 
* NamingService Client support pushEmptyProtection.

* check hosts is null. if null, also invalid.
 2021-01-12 09:48:27 +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
赵延
a4e3b7cbc7
[ISSUE-#4631] Free credential instance when serverHttpAgent shutdown. (#4634) 
* free credential instance when serverHttpAgent shutdown.

* free credential instance when namingProxy shutdown.

* unify the code place

* cancel timer when CredentialWatcher stop

* ignore PMD.AvoidUseTimerRule.
 2021-01-11 09:59:44 +08:00
赵延
0732a93072
Merge pull request #4663 from horizonzy/fix-4662 
[ISSUE-#4662] Just choose one between nacosDomain mode and servers mode.
 2021-01-11 09:37:12 +08:00
赵延
aea9f5df76
Merge pull request #4664 from catcherwong/develop 
Add CSharp Client
 2021-01-10 18:44:38 +08:00
catcherwong
52931abe73 Add CSharp Client 2021-01-10 16:50:41 +08:00
horizonzy
8b6cb8c612 Just choose one between nacosDomain mode and servers mode. 2021-01-10 16:37:23 +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
邪影oO
cfefc28402
upgrade axios version to 0.21.1 (#4632) 2021-01-08 16:43:49 +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
onewe
79fddc36c2
[ISSUE-#4631] Remove timer,Use ScheduledThreadPoolExecutor replaced. (#4635) 
* fix(CredentialWatcher): 使用ScheduledThreadPoolExecutor替代Timer

* enhance(CredentialWatcher): use ExecutorFactory replace ScheduledThreadPoolExecutor.

* enhance(CredentialWatcher): use ExecutorFactory.Managed replace ExecutorFactory.

* enhance(CredentialWatcher): remove Managed
 2021-01-08 09:40:18 +08:00
杨翊 SionYang
a21b40ef00
Merge pull request #4650 from KomachiSion/2.0.0-sync-dev 
Sync dev code to 2.0.0
 2021-01-07 17:23:24 +08:00
KomachiSion
11210c057d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-dev 2021-01-07 17:09:30 +08:00
杨翊 SionYang
ad1a6d1b65
Add some metrics and logs (#4649) 
* Fix service metadata update failed problem.

* random connect to server

* Add some metrics and log for service and client

* Add some metrics and log for naming task worker
 2021-01-07 17:04:26 +08:00
liaochuntao
24d0cbaa52
Merge pull request #4645 from KomachiSion/develop-issue#4291 
For #4291, support remove old raft metadata
 2021-01-07 14:29:40 +08:00
liaochuntao
30ab49b1f6
fix: fix jraft response instance (#4644) 2021-01-07 13:52:41 +08:00
KomachiSion
5e0adf7d53 For #4291, support remove old raft metadata 2021-01-07 13:36:36 +08:00
nov.lzf
afb1a28135
log optimize; config re sync request (#4638) 2021-01-06 21:25:14 +08:00
赵延
5f225d49c1
Merge pull request #4622 from haoyann/issue-4612 
[ISSUE #4612] Remove JwtTokenUtils
 2021-01-06 21:23:21 +08:00
杨翊 SionYang
ac73e7395e
Support register persistent instance and tcp health check (#4636) 
* Fix client beat error in cluster mode

* Add health check for persistent ip port client

* Add health check for persistent ip port client

* Fix client beat error in cluster mode

* Migrate default TCP health check v1.x to v2.x

* Fix unit test error

* Fix dump persistent client snapshot error problem

* Fix load persistent client snapshot error problem

* Fix subscribe error for client id
 2021-01-06 16:12:37 +08:00
haoyann
2be09ae940 change tokenValidityInSeconds default value 2021-01-05 10:41:26 +08:00
haoyann
c979b9eefc remove JwtTokenUtils 2021-01-04 23:31:26 +08:00
杨翊 SionYang
98a821e98d
Merge pull request #4610 from KomachiSion/2.0.0-sync-develop 
Synchronize changes from develop branch
 2020-12-31 16:32:36 +08:00
wjm0729
4da3c82895
优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支 (#4607) 
* 优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支
异常的代价是很大的, 非必要情况下. 应该尽量避免

* comment

* comment

* license
 2020-12-31 15:50:07 +08:00
mai.jh
2af6784f55
for #4594,#4594 Fix IO close problem. (#4606) 2020-12-31 15:48:26 +08:00
KomachiSion
7f3a17c620 Solve conflict with develop branch. 2020-12-31 14:24:41 +08:00
KomachiSion
bdacd0958d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-develop 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
 2020-12-31 11:48:52 +08:00
杨翊 SionYang
d1fcfd4529
Support persistent service and instance register/deregister (#4608) 
* Remove unused foreach in ClientManager

* Revert some uncompleted refactor for ClientManager

* Refactor ClientOperationService

* Fix error dependency

* Fix serialize problem for persistent instance

* Refactor client id generation for IpPortBasedClient

* Support persistent service and instance register/deregister

* enhance the speed shutdown server
 2020-12-31 11:36:57 +08:00
wjm0729
dcd2fcec94
console-ui config排序优化 (#4599) 
* ignore

* config 列表支持排序

* remove local cfg
 2020-12-31 11:34:41 +08:00
liaochuntao
6e0a94be3e
refactor: 持久化实例 (#4603) 2020-12-30 13:58:55 +08:00
杨翊 SionYang
9b9d1cb565
Execute Distro transport asynchronously. (#4595) 2020-12-29 18:09:20 +08:00
nov.lzf
0ad5bcbb17
call back bugfix. rpc executor extract... (#4592) 2020-12-29 16:23:32 +08:00
nov.lzf
6c5e52cf1b
rpc config listen notify optimize;connection_id name optimize;listeners query bugfix; (#4591) 
* rpc config listen notify optimize

* connection_id name optimize

* listeners query bugfix;
 2020-12-29 15:35:23 +08:00
赵延
56348af81b
make code more readable. (#4568) 
* make code more readable.

* code enhance

* code enhance

* fix comment for grpc client

* initHandlerRpcClient -> initRpcClientHandler

* rename some method and modify some comments

* code enhance.

* code enhance.

* rename NamingPushResponseHandler -> NamingPushRequestHandler

* fix connectionId typo
 2020-12-29 13:54:21 +08:00
杨翊 SionYang
00d4363ad0
Do not retry distro sync again if member has removed. (#4586) 2020-12-29 13:51:26 +08:00
paderlol
903ff0f546
Fix the configuration file loading issue #4556 #4541 (#4590) 2020-12-29 09:52:07 +08:00
赵延
5ec27bc794
pre init registryHandlers before grpc request. (#4576) 2020-12-28 15:33:15 +08:00
haoyann
374e7e39d8
[ISSUE #3406] fix change self's password fail (#4536) 
* fix change self's password fail

* refactor use util Objects
 2020-12-28 09:53:40 +08:00
haoyann
dd854e3b49
fix cluster mode query config type is null (#4579) 2020-12-28 09:48:11 +08:00
xujingfeng
5236287fdb
[ISSUE #4583] Fix DOMAIN mode retry logic (#4584) 
* fix namingProxy domain retry logic; add retry param namingRequestDomainMaxRetryCount

* add maxRetry param
 2020-12-28 09:40:10 +08:00