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

776 Commits

Author SHA1 Message Date
shalk(xiao kun)
63f7e337d9
fix TemplateUtils usage (#5010) 2021-03-05 09:33:53 +08:00
shalk(xiao kun)
f5a5fce4e1
Log4J2NacosLogging.loadConfiguration() return directly When location is blank (#4980) 2021-03-02 18:10:13 +08:00
nov.lzf
86b89842bb
compatible with the reflection logic of Dubbo 2.7.X (#4977) 2021-03-01 12:48:40 +08:00
杨翊 SionYang
8dfaabdaf3
Fix getSpasHeaders serviceName exception (#4883) 2021-02-05 11:13:48 +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
JackSun-Developer
c455a900d9
[ISSUE #3876] [NA] failed to update serviceName: DEFAULT_GROUP@@prod-zipkin (#4866) 2021-02-04 11:46:48 +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
nov.lzf
d5af830d52
remove config resync request and add getting cluster metrics (#4846) 
* from diamond over nacos  2.0

* config notify task type bugfix

* keep consistent  with diamond over nacos 2.0

* remove config resync  request and add getting cluster metrics

* add using address server to look up interface

* add using address server to look up interface
 2021-02-01 13:33:56 +08:00
杨翊 SionYang
c275fc310e
Fix #4788, Fix client id judgement error for ipv6 (#4815) 2021-01-28 12:03:08 +08:00
shalk(xiao kun)
d4d245f2cc
make SecurityProxy.accessToken threadsafe in single writer multi reader (#4778) 2021-01-26 19:37:27 +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
杨翊 SionYang
a67f6b5854
Use SafeConstructor to parse yaml configuration for AbstractConfigChangeListener (#4753) 2021-01-20 11:13:31 +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
杨翊 SionYang
7b85f4078c
Refactor naming client proxy to support auth (#4736) 2021-01-18 20:44:36 +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
KomachiSion
4899a7290f Solve conflict from develop 2021-01-13 19:31:54 +08:00
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
JackSun-Developer
7527d76743
[ISSUE #3576] [Enhancement] Adding the destroy lifecycle method on NamingMaintainService (#3985) 2020-10-14 10:17:06 +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
赵延
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
ljhrot
7902b22e05
Fix chinese string are truncated in ConcunrrentDiskUtil (#3883) 2020-09-22 20:42:13 +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
nov.lzf
d83a4b12b3
ak auth support on long connection (#3821) 2020-09-14 16:47:59 +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
nov.lzf
167dba13d2
check stype and pmd fix; future request optimize. (#3782) 2020-09-08 15:30:11 +08:00
yanlinly
f423d39d10
Revert "[#3368]Cancel empty Long polling thread to improve performance. (#ISSUE3432)" (#3778) 
This reverts commit 95c8bf242b.
 2020-09-08 10:00:46 +08:00
nov.lzf
723dedebfe
request callback timeout support both at client and server; split sdk (#3776) 
and cluster grpc server port.
 2020-09-07 18:49:17 +08:00
KomachiSion
334e401f11 Fix merged error 2020-09-04 17:23:52 +08:00
KomachiSion
ee406d5e5e Merge branch 'upsteam-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/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/test/java/com/alibaba/nacos/client/ConfigTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-09-04 17:03:26 +08:00
nov.lzf
682a46d541
loader balance basic support: adjust loader count once and up limit ; switch single (#3752) 2020-09-03 20:29:34 +08:00
nov.lzf
93364734ea
client switch server bugfix ; cluster server connection manage, and loader balance with specific server ip (#3751) 2020-09-03 18:02:55 +08:00
nov.lzf
cf550b9f43
optimize request /header /meta info model, uniform request resolver pattern. (#3749) 
* body string compress and opitimize request and meta info

* optimize request /header /meta info model, uniform request  resolver pattern.

* delete useless code
 2020-09-03 15:00:08 +08:00
nov.lzf
d279aad940
gzip support; using object list instead of string concat for batch listen config (#3742) 
* gzip support; using object list  instead of string concat for batch listen config

* gzip support; using object list  instead of string concat for batch listen config
 2020-09-02 14:25:33 +08:00
nov.lzf
3a5c3cb19f
refactor request/response registry ; server side request push refactor (#3739) 
* limiter support in rpc transport

* get next server optimize; server side notify concurrent bugfix; multi rpc client support in config module.

* toast alibaba repo refer. add client name

* rpc config change beta ips filter

* payload registry submit

* refactor request/response registry ; build response aware of server side in connection level.

* refactor request/response registry ; build response aware of server side in connection level.

* bi stream submit.

* bi stream submit.
 2020-09-02 09:12:53 +08:00
nov.lzf
3d222268af
as-sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware (#3693) 
* optimize rpc listen notify

* remove cache bugfix

* code optimize

* code optimize

* config client abstract optimize, remove if/else code

* config client abstract optimize, remove if/else code

* as sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware
 2020-08-26 15:52:25 +08:00
Gagharv
da8fa57f99
[ISSUE#3315]Nacos client support https (#3654) 
* [ISSUE #3315] nacos client support https
* common module add tls related classes
* JdkHttpClientRequest support https
* unified IpUtils

* [ISSUE #3315] nacos client support https
* common module add tls related classes
* JdkHttpClientRequest support https
* unified IpUtils

* [ISSUE #3315] nacos client support https

* format code
 2020-08-24 18:35:38 +08:00
syapollo
29ba11eb88
for #3621 (#3668) 2020-08-24 13:25:29 +08:00
Gagharv
3428d8830e
[ISSUE #3671] move some tools class into common package (#3672) 2020-08-24 13:24:56 +08:00
赵延
6e4b0c9c86
[ISSUE #3628] set naming client updateTask interval more flexible (#3637) 
* 1.use server cacheMillis event service deleted
2.naming client UpdateTask's interval will inc by failCount that connect with server

* 1.move failCount to updateTask
2.redefine the updateService method name. updateServiceNow -> updateService, wrap updateService in updateServiceNow when first getServiceInfo

* 1.create push client even service is not exist
2.serviceInfo's hosts is empty or can't connect to server both add the updateTsk interval

* format the indent
 2020-08-20 14:35:30 +08:00
mai.jh
136b45610d
refactor: unified implementation of http client api adjustment. (#3639) 2020-08-20 09:09:21 +08:00
nov.lzf
03e58df04f
listen context query support on console ; basic api for lader balance ;server side push retry submit (#3630) 
* listen context query with groupy and ip support long connect

* remove connection on cleint side, server will generate instead.

* connect reset request support appointing ip address.

* server push retry

* basic api for loader balance

* basic api for loader balance
 2020-08-18 20:20:21 +08:00
Xarrow
1e5a597654
[ISSUE #3613] Fix unit test method not be static & update publish config listener in ConfigTest.java (#3614) 
* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`

* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`
 2020-08-18 09:24:34 +08:00
nov.lzf
090c1ea0dd
connection event notification of grpc server (#3611) 
* grpc server noticed when a client disconnected.

* grpc connection notification and optimize server service register.

* grpc connection notification and optimize server service register.
 2020-08-15 18:16:33 +08:00
nov.lzf
33df55d40a
remote support on servers and optimize connection and client model (#3609) 
* Add gprc support-> optimize rpc listen execute task  notify

* Add gprc support->  add listener optimize.

* Add gprc support-> cluster rpc client support

* cluster rpc client support

* config change notify bettween server long connect support

* server push future refactor.

* server rpc sync compatibility support

* connection labels  support

* code fail fix
 2020-08-14 17:40:00 +08:00
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT (#3549) 2020-08-12 09:32:06 +08:00
nov.lzf
a0a1486fa2
rsocket support and optimize client abstract (#3559) 
* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> upgrade api client common jdk compiler to 1.8 for test Rsocket only

* Add gprc support-> rsocket client test code  submit

* Add gprc support-> rpc client factory optimize

* Add gprc support-> config client factory  rename

* Add gprc support-> rsocket submit

* Add gprc support-> rsocket client switch  submit

* Add gprc support-> rsocket support and optimize rpc client
 2020-08-10 09:11:53 +08:00
sanxun0325
95c8bf242b
[#3368]Cancel empty Long polling thread to improve performance. (#ISSUE3432) 
* update clientWorker

* Upgrade 1.3.1 (#3294)

update clientWorker

* add ClientWorkerTest

* add remove taskFlagMap

* update clientworker

* update taskIdSet ConcurrentHashSet
 2020-08-05 17:20:53 +08:00
nov.lzf
05bd51062d
Add gprc support-> server push ack (#3521) 
* Add gprc support->  server push ack

* Add gprc support-> add lost code

* Add gprc support-> disconnect status change bugfix

* Add gprc support-> optimize rpc port
 2020-08-05 10:21:33 +08:00
杨翊 SionYang
df4b006b36
Upgrade version to 1.3.2 (#3512) 2020-08-04 12:58:45 +08:00
nov.lzf
3a777455e7
move rpc client from client to common and move request response to api ; solve conflict. (#3481) 
* Add gprc support->  move rpc client from client to common and move request response to api

* Add gprc support->  conflict solved
 2020-07-30 17:21:44 +08:00
杨翊 SionYang
5f528d8036
[ISSUE #1097] Naming support grpc server forward request (#3480) 
* re subscribe service when reconnect

* change grpc instance maintain by heartbeat

* Add lifecycle for remoting workers

* Refactor naming client redo when reconnect

* Fix checkstyle and PMD

* Implement forward instance request to responsible server

* Implement forward heart beat to servers
 2020-07-30 17:00:57 +08:00
nov.lzf
b1a587dc72
Add gprc support-> add server push ack (#3478) 2020-07-30 16:00:22 +08:00
杨翊 SionYang
1a22ae4c47
Fix checkstyle error (#3467) 
Fix checkstyle error (#3467)
 2020-07-29 16:09:35 +08:00
杨翊 SionYang
8dfdc81481
[ISSUE #1097]grpc support all namingService api (#3425) 
* grpc support query service name list api

* grpc support query server healthy api
 2020-07-23 15:22:07 +08:00
nov.lzf
50a298c9af
switch server optimize and loader balance base on max client count (#3420) 
* Add gprc support-> authentication on client

* Add gprc support-> optimize switch server and submit loader balance base on up limit clients count.
 2020-07-23 10:26:25 +08:00
nov.lzf
b28636c6de
notify connect listeners on start up (#3405) 
* Add gprc support-> try to connect the server synchronous on start up , start a thread to connect to server until successfully connected when fail.

* Add gprc support-> notify connect listeners.

* Add gprc support-> update client reconnect  strategy.

* Add gprc support-> optimize push config request param model and meta request.

* Add gprc support-> notify on new connected
 2020-07-21 20:08:38 +08:00
杨翊 SionYang
115c992c98
[ISSUE #3386] Refactor HostReactor.java to ServiceInfoHolder and ServiceInfoUpdateService (#3402) 
* Refactor HostReactor.java to ServiceInfoHolder and ServiceInfoUpdateService

* Use http client as default implement of some uncompleted api
 2020-07-21 15:02:44 +08:00
mai.jh
75a06834f5
unified implementation of http client package division (#3400) 2020-07-21 14:53:03 +08:00
nov.lzf
53031ba08b
strengthen exception handle both on server and client ; status transfer bug fix on client (#3401) 
* Add gprc support->test submit

* Add gprc support-> Strengthen exception handling of server push handler process both at client and server

* Add gprc support-> starting status bugfix and  base push model submit
 2020-07-21 14:44:01 +08:00
杨翊 SionYang
571ae62de1
Move BeatReactor into HttpClientProxy (#3394) 2020-07-20 20:48:21 +08:00
杨翊 SionYang
2e4d50c4f2
Extract server list maintain logic to ServerListManager (#3389) 2020-07-20 17:52:58 +08:00
杨翊 SionYang
39986a867a
[ISSUE #3386] Extract NamingClientProxy Interface (#3387) 
* Move and rename NamingProxy.java

* rename package naming.net --> naming.remote

* Create Naming client proxy interface
 2020-07-20 16:32:07 +08:00
nov.lzf
85a0398978
1.server side client connection listener optimize 2. listen context and notifier updated . (#3385) 
* Add gprc support-> client reconnection optimize

* Add gprc support-> 1.client connection listener optimize  2.listen context an notifier updated .

* Add gprc support->merge problem fix

* Add gprc support->check style fixed.

* Add gprc support->check style fixed and remove  gRpc classes in source package.
 2020-07-20 16:27:58 +08:00
杨翊 SionYang
e5f0c368c9
Hotfix client sdk depend jdk7 charset. (#3376) 2020-07-18 23:01:32 +08:00
杨翊 SionYang
cda3f14230
Hotfix client sdk depend jdk7 charset. (#3374) 2020-07-18 16:36:10 +08:00
KomachiSion
79c8521bde Merge 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/http/HttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
 2020-07-18 16:28:00 +08:00
杨翊 SionYang
3bde28294d
[ISSUE #1097] Naming support un/subscribe service by grpc. (#3373) 
* For #1097, server support subscribe service.

* For #1097, client support subscribe service.

* For #1097, server and client support unsubscribe service.
 2020-07-18 16:07:21 +08:00
mai.jh
63a4e30ae6
[ISSUE #3224]nacos-client module http client replace (#3348) 
* nacos-client module http client replace

* fix code style problem

* add HashMap initialCapacity

* fix code style problem

* Modify the header object, keep the original response header to avoid modifying the original logic code

* fix code style problem

* naming http client request exception messages output change

* Merge code
 2020-07-18 14:42:02 +08:00
nov.lzf
4a702f8954
Add gprc support-> client reconnection optimize (#3367) 2020-07-17 20:57:52 +08:00
nov.lzf
688013bbb6
Add gprc support-> client reconnection optimize (#3365) 2020-07-17 17:42:46 +08:00
Hu Zongtang
9f12f76d6c
[ISSUE#2859]fix no throw exception when publish event but no subsciber. (#3364) 2020-07-17 16:12:32 +08:00
nov.lzf
b10a24885e
add server side connection listener ,and add client version (#3350) 
* Add gprc support-> 1.add server side client connection event listener ，base on heart beat expire time check  2.add client version  info after grpc connection build

* Add gprc support-> add publish config and remove config in rpc channel ;and rename server push response handler
 2020-07-16 19:21:38 +08:00
杨翊 SionYang
6c8dfd6ed3
Add naming support gRPC for query instance list and service info (#3352) 
* Add naming support gRPC for query instance list and service info

* Update version to 1.4.0-SNAPSHOT
 2020-07-16 18:08:25 +08:00
nov.lzf
0aad8f55eb
support config query in rpc channel ,add switch http/rpc at client side (#3344) 
* Add gprc support-> 1.support config query  in rpc channel ,add switch in client side

* Add gprc support-> 1.log optimize，split grpc core and digest

* Add gprc support-> 1.optimize log and client proxy.

* Add gprc support-> remove  proto buff plugin
 2020-07-15 20:54:16 +08:00
杨翊 SionYang
d00c133c3e
Add naming support gRPC for register and deregister instance (#3343) 2020-07-15 20:22:07 +08:00
mai.jh
0163d2d0c7
fix: #3324, Move http client close method to NamingProxy.shutdown() (#3333) 2020-07-15 14:12:44 +08:00
nov.lzf
139b211e21
Nacos config support gRPC (#3334) 
* Add gprc support-> client side code submit ,and create server side naming module abstract handler template.

* Add gprc support-> config data change  notify code submit....

* Add gprc support-> serve side healthy check code submit and solve some checkstyle problems.

* Add gprc support-> 1.config client worker ,cancel long polling task  2. test add listener,remove listener in config module  3.add response resolve
 2020-07-15 13:56:29 +08:00
nov.lzf
bbbeabe1e8
nacos support grpc ,base functions submit. (#3328) 
* gprc

* Add gprc support
 2020-07-14 19:15:22 +08:00
mai.jh
511ef88ccc
fix:#3311 Add specified Logger when constructing nacos resttemplate (#3312) 2020-07-13 18:54:06 +08:00
Joe
eca82bff6f
Update BeatReactor.java (#3299) 
update `asInt()` to `asLong()`
 2020-07-13 10:39:59 +08:00
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
95f3bfb587
[ISSUE #2992]Recheck all checkstyle and open checkstyle during building (#3293) 
* Re-check code style for nacos-config module.

* Re-check code style for other module.

* Open checkstyle plugin check during build
 2020-07-10 17:18:53 +08:00
杨翊 SionYang
66e6d24822
Hotfix send beat info error (#3287) 2020-07-09 21:20:07 +08:00
Hu Zongtang
2342952b63
[ISSUE#3275]Fix the problem that 1.3.1-BETA SDK LifeCycle can't be shutdown for some thread executors. (#3280) 
* [#3275]resolve the issue that lifecycle can't be shutdown for some thread executors.

* [ISSUE#3275]do close for upsocket in shutdown method.

* [ISSUE#3249]fix typo.
 2020-07-08 16:54:40 +08:00
杨翊 SionYang
220b6c4f8d
Hotfix double register null service and beat info invalid problem (#3260) 
* Hotfix, double register null service and beat info invalid problem

* Revert nacos-client JDK back to 6

* Revert nacos-client JDK back to 6
 2020-07-06 19:41:18 +08:00
杨翊 SionYang
1a0df78d8a
[ISSUE #2992] Use new code style for nacos-client module. (#3219) 
* Use new code style for nacos-client module.

* For checkstyle
 2020-07-03 17:30:05 +08:00
yangy
aa020e0b81
upgrade log4j version (#3229) 2020-07-03 09:22:44 +08:00
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
liaochuntao
2c733d57ff
[#2979] Inline storage support importing data from external data sources (#3138) 
* feat: data import Derby, Derby export complete

* feat: external data source import is complete

* feat: import data to derby and derby backup finished

* fix: fixed bug where external storage mode could not find beans

* style: fix code style

* style: remove unuse code

* refactor: fixed configuration file information

* improvement: merge upstream/develop

* style: fix code style

* fix: a way to fix the missing

* fix: fix derby data import in standalone mode

* style: fix code style

* refactor: merge upstream develop and fix code style

* test: modify ut

* style: fix code style
 2020-06-28 10:25:06 +08:00
mai.jh
6ce8d8ca79
[ISSUE #3140]nacos-client module replace http client (#3142) 
* nacos-client http client replace

* Remove some explain

* Remove some explain

* Adjust some code styles and fix some misspelled method names

* Fix code style issues

* fix some misspelled method names

* Fix code style issues
 2020-06-22 20:42:46 +08:00
杨翊 SionYang
f864880136
[ISSUE #2992] use new code style for nacos-common (#3106) 
* use new code style for nacos-common

* Fix code style file can't set java import problem.
 2020-06-18 17:05:15 +08:00
mai.jh
e528ea82e9
[ISSUE #3094]abstract create nacos restTemplate factory (#3095) 
* abstract create nacos restTemplate factory, allowing users to customize the commonly used http client config

* add class file license.

* change class file name

* Adjust some code
 2020-06-17 17:53:37 +08:00
Hu Zongtang
3f0023a3a9
Remove dependency of apache-common-lang3 in the client. (#3031) 
* [#3026]remove dependency of apache-common-lang3 in the client.

* [#1815]adjust, optimize codes and merge some class.

* [#3031]adjust some codes.

* [#3031]adjust codes and fix typo.

* [#3031]fix typo.
 2020-06-15 13:41:53 +08:00
chuntaojun
abae5e106b refactor: remove unuse code 2020-06-15 11:08:10 +08:00
chuntaojun
77186f9a6c refactor: remove server-addr validator 2020-06-15 11:04:47 +08:00
chuntaojun
7641b45df4 fix: fixed parameter validation boundary problem 2020-06-15 10:11:34 +08:00
KomachiSion
079009b5a5 For #2873, unified copyrights for nacos-client. 2020-06-12 15:33:41 +08:00
horizonzy
315a6c36c5 1.update beatinfo when received instance modify info 
2.add the unit test of this case
 2020-06-11 21:44:33 +08:00
zongtanghu
e7796b3935 [#1815]adjust codes for instance class attribute init. 2020-06-11 12:42:47 +08:00
zongtanghu
d2b980677f [#1815]remove code comments. 2020-06-11 11:33:38 +08:00
zongtanghu
e6e3161c0e resolve the codes conflicts 2020-06-11 09:45:00 +08:00
zongtanghu
eb39830b6c [#1815]remove lifeCycle, lifeCycleManager, and adjust some related codes. 2020-06-11 09:42:44 +08:00
huqingfeng
d21bbf4688 a power of two size for hashmap 2020-06-10 17:42:17 +08:00
zongtanghu
8f7fb0f65a [#1815]remove no used package name from Factory Class and adjust test cases. 2020-06-09 14:10:47 +08:00
chuntaojun
364745e000 refactor: add config publish log 2020-06-05 10:50:29 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +08:00
zongtanghu
09752e354d [#1815]adjust this keywords which just includes constructor and set method in the class and fix some unit test cases. 2020-06-03 17:35:06 +08:00
zongtanghu
e86c158262 resolve codes conflicts 2020-06-03 14:57:46 +08:00
zongtanghu
5e2840a6bd [#1815]adjust and optimize codes. 2020-06-03 10:46:41 +08:00
zongtanghu
2ab274216a [#1815]adjust and optimize codes, reput the lifecycle to ConfigService class level at the same time. 2020-06-02 19:55:30 +08:00
Jack Dai
1a7264d9b6 解决和develop的冲突 2020-06-01 18:41:03 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
zongtanghu
8d6dd8f41b [#1815]adjust codes and reput the lifecycle to ConfigService class level. 2020-06-01 17:57:35 +08:00
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +08:00
zongtanghu
6981fbc576 [#1815]add ResourceLifeCycleManager,adjust some code and fix some unit test cases. 2020-05-29 19:10:06 +08:00
Jack Dai
9692cd1b8c 合并和origin/develop的冲突 2020-05-29 19:01:48 +08:00
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +08:00
Jack Dai
594eac42b3 整理每个module的plugin和dependency的版本号 2020-05-29 16:35:48 +08:00
chuntaojun
5cd5ca35b8 refactor: merge develop 2020-05-28 20:14:47 +08:00
KomachiSion
d27a6c7ea6 Fix replace jackson error 2020-05-28 10:40:05 +08:00
chuntaojun
e8533155c7 fix: fix startup problem 2020-05-27 22:05:38 +08:00
KomachiSion
0b1a58e29b Remove all dependency except nacos-test 2020-05-27 15:41:07 +08:00
yanlinly
a07b0c530f
Merge pull request #2893 from KomachiSion/develop-issue#2842 
[ISSUE #2842]Replace Fastjson with Jackson for nacos-api and nacos-client
 2020-05-26 22:41:02 +08:00
KomachiSion
5b9780e2fc Replace fastjson with jackson for nacos-client 2020-05-26 14:59:23 +08:00
chuntaojun
6fe1d0d0da improvement: adjust part of the code 2020-05-26 11:57:27 +08:00
yfh0918
1484a59499 #2855 2020-05-25 17:59:30 +08:00
fenghua.yu
2da06cf05b #2855 2020-05-25 17:44:03 +08:00
fenghua.yu
34e50e73fd #2855 
needs to close GZIPInputStream manually
 2020-05-25 15:42:19 +08:00
chuntaojun
be75c582c2 Merge remote-tracking branch 'origin' into feature_1.3.0_beta_grpc 2020-05-21 22:09:10 +08:00
liaochuntao
d4efcf4df3
Merge pull request #2548 from wolfdriver/develop_20200329_remove 
remove useless code
 2020-05-21 21:58:19 +08:00
liaochuntao
fea2c674bd
Merge pull request #2687 from Maijh97/develop 
Modify log output
 2020-05-21 21:44:04 +08:00
chuntaojun
87a32a926b refactor: merge develop 2020-05-21 18:08:29 +08:00
chuntaojun
c6ff9031c5 refactor: remove extraneous code 2020-05-20 22:47:54 +08:00
chuntaojun
c4a93d1c37 refactor: code refactor 2020-05-20 15:45:15 +08:00
chuntaojun
07dd129dd0 refactor: fixed instance information update heartbeat information not updating 2020-05-17 16:22:49 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
chuntaojun
82bcbd9b17 refactor: jRaft partial logical adjustment 2020-05-13 09:38:46 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
chuntaojun
5879b03c7d fix: expansion and volume timing issue fixed 2020-05-09 14:49:04 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +08:00
chuntaojun
1563dc7104 fix: fixed a problem where parameters were encoded multiple times 2020-05-05 09:43:54 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00