Commit Graph

911 Commits

Author SHA1 Message Date
blake.qiu
46bee904dc
fix(#10980): After connectionIds.remove(connectionId) is executed, if connectionsIds is empty, clear the k-v corresponding to groupKeyContext. (#10981) 2023-08-31 13:46:33 +08:00
blake.qiu
595c07388f
fix(#10945): Remove invalid code in the LongPollingService class. (#10946) 2023-08-31 13:42:54 +08:00
blake.qiu
5c1e80d938
fix(#10940): The SQL statement should query the 'gmt_modified' field. (#10941) 2023-08-31 13:41:53 +08:00
brother-戎
b3b74b7219
[ISSUE#10908] Fix Bean injection in class of ConfigCacheService (#10929)
* fix:
1. derby syntax error
2. IllegalArgumentException:RowMapper is required
3. bean injection in Class of ConfigCacheService

* remove @Autowared

* recover properties
2023-08-31 13:40:20 +08:00
Sunrisea
d756cdc6de
[ISSUE #10734] Optimize the param check implementation logic (#10955)
* For #10734,优化实现逻辑,提高扩展性,为动态变更限流规则预留接口

* For #10734,优化实现逻辑,提高扩展性,为动态变更参数校验规则预留接口
2023-08-14 14:55:49 +08:00
E1se2t
003f192aa8
[ISSUE #10951]Autowired members must be defined in valid Spring bean (#10951) (#10961) 2023-08-14 14:39:24 +08:00
blake.qiu
de87bb3e30
feat(10891): Provide a configuration item for the maximum number of push retries, instead of directly hardcoding it to 50 times in the code. (#10895) 2023-08-04 12:03:08 +08:00
Sunrisea
8adca685f6
[ISSUE #10734] Refactor the ParamChecker and ParamExtractor (#10775)
* For #10734,refactor the paramextractor and ParamChecker

* For #10734,alter the rules of ParamCheck

* For #10734,alter the rules of ParamCheck

* For #10734,fix bug

* For #10734,fix bug and alter the ParamCheckRules.java

* For #10734,fix code style

* For #10734,fix the param check rules

* For #10734,implement the server param check config

* For #10734,optimize the logic

* For #10734,optimize the logic

* For #10734,optimize the logic
2023-07-19 16:34:03 +08:00
blake.qiu
9561db324d
feat(#10539): When the operation configuration fails, log. (#10804) 2023-07-19 16:28:57 +08:00
nov.lzf
a83e2cc542
dump change check task submit (#10755)
* dump change check task submit

* delete config nid convert error fix

* fix test case

* checkstyle
2023-07-11 19:00:23 +08:00
Sunrisea
c7a20bd132
[ISSUE #10734] Implement http request param check filter and http param extractors (#10758)
* For #10734,Implement grpc server interceptor and grpc param extractors

* For #10734,add unit test for grpc server interceptor and grpc param extractors

* For #10734,alter the test case

* For #10734,delete the ConnectionSetupRequestParamExtractor

* For #10734,add the naming http request param check filter and implement the naming http request param extractors

* For #10734,add unit test for naming http request param extractors

* For #10734,Implement grpc server interceptor and grpc param extractors

* For #10734,add unit test for grpc server interceptor and grpc param extractors

* For #10734,delete the ConnectionSetupRequestParamExtractor

* For #10734,add the naming http request param check filter and implement the naming http request param extractors

* For #10734,add unit test for naming http request param extractors

* For #10734,add the config http request param check filter and implement the config http request param extractors and unit test

* For #10734,add the console http request param check filter and implement the console http request param extractors and unit test

* For #10734,fix code style

* For #10734,alter the logic of exception handle in filter

* For #10734,fix code style
2023-07-11 17:52:54 +08:00
zhanghong
38f461eb12
[ISSUE #10583]修复权限 (#10587)
* 修复权限

* 修改为console

* 修改为console
2023-06-05 17:21:05 +08:00
ZhangShenao
4c57517786
Use Generic Type in NacosConfigConfiguration (#10549) 2023-05-26 15:17:15 +08:00
nov.lzf
505c90b96d
uniform config lastmodified ts & refactor config disk storage. (#10533)
* uniform cache timestamp

* uniform cache timestamp

* uniform cache timestamp

* uniform cache timestamp

* checkstyle & pmd

* revert application properties

* remove duplicate code

* checkstyle and pmd

* bug fix
2023-05-26 09:53:25 +08:00
chenyiqin
62a106bc1c
remove dependence of package sun.security.action for ResponseUtilTest.java (#10478) 2023-05-16 10:21:06 +08:00
KomachiSion
dc79f05838 For pmd 2023-05-12 10:14:21 +08:00
KomachiSion
5897a61e8e Fix start error. 2023-05-11 20:09:33 +08:00
KomachiSion
f0336b86e8 Remove useless method and field. 2023-05-11 17:19:27 +08:00
KomachiSion
23780d9b15 ConfigChangeAspect 去除对插件实现的感知。 2023-05-11 16:44:29 +08:00
KomachiSion
131dc643b3 Merge remote-tracking branch 'upstream/develop' into asoc2022_issue#8460-2
# Conflicts:
#	persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConfigChangeConfigsTest.java
2023-05-11 15:41:17 +08:00
KomachiSion
4198005529 For checkstyle and pmd. 2023-05-09 16:40:25 +08:00
KomachiSion
0555619b05 Merge remote-tracking branch 'upstream/develop' into develop#10361
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java
2023-05-09 15:50:12 +08:00
KomachiSion
607074c877 Make HealthController not strongly depend config and naming module. 2023-05-09 14:43:25 +08:00
KomachiSion
cb65d53c7e Move ExternalStoragePaginationHelperImpl to persistence module. 2023-05-09 10:15:22 +08:00
KomachiSion
9d92b5122a Add NamespaceDetailInjector and move NamespaceOperationService to core module. 2023-05-09 10:05:26 +08:00
KomachiSion
e93d417de6 Move CommonPersistService impls to core module and rename to NamespacePersistService. 2023-05-08 20:42:29 +08:00
KomachiSion
a972e02b13 Move NACOS_PLUGIN_DATASOURCE_LOG to datasource plugin module. 2023-05-08 20:34:07 +08:00
KomachiSion
515ae912b2 Move some TenantInfo and NamespaceRowMapperInjector to core module. 2023-05-08 20:29:53 +08:00
KomachiSion
841ce677d1 Move DerbySnapshotOperation and DistributedDatabaseOperateImpl to core module. 2023-05-08 19:29:14 +08:00
zhanghong
5cf5829253
add configModuleState/raftModuleState/distroModuleState in branch develop#10153 (#10288)
* add configModuleState/raftModuleState/distroModuleState

* add configModuleState/raftModuleState/distroModuleState

* update TEST

* 修复test bug

* 移除ip暴露风险
2023-05-08 18:05:34 +08:00
KomachiSion
3d4014a3d3 Move StandaloneDatabaseOperateImpl to persistent module. 2023-05-08 11:56:38 +08:00
KomachiSion
576225485e Move TimerContext to sys module and add new one single thread to snapshot for derby. 2023-04-25 14:46:38 +08:00
KomachiSion
4622d0e1bf Split RowMapperManager and move to persistence module. 2023-04-25 14:23:43 +08:00
KomachiSion
66a2e2db4a Use apply hook replace ConfigDump depend. 2023-04-25 14:01:41 +08:00
KomachiSion
218fe4e732 Move some events and exception to persistence module 2023-04-25 11:29:11 +08:00
KomachiSion
77b7377826 Move Conditions to persistence module. 2023-04-23 20:06:22 +08:00
KomachiSion
8dffc3ac99 Move EmbeddedPaginationHelperImpl to persistence module. 2023-04-23 18:22:27 +08:00
KomachiSion
cf1b86a2b7 Move EmbeddedPaginationHelperImpl to persistence module. 2023-04-23 18:05:01 +08:00
KomachiSion
326b82fb06 Move Embedded operate to persistence module. 2023-04-23 18:02:27 +08:00
KomachiSion
6e8d6c532d Move DerbyUtils to persistence module. 2023-04-23 17:56:59 +08:00
KomachiSion
8dfd31a87d Move QueryType to persistence module. 2023-04-23 17:54:21 +08:00
KomachiSion
6acabeca67 Move some methods from EmbeddedStorageContextUtils to EmbeddedStorageContextHolder 2023-04-23 17:37:14 +08:00
KomachiSion
f83061f47d Move some datasource and relative classes into persistence module. 2023-04-23 16:00:42 +08:00
KomachiSion
802bacafbe Add module enabled packages scan filter. 2023-04-23 15:57:46 +08:00
vivid
5c4bbe85f7 补充完整剩余dataSource的MapperContext改造 (#10140) 2023-04-14 15:28:47 +08:00
KomachiSion
08f7c9ff2a Re-commit #9851 #9967. 2023-04-14 15:28:47 +08:00
MajorHe1
fb8255c8b7
[ISSUE #10310] Update log output in RpcConfigChangeNotifier.java when push fail (#10312)
* [ISSUE #10310]Update log output in RpcConfigChangeNotifier.java when push fail

Update log output in RpcConfigChangeNotifier.java when push fail

* update indentation level

update indentation level
2023-04-13 19:14:45 +08:00
chenyiqin
e002cefb6e
Fix fs char (#10101)
* Add PathEncoder for OS to encode if dataId, ns, group contains illegal char for file system

* Add copyright

* Fix checkstyle

* Fix pmd

* fix PathEncoderManager as singleton

* fix ut

* fix checkstyle
2023-03-27 15:04:20 +08:00
悟空
f7756b7841
fix: typo: 秘钥->密钥 (#10182) 2023-03-27 09:49:02 +08:00
杨翊 SionYang
81dda26709
Upgrade snakeYaml to 2.0 (#10092)
* Upgrade snakeYaml to 2.0

* Fix unit.
2023-03-14 13:15:51 +08:00
杨翊 SionYang
1968b3fc98
Develop revert#9851 #9967 (#10069)
* Revert "[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967)"

This reverts commit d16023c1

* Revert "[ISSUE #9821] Update data-source-plugin input and output parameters (#9851)"

This reverts commit 1ff7a3f6
2023-03-10 10:25:25 +08:00
云野
02a5e38981
fix #10044 -- only update existed config. (#10045) 2023-03-09 15:20:36 +08:00
chenyiqin
920fd4c211
Remove http data change (#10043)
* Remove http way to report data change

* Remove http controller method to receive data change
2023-03-06 10:20:25 +08:00
Karson
e58c4441f4
[ISSUE #9943] Resolve issue Config cas update not work (#9952)
* fix issue 9943

* add some description

* add some log for roll back transaction

* add some log for roll back transaction

* set default rollBackOnUpdateFail false.

* format style

* fix some bug
2023-03-03 11:14:08 +08:00
WangLiang/王良
a397c10a54
Optimize the nacos-client/pom.xml for exclude google/**/*.proto (#9982)
* Optimize the pom.xml of the nacos-client

* optimize pom

* exclude `google/**/*.proto`

* tab

* Remove dependency `io.grpc:protoc-gen-grpc-java:${version}:pom`

* revert indent

* revert native-image
2023-03-01 09:42:15 +08:00
zhanghong
a6332b250d
[ISSUE #9276] 新增根据配置信息检索内容的功能 (#9925)
* 新增根据配置信息检索内容的功能

* use offer replace add

* use offer replace add

* use offer replace add

* update exception type and  limit some config as configurable

* update

* update params

* update params

* update params
2023-02-21 10:25:19 +08:00
The-Gamer-01
d16023c156
[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967)
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.

* Added Map mapping refinement corresponding to UPDATE and WHERE.

* [ISSUE #9821] Fix API of return class of ConfigInfoAggrMapper.

* [ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters
2023-02-20 10:04:10 +08:00
The-Gamer-01
1ff7a3f6bd
[ISSUE #9821] Update data-source-plugin input and output parameters (#9851)
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.
2023-02-10 09:45:14 +08:00
云野
98d3da4a48
fix typo 'curcuit';remove unused variable. (#9901) 2023-02-07 10:24:14 +08:00
liu-xg
65da789215
fix(修复配置历史分页异常): 配置历史分页异常,所有页都是全部记录 (#9828)
* fix(修复配置历史分页异常): 配置历史分页异常,所有页都是全部记录

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求
2023-02-03 15:41:13 +08:00
李云飞
d45ba449ca
[ISSUE #8460]add config change plugin (#9820) 2023-01-16 10:04:24 +08:00
Karson
c8b04b03fa
[ISSUE #9783] 处理namespaceId=public 时 v2接口 无法创建与删除配置 (#9809)
* fix issue #9783

* fix issue #9783

* add it test for v2 config.

* fix ci problem.

* fix ci problem.

* fix ci problem.

* fix history process NamespaceParameter

* fix ci problem.

* add some unit test

* reformat code
2023-01-16 10:01:54 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
Korov
d51ad454a4
remove unused local variables (#9781) 2023-01-03 12:09:04 +08:00
wenxuan70
60528cd21b
fix: replace the concatenated string with a placeholder in the batchRemoveAggr method (#9646) (#9659) 2023-01-03 12:05:31 +08:00
zhuyou1234
ef212ccad1
代码优化 (#9752)
调整timeout位置
2023-01-03 11:57:36 +08:00
nov.lzf
69047073c6
修改长连接request response 类注册逻辑,由类扫描改成手动注册 (#9738)
* 修改request response 类加载逻辑,有类扫描改成手动注册

* 优化注册方式,直接SPI注册payload
2022-12-21 19:56:21 +08:00
npk191954
99ea570e7a
1.Update 更新Config模块测试用例。 (#9687)
* 1.Update 更新config模块的测试用例。

* 1.Update 更新config模块的测试用例。

* 1.Update 更新config模块的测试用例。

* 1.Update 更新config模块的测试用例。
2022-12-13 13:54:10 +08:00
杨翊 SionYang
dfcdd391af
Add auth for some v2 api. (#9671) 2022-12-08 10:31:32 +08:00
nov.lzf
acc8ab46cf
Refactor connection limit module to plugin (#9653)
* 限流插件提交

* 限流插件提交

* 限流插件提交

* 限流插件重构提交

* connection control test case submit

* tps control test case submit

* tps control test case submit

* tps control test case submit

* exact model has higher priority

* exact model has higher priority

* tpsreporter

* tpsreporter

* tpsreporter

* check style

* log optimize

* interceptor

* checkstyle

* tps check

* configController query http

* rename component

* 优化参数命名

* 优化参数命名

* 优化参数命名

* 优化参数命名

* optimize connection manager

* optimize connection manager

* optimize connection manager

* optimize connection manager

* interceptor to mse

* Monitor Model

* Monitor Model

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* opensource submit

* opensource submit

* check style

* check style

* pmd ,rat

* update db params

* test case fix

* 简化开源反脆弱实现

* test case

* test  case fix

* 修复单测

* 修复单测

* 修复单测
2022-12-06 16:15:51 +08:00
zhanghong
2d317227b3
[ISSUE #9655] fix ExceptionHandler order bug (#9657)
* fix #9655 ExceptionHandler order bug

* Change GlobalExceptionHandler order
2022-12-03 19:24:39 +08:00
zhanghong
014eb69b46
[ISSUE #9648] 修复关于tagList传入参数有误 (#9650)
* #9648 fix this bug

* fix some Deprecated-Method bug
2022-12-02 17:40:08 +08:00
zume0127
62b03ff915
[ISSUE #9631] return value of putIfAbsent ignored, value passed to putIfAbsent reused (#9633)
Signed-off-by: zume0127 <790589151@qq.com>

Signed-off-by: zume0127 <790589151@qq.com>
2022-11-28 09:28:00 +08:00
ZhongJinHacker
93c6fe0167
fix SonarLint check (#9608)
1. slf4j.Logger 在确定满足日志等级情况下会去调用ex的toString,这里直接toString,会造成即使没满足日志等级的情况下也会执行toString
2. 删除注释代码
3. 解除sonar访问成员权限警告,外部类可以访问到内部类的私有成员,编译执行没有问题,和其他内部类成员访问权限保持一致(其他内部类成员也是采用相同的方式被外部类访问,例如isBeta)
2022-11-22 15:27:01 +08:00
李晓双 Li Xiao Shuang
ba37d63ad4
[ISSUE #9571] Replace PersistService (#9583)
* replace PersistService

* replace PersistService

* fix test
2022-11-18 11:08:18 +08:00
李晓双 Li Xiao Shuang
fcf633a52d
[ISSUE #9571] Split the PersistService class because it's too big (#9572)
* Split the PersistService class

* add ConfigInfoAggrPersistService implements

* add ConfigInfoBetaPersistService implements

* add ConfigInfoPersistService implements

* add ConfigInfoTagPersistService implements

* add HistoryConfigInfoPersistService implements

* add OtherPersistService implements

* check style

* Specify the class name to inject service

* Specify the class name to inject service

* Initialize the property using the constructor

* rename OutherPersistService to CommonPersistService
2022-11-14 16:31:22 +08:00
The-Gamer-01
b14cc257bf
[ISSUE #9510]Add sql log print function. (#9511)
* [ISSUE #9510]Add sql log print function.

* [ISSUE #9510]Remove AspectJ and add sql proxy.

* [ISSUE #9510]Update data source plugin log.

* [ISSUE #9510]Update args log.

* [ISSUE #9510]Add unit test.
2022-11-11 11:28:22 +08:00
无处不在
ec7ba18792
[impr]Update some method from RETURN_GENERATED_KEYS replace to String[]{"id"},Avoid database compatibility issues (#9515) 2022-11-10 09:42:38 +08:00
李晓双 Li Xiao Shuang
3f1b96b15a
[ISSUE #9516] Clean up PersistService invalid code logic (#9517)
* Clean up PersistService invalid code logic

* Clean up PersistService invalid code logic

* Clean up PersistService invalid code logic
2022-11-10 09:42:35 +08:00
李晓双 Li Xiao Shuang
00dea25de0
[ISSUE #9506] Sql extraction of group_capacity table (#9507)
* sql extraction of group_capacity table

* sql extraction of group_capacity table

* sql extraction of group_capacity table

* sql extraction of group_capacity table
2022-11-09 09:24:23 +08:00
李晓双 Li Xiao Shuang
0348014c17
[ISSUE #9490] Optimize datasource name configuration reading (#9491)
* Optimize data source name configuration reading

* Optimize data source name configuration reading

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* fix unit test

* fix unit test
2022-11-08 09:22:33 +08:00
无处不在
21683957e5
[ISSUE #9415]update setExternalStorage logic,support more db check,add 8 count unit test (#9470)
* [impr]update setExternalStorage method logic,support more db check,add 8 count unit test method

* update comment desc
2022-11-07 17:17:52 +08:00
The-Gamer-01
3750f73bd4
[ISSUE #9486]Optimizing paging parameters. (#9488) 2022-11-06 17:25:04 +08:00
李晓双 Li Xiao Shuang
6849af1547
Optimizing paging parameters (#9487) 2022-11-06 16:59:27 +08:00
李晓双 Li Xiao Shuang
40519a22d5
[ISSUE #9475] Abstract common count method (#9481)
* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method
2022-11-06 15:53:05 +08:00
The-Gamer-01
ff2497d999
[ISSUE #9449]Add Tenant Capacity mapper. (#9456) 2022-11-05 00:44:21 +08:00
李晓双 Li Xiao Shuang
d5fb300dd2
[ISSUE #9475] Abstract common count method (#9476)
* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method
2022-11-04 22:52:30 +08:00
李晓双 Li Xiao Shuang
9ea8333373
[ISSUE #9466] Modify the findMapper method of MapperManager to be a generic method (#9467)
* Modify the findMapper method of MapperManager to be a generic method

* Modify the findMapper method of MapperManager to be a generic method
2022-11-04 16:52:27 +08:00
The-Gamer-01
0aeb2bd2cc
[ISSUE #9449]Add Tenant Information mapper. (#9454) 2022-11-03 13:58:21 +08:00
无处不在
98f7066519
[ISSUE #9423] ExternalDataSourceProperties add isEmpty check to support external config (#9439)
* [conf]Update group_id length from 255 to 128

* [impr]修改外部数据源加载驱动名称判断逻辑,外部配置为空时,才设置为默认mysql配置

* [impr]修改外部数据源加载驱动名称判断逻辑,外部配置为空时,才设置为默认mysql配置

* [impr]修改变量名称,确保CI可以通过
2022-11-02 14:14:29 +08:00
无处不在
4a305f6584
[conf]Update group_id length from 255 to 128 (#9412) 2022-10-28 10:51:45 +08:00
KomachiSion
68d7f042d1 Fix update config info cas error. 2022-10-27 14:08:11 +08:00
The-Gamer-01
af897bc656
[ISSUE #8312]Fix Persist Service Implementation。 (#9395) 2022-10-25 22:24:37 +08:00
KomachiSion
8410fbccf3 Merge remote-tracking branch 'upstream/2.2.0' into asoc2022_issue#8461
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
2022-10-25 14:52:32 +08:00
KomachiSion
7c36c36201 Fix checkstyle. 2022-10-25 14:31:15 +08:00
李晓双 Li Xiao Shuang
284acbfd02
[ISSUE #8312] Fixed some problems with configuration sql (#9388)
* fix sql

* fix history sql

* fix clone sql

* fix beta sql
2022-10-25 13:02:13 +08:00
Liu Yixiao
03345fd923
[ISSUE #8461] Enhance Nacos monitor observability system (#9038)
* Enhance MetricsMonitor with several new metrics

* Add config read and write rt

* Add ServiceEvent publisher queue size

* Add fuzzy search count

* Add naming subscriber and publisher count with v1 or v2 version tag

* Add config subscriber count with v1 or v2 version tag

* Add pending push task count and empty push count metrics

* collect pending push task count by scheduled task

* add unit test for increment metrics in NacosMonitorPushResultHook

* Add topn counter container and topn config change

* Create private MeterRegistry for config change

* Add scheduled clear for config change count, add removeAll for TopnCounterMetricsContainer

* Add topn service change

* Reconstruct metrics monitor with NacosMeterRegistryCenter.

* divide globalRegistry to different modules' CompositeMeterRegistry

* Add dynamic meters refresh service for config and naming module

* fix unit test

* Add try catch when init NacosMeterRegistryCenter
2022-10-25 11:31:29 +08:00
李晓双 Li Xiao Shuang
97ca821cee
fix sql (#9386) 2022-10-25 00:58:34 +08:00
The-Gamer-01
7a4897830b
[ISSUE #8312]Merge sql. (#9385)
* [ISSUE #8312]Merge sql.

* [ISSUE #8312]Fix bugs.
2022-10-24 23:07:05 +08:00
KomachiSion
3863ede017 Change datasource plugin version as revision. 2022-10-24 16:09:50 +08:00