Commit Graph

590 Commits

Author SHA1 Message Date
realJackSun
c13f800c5b
[#5983] Fix unit tests in nacos-config (#5995) 2021-06-17 20:34:21 +08:00
Kamran Ahmed
08c26d6fae
Resolve dependency import path errors (#6070)
* fix #3215 bug by improve code quality for client.

* Fix line indent.

* Resolve dependency import path errors

Co-authored-by: jiele.cao <jiele.cao@sinocare.com>
2021-06-16 10:29:27 +08:00
Kamran Ahmed
4df0cd0c7c
fix #3215 bug by improve code quality for client. (#6050)
* fix #3215 bug by improve code quality for client.

* Fix line indent.

Co-authored-by: jiele.cao <jiele.cao@sinocare.com>
2021-06-15 14:01:18 +08:00
邪影oO
cdc2e3409a
fix #5934 (#6017) 2021-06-09 14:47:07 +08:00
Cherish 蔡
c025dc2c18
Feat resource parser group (#5889)
* feat(#5888): ResourceParser groupName change the splicing method.

* feat(#5888): add UT for NamingResourceParser and ConfigResourceParser
2021-06-09 09:48:18 +08:00
nov.lzf
3dc1a8cd96
fix ak sk and some tiny optimize (#5937)
* fix ak bug.

* fix ak bug.

* revert version
2021-06-04 09:41:40 +08:00
孙继峰
15c71831e7
[ISSUE #5765] fix localhost not match ip (#5852)
* rename IPUitl to InternetAddressUtil

* move isDomain to InternetAddressUtil

* [ISSUE #5765] fix localhost not match ip

* fix typo

* delete the verification IP, follow the single responsibility principle
2021-05-27 19:01:39 +08:00
李晓双 Li Xiao Shuang
d9902175a6
constant variables (#5773) 2021-05-18 19:50:58 +08:00
brotherlu-xcq
8d927c1341
[ISSUE #5727 utils] improve the code quality of nacos-config (#5761)
* [code quality] [nacos-config] [utils] the Chinese javadoc translate, return javadoc complete, the magic number fix, the code logic format

* [code quality] [nacos-config] [utils] fix space
2021-05-18 09:29:02 +08:00
brotherlu-xcq
162b0ea499
[ISSUE #5727 service-1] improve the code quality of nacos-config (#5744)
* [code quality] [nacos-config] [service-1] add change the position of variable to match common code habits , return first, reduce the if/for nest, change the Chinese javadoc to English.

* [code quality] [nacos-config] [service-1] ci problem

* [code quality] [nacos-config] [service-1] ci problem

* [code quality] [nacos-config] [service-1] indent problem fix

* [code quality] [nacos-config] [service-1] indent problem
2021-05-18 09:25:28 +08:00
brotherlu-xcq
7b912fefe7
[ISSUE #5727 service-2] improve the code quality of nacos-config (#5752)
* [code quality] [nacos-config] [service-2] add change the position of variable to match common code habits , add the mission @Override, remove the unnesessary judgement.

* [code quality] [nacos-config] [service-2] indent problem fix
2021-05-17 20:18:58 +08:00
brotherlu-xcq
5f87992321
[code quality] [nacos-config] [controller] add mission @Override, return first, reduce the if/for nest. (#5732) 2021-05-17 09:53:35 +08:00
brotherlu-xcq
26bbf08f2f
[code quality] [nacos-config] [controller] translate the Chinese log to English, the if condition nest optimized, return result optimized. (#5731) 2021-05-17 09:51:54 +08:00
brotherlu-xcq
b24d97c70b
[code quality] [nacos-config] [aspect] translate the Chinese log to English (#5730) 2021-05-17 09:50:11 +08:00
brotherlu-xcq
efd5af6dcb
improve the code quality of nacos-config [auth] (#5729) 2021-05-17 09:49:35 +08:00
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
brotherlu-xcq
c756da3c88
Change the invalid compare in NotifySingleService (#5587)
* optimize the compare in NotifySingleService.java

* delete the unused method setupNotifyExecutors
2021-05-14 09:37:03 +08:00
xiaoheng1
5386096b1d
Deal with the concurrency of ClientLongPolling and DataChangeTask about allSubs (#5561)
* fix #5560 Deal with the concurrency of ClientLongPolling and DataChangeTask about allSubs

* add log to default log.
2021-05-11 15:25:39 +08:00
plusmancn
7e57b90160
[ISSUE #3548] The srcUser fills with username when auth is disabled (console case) (#5566)
* feat: srcUser fills with username (console case)

* fix: code sytle of Constants.java

* fix: code style of the remaining files

* fix: the back button of HistoryDetail.js won't work

* fix: change '源 IP' to '来源 IP'

* fix: undo changes of goList
2021-05-10 20:41:35 +08:00
xiaoheng1
e0a9ecb976
fix #5583 Modify the Chinese log in CapacityController (#5584) 2021-05-10 11:24:16 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +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
brothelul
b148d4b503
fix the press F1 to full screen issue (#5505) 2021-04-27 14:07:12 +08:00
Cherish 蔡
e0fe828542
[ISSUE #5437]: change dump-task taskKey (#5440)
* feat(fix-#5437): change dump-task taskKey

* feat(fix-#5437): Handle CI issues and add doc comments.
2021-04-22 11:27:08 +08:00
赵延
b746b47100
when peer is null, set isOpenService = false directly. (#5428) 2021-04-21 09:33:30 +08:00
haoyann
394230309d
[ISSUE #4602]add new version config export feat (#5345)
* add new version config export feat

* add new export button

* fix ci

* fix magical value

* add YamlParserConstructor
parse config reduce loop

* fix ci
2021-04-16 10:39:55 +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
mai.jh
9cdfd9599d
[ISSUE-#5182] Remove ConfigController#removeRequestContext method. (#5201)
* fix #5182, After some discussion, 2.0 adopted a long connection approach and decided to remove RemoveRequest Context

* fix #5182, After some discussion, 2.0 adopted a long connection approach and decided to remove RemoveRequest Context

* Removing invalid import
2021-03-26 13:52:56 +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
nov.lzf
481d25a6c7
listener bugfix (#5079) 2021-03-12 10:30:52 +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
zhangcly
f8d8e658da
[ISSUE #4274] skip master-select task when db.num is 1 (#4790) 2021-03-04 10:37:10 +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
nov.lzf
ed0edaa023
listen config auth bugfix (#4882) 2021-02-05 10:44:16 +08:00
nov.lzf
4f0ec0a196
optimize config file read (#4875) 2021-02-04 16:22:50 +08:00
nov.lzf
0449fbc707
move server loader controller from console to core; modify common server scheduler count to solve large cpu usage (#4872)
* move server loader controll from  console to core

* modify common server scheduler count to solve large cpu usage
2021-02-04 14:09:08 +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
01ea27501e
Full support for registering custom instances (#4828)
* Move out `cluster` from extendInfo in InstancePublishInfo

* Fix unit test error

* Rename instanceId in instanceMetadata to metadataId

* Fix unit test

* Adapt 1.X client instance Id

* Full support for registering custom instances
2021-01-28 20:20:01 +08:00
huqingfeng
0e42a75833
log error (#4799) 2021-01-28 20:08:34 +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
wjm0729
0545e851db
导入优化 (#4775)
* import 优化

* 无法识别项目 提示优化

* revert

* revert

* 改回原来的格式
2021-01-22 17:03:37 +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
haoyann
de23466363
fix cloning configuration last desc (#4697) 2021-01-15 19:41:46 +08:00
haoyann
63513b44f2
[ISSUE #4661]configServletInner#doGetConfig code optimization (#4666)
* configServletInner#doGetConfig code optimization

* add comment

* update comment

* update comment
2021-01-15 19:26:47 +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