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

606 Commits

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
赵延
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
horizonzy
8b6cb8c612 Just choose one between nacosDomain mode and servers mode. 2021-01-10 16:37:23 +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
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
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
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
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
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
nov.lzf
6e34f2886b
encode bugfix (#4548) 
* basic spell fix.import
 fail bugfix

* encode bugfix

* remote log bugfix;  create client concurrent bugfix;optimize log

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle pmd fix

* checkstyle pmd fix

* http poll sla bugfix; rpc config listen notify optimize
 2020-12-26 15:53:10 +08:00
mai.jh
a2ea808b7d
[ISSUE-#4567] Refactor nacos-client Load Logging Configuration code. (#4572) 
* for #4567, refactor nacos-client logging load Configuration code.

* Modify exception handling.

* When customizing AbstractNacosLogging Load Configuration Fail, use the default Logging Load Configuration.

* NacosLogging has been modified to a single-column mode.
 2020-12-26 13:18:30 +08:00
杨翊 SionYang
d8b52d188a
Add callback, simple retry and metric for naming push (#4533) 
* Re-plan the package structure of naming.push

* Add callback and simple retry for push

* Add rpc push metric and refactor MetricsMonitor
 2020-12-21 19:28:56 +08:00
赵延
30a04f98ba
check illegal heart beat param when before register (#4514) 2020-12-21 10:07:43 +08:00
赵延
c72cb016b4
Enhance log info and fix code checkstyle (#4529) 
* 1.fix code checkstyle check
2.enhance disconnect log info

* log enhance

* revert line
 2020-12-21 09:42:11 +08:00
nov.lzf
caffec2d5b
rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix. (#4473) 
* rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix.

* auth bugfix
 2020-12-14 19:31:33 +08:00
wangxw
350be0669e
cacheDataMap (#4445) 2020-12-12 17:00:41 +08:00
杨翊 SionYang
93a3ac7816
Upgrade to 2.0.0-ALPHA.1 (#4410) 
* Add some new server config parameters

* Upgrade to 2.0.0-ALPHA.1
 2020-12-04 18:46:24 +08:00
KomachiSion
049b4e4e61 Sync code from upstream/develop 2020-12-03 20:06:12 +08:00
KomachiSion
d6fcac85c5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/result/ResultBuilder.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/healthcheck/ClientBeatCheckTask.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
#	sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-12-03 18:41:41 +08:00
paderlol
4e0e6c6f97
Upgrade Nacos Api/Client modules to support JDK 1.8 compilation (#4383) 2020-12-02 10:49:07 +08:00
杨翊 SionYang
2728df72f2
Fix some bugs for naming module (#4381) 
* use instance id get instance metadata

* Fix Disconnection can't notify to naming module.

* Support subscribe specified cluster instance for 1.x

* Fix 2.0 client subscribe service can't be notify problem

* Fix only can search the first service problem

* Fix auto clean empty service can't work problem
 2020-12-01 21:31:18 +08:00
nov.lzf
ad98020770
负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix (#4365) 
* memory gc optimize ; string pool bugfix

* grpc executor

* grpc executor

* 负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix

* check style fix
 2020-11-30 16:17:34 +08:00
Gagharv
aa4737f4bc
[ISSUE-#4181] Normalize ContextPath value in client-side (#4326) 
* [ISSUE-#4181] Just use ContextPathUtil normalize ContextPath value

* [ISSUE-#4181] add some test cases
 2020-11-27 23:41:22 +08:00
KomachiSion
3dc7b34c58 Sync develop branch and solve conflict 2020-11-20 18:01:34 +08:00
KomachiSion
e56eb3680c Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	api/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	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
#	client/src/test/java/com/alibaba/nacos/client/naming/core/HostReactorTest.java
#	common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
#	pom.xml
 2020-11-20 17:13:49 +08:00
杨翊 SionYang
9f0406a1a6
Fix some push problem (#4285) 
* Fix client can query disable instances and server push disable instances problem

* Fix client reconnect but no re-subscribe service problem
 2020-11-20 16:07:56 +08:00
shizhengxing
daf593823a
[ISSUE #4136] Fix the bug that cann't correctlly instantiate ServiceInfo from cache file #4249 (#4272) 2020-11-20 09:15:41 +08:00
nov.lzf
69c84f1397
pmd ,checkstyle (#4252) 2020-11-18 13:46:27 +08:00
赵延
5c38d0b5b8
[ISSUE-#4115] Refactor client naming event handle logic (#4137) 
* refactor and supply api to async handle instances change event

* add async handle way to callback event listener

* refactor EventListener, supply getExecutor to handle event async and compatible old version.

* remove unnecessary code

* ignore abstract class name check

* fix EmptyLineSeparator

* remove unuseful import

* compatible old client sdk, add abstractEventListener to support async handle naming event.

* remove unuseful import

* refactor InstanceChangeListener. decouple AbstractEventListener's executor and InstanceChangeListener's executor

* 1.remove key if listeners is empty.
2.fix getSubscribeServices

* revert notify center code

* code quality enhance

* upgrade @since 1.4.0 -> 1.4.1

* change combineListenKey to ServiceInfo.getKey

* just deregisterSubscriber when hostReactor shutdown

* not export getSubscribers()

* add this key word, and move code place.
 2020-11-13 11:58:12 +08:00
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 (#4217) 
* listen context bugfix.

* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
 2020-11-12 18:03:07 +08:00
杨翊 SionYang
164ed33ada
Feature support grpc core (#4204) 
* NacosNamingMetadataManager --> NamingMetadataManager

* Try to add ServiceMetadata consistency

* add catalog api support new data

* Change version to 2.0.0-SNAPSHOT
 2020-11-11 19:50:14 +08:00
赵延
39a2f20d56
[ISSUE #3907] when publishConfig, if type is absent, set default value 'text' (#3915) 
* when publishConfig, if type is absent, set default value 'text'

* 1.add publishConfig api(add param type)
2.check type is valid in nacos server
 2020-11-09 11:36:50 +08:00
杨翊 SionYang
c81bb5b722
Add NacosServiceLoader and replace ServiceLoader usage directly (#4151) 
* Add NacosServiceLoader

* Replace ServiceLoader by NacosServiceLoader
 2020-11-06 14:46:28 +08:00
邪影oO
538509502f
IPv6 support (#3773) 
* IPv6 support

* AddressServerParamCheckUtil 合并到 IpUtil 及一些修改

* 解决魔法值

* 修改隐患

* 调整使用了类似 ip.indexOf(":") 查找是否有端口的地方的逻辑, 一些 ":" 替换为常量

* 删除无用测试

* IpUtil 改名 为 IPUtil, 涉及IP的相关方法名修改,涉及到的调用修改,检测IP的地方调用的isIPv4改为isIP. 修改涉及IP的字段长度及相关升级更新的sql

* no message

* no message

* no message

* no message

* 获取本机IP时,如果本机IP是IPv6并且包含网卡信息(V6地址中最后面的百分号和百分号后面的内容)则去除网卡信息

* 解决 AvoidComplexConditionRule(请不要在条件中使用复杂的表达式)

* 移除无用代码

* 添加注释

* 调整code style, 调整获取本机IP的逻辑
 2020-11-05 20:15:06 +08:00
KomachiSion
8829d3c6ed Upgrade to 2.0.0-ALPHA 2020-11-05 19:38:15 +08:00
KomachiSion
9cbc0bfeea Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/common/Constants.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/HttpClient.java
#	common/src/main/java/com/alibaba/nacos/common/utils/VersionUtils.java
#	core/src/main/java/com/alibaba/nacos/core/distributed/distro/DistroProtocol.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-11-05 19:33:46 +08:00
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT (#4135) 2020-11-05 09:43:33 +08:00
mai.jh
796849b17d
refactor: delete the old http client code marked as @Deprecated (#4122) 2020-11-05 09:10:30 +08:00
KomachiSion
adbcb7549d Upgrade to 1.4.0 2020-11-02 19:09:19 +08:00
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
164ad3a8b9
Revert "for #3621 (#3668)" (#3999) 
This reverts commit 29ba11eb to fix #3992
 2020-10-16 11:19:52 +08:00