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

2845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KomachiSion
1ba8787d3b solve conflict from develop branch 2020-10-16 15:28:09 +08:00
KomachiSion
47481fedfb Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/resources/nacos-log4j2.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/src/main/java/com/alibaba/nacos/core/cluster/MemberMetaDataConstants.java
 2020-10-16 15:26:33 +08:00
杨翊 SionYang
d78ebbbce1
Refactor dispatch task execute (#3995) 
* Refactor nacos task execute engine

* Refactor nacos task execute engine

* For checkstyle

* For checkstyle

* Use ThreadUtils to reduce duplicate codes

* Set custom logger for TaskExecuteWorker

* Set custom logger for TaskExecuteWorker
 2020-10-16 14:32:39 +08:00
杨翊 SionYang
164ad3a8b9
Revert "for #3621 (#3668)" (#3999) 
This reverts commit 29ba11eb to fix #3992
 2020-10-16 11:19:52 +08:00
JackSun-Developer
7527d76743
[ISSUE #3576] [Enhancement] Adding the destroy lifecycle method on NamingMaintainService (#3985) 2020-10-14 10:17:06 +08:00
liaochuntao
b6bc4bb12f
Fix issue 2866 (#3984) 
* improvement: merge upstream/develop

* feat: merge upstream develop

* fix: fix issue 2892
 2020-10-14 09:52:18 +08:00
杨翊 SionYang
2e553ef5ea
For #3384, Fix member extend info do not update error. (#3982) 2020-10-13 20:54:12 +08:00
邪影oO
13599fd83d
Fix#3973 (#3974) 
* fix #3973

* 重复代码抽取到一个方法

* 删除私有方法的注释

* 处理namespace参数的方法提出到一个工具类中

* 修改注释

* 添加licences

* 增加 TenantUtil 的测试

* TenantUtil 改名为 NamespaceUtil
 2020-10-13 15:48:46 +08:00
KomachiSion
018e0bff8c refactor instance heart beat storage 2020-10-12 17:43:56 +08:00
KomachiSion
72f3476c57 Add get client data after verify failed 2020-10-12 16:34:33 +08:00
赵延
49ff149dfb
1.fix unit test can't pass (#3956) 
2.update the unit test
 2020-10-12 13:13:07 +08:00
赵延
c0496b364e
[ISSUE #3909] add domain's judgement (#3913) 
* add domain's judgement

* modify domain's judgement, can resolve = true

* remove judgement in 'if' code block

* replace Ip to IP in InetUtils

* log warn info when domain can not be resolved

* fix vaiable name
 2020-10-12 12:19:02 +08:00
赵延
d6cc8ce5b0
fix typo error (#3954) 2020-10-12 12:18:14 +08:00
nov.lzf
336269891e
ak auth support;log optimize; client port aware on server side (#3970) 
* ak auth support on long connection

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* reconnect rate control
 2020-10-12 11:53:43 +08:00
JackSun-Developer
714b9671a3
[ISSUE#3533] change cache dir with namespace -- part 2: unify the log dir (#3882) 2020-10-12 11:25:06 +08:00
JackSun-Developer
17be3984e7
[ISSUE#3533] change cache dir with namespace -- part 1: unify the cache dir (#3859) 2020-10-12 11:24:22 +08:00
赵延
5745922786
isAddressServerHealth set as true when request success (#3952) 2020-10-06 21:53:23 +08:00
赵延
f6c6a9f3b2
[ISSUE #3850] ignore socket exception when client destroy already (#3906) 
* if client destroy already, ignore socket exception.

* remove the exception's judgement

* remove unuseful import
 2020-09-30 13:14:42 +08:00
sanxun0325
787ea47cfe
[ISSUE #3781]Fix service list intermittently lost service (#3891) 
* update service init

* commit futureMap.remove()

* update serviceManager

Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2020-09-23 20:17:07 +08:00
sanxun0325
e2c037dd48
update spring boot dependencies version (#3900) 
Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2020-09-23 20:15:15 +08:00
ljhrot
7902b22e05
Fix chinese string are truncated in ConcunrrentDiskUtil (#3883) 2020-09-22 20:42:13 +08:00
shizhengxing
5df146e26b
[ISSUE #3871] fix description don't match the error (#3886) 2020-09-22 15:55:46 +08:00
杨翊 SionYang
d5d78b7ff0
Refactor distro filter to support route by ip port (#3881) 
* Refactor distro filter

* Fix some sync problem
 2020-09-21 19:31:35 +08:00
赵延
f01cd59bf7
[ISSUE #3867] replace the way which get version (#3872) 
* replace the way which get version

* remove version sign application.properties in nacos-api
 2020-09-21 19:11:21 +08:00
mai.jh
4ce897e409
bug: fix the problem of incorrect judgment of http response code in SubscribeManager#getSubscribers() method (#3879) 2020-09-21 15:18:23 +08:00
杨翊 SionYang
833e02bc19
Merge pull request #3865 from KomachiSion/feature_support_grpc_core 
Synchronize code from develop branch
 2020-09-18 16:32:48 +08:00
KomachiSion
ddf2dc0247 Solve conflict 2020-09-18 16:31:09 +08:00
KomachiSion
6e5b09aee7 Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultSharePublisher.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-09-18 16:16:00 +08:00
liaochuntao
7fd4d9a5d1
feature issue #3804 (#3805) 
* improvement: merge upstream/develop

* feat: merge upstream develop

* feat: manage the loading of configuration files uniformly

* fix: fix copyright style

* style: fix code style

* fix: fix code style
 2020-09-18 16:05:36 +08:00
杨翊 SionYang
d69823e4a6
Refactor Instance Controller (#3864) 
* Move some old logic code to InstanceOperator

* Support sync ip port client
 2020-09-18 15:59:26 +08:00
杨翊 SionYang
1c935d1053
Add heart check for instance registered by http client and openAPI (#3860) 
* Add heart check

* For checkstyle and pmd
 2020-09-17 20:53:53 +08:00
mai.jh
473090ba13
Fix http client contentType charset problem (#3848) 2020-09-17 17:49:11 +08:00
杨翊 SionYang
4b31f895ca
Add upd push for ip port client (#3849) 
* Add upd push for ip port client

* auto clean expire ip port client
 2020-09-16 20:32:11 +08:00
杨翊 SionYang
700c90d15f
Fix code style problem in DiskUtils (#3842) 2020-09-16 12:33:33 +08:00
杨翊 SionYang
2ded5a24fc
Set mediaType charset as utf8 (#3837) 2020-09-16 09:14:03 +08:00
杨翊 SionYang
565557c5c5
Fix NullPointerException when no subscriber for slow event (#3835) 2020-09-15 14:50:57 +08:00
mai.jh
5e4429f0e4
[ISSUE#3192] naming module replace http client (#3763) 
* naming module replace http client

* refactor: naming module replace http client.

* refactor: naming module replace http client.

* refactor: Add apache http client Factory.

* refactor: naming module replace http client.

* fix code style

* refactor: Add http client config

* refactor: naming module HttpClientManager change

* refactor: naming module HttpClientManager change

* refactor: naming module replace http client.

* fix code style

* refactor: fix JDK http client Use error problem.

* refactor: Query And Header entity init Add non-empty judgment

* Enhance the asynchronous http delete request method to support body passing parameters.

* refactor: apache http client set MaxConnTotal and maxConnPerRoute.
 2020-09-15 09:18:20 +08:00
杨翊 SionYang
6fb85744e4
Add ip port client and manager (#3825) 
* Add ip port client and manager

* Skip distro logic if standalone

* simply replace http register/register/list instance api
 2020-09-14 20:09:59 +08:00
nov.lzf
d83a4b12b3
ak auth support on long connection (#3821) 2020-09-14 16:47:59 +08:00
杨翊 SionYang
dc5cba2e69
Merge pull request #3816 from mark4z/develop 
[ISSUE#3787]  fix ConvertUtils can not handle FormatException.
 2020-09-14 14:55:22 +08:00
Marcus
af2151e49c fix ConvertUtils can not handle FormatException. 2020-09-14 11:56:12 +08:00
Mark4z
0c8bdfd82f
Merge pull request #1 from alibaba/develop 
T
 2020-09-13 23:39:53 +08:00
杨翊 SionYang
35895cf5ae
Merge pull request #3810 from KomachiSion/feature_support_grpc_core 
Synchronize with develop branch
 2020-09-11 20:10:38 +08:00
KomachiSion
711ec8f49c Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/test/java/com/alibaba/nacos/client/config/listener/impl/ClientWorkerTest.java
 2020-09-11 20:08:11 +08:00
杨翊 SionYang
9e064b7f92
Add client distro sync logic (#3809) 
* Adapt query service info request with new model

* Remove indexes when client disconnect

* Add distro sync client data

* Add sync delete client

* Add maintain expired cluster connection client
 2020-09-11 20:00:47 +08:00
nov.lzf
fac4879e92
optimize dumpService warning on starting up ； async request suppport in cluster rpc client proxy. (#3808) 
* optimize  dumpService warning on starting up .

* async request suppport in cluster rpc client proxy.

* async request suppport in cluster rpc client proxy.
 2020-09-11 18:02:28 +08:00
nov.lzf
721791a41e
optmize rpc client lifecycle ；request timeout to rpc client； some bugfix (#3797) 
* optmize rpc client lifecycle and some bugfix

* get server load optimize； add request timeout to rpc client
 2020-09-10 10:56:36 +08:00
杨翊 SionYang
50b0427036
Adapt query service list request with new model (#3795) 
* Do some enhance refactor

* Adapt query service list request with new model
 2020-09-09 20:37:45 +08:00
S2W
a41d209d57
Update ConvertUtils.java (#3789) 2020-09-09 17:03:25 +08:00
mai.jh
baa699a3f1
[ISSUE#3790] Supplement http response Content-Encoding processing. (#3791) 
* bug: fix issue #3790, Supplement http response Content-Encoding processing

* bug: fix issue #3790, Supplement http response Content-Encoding processing.

* bug: fix issue #3790, Supplement http response Content-Encoding processing.
 2020-09-09 17:01:18 +08:00