Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Archive to master branch #11919

Merged
merged 105 commits into from
Apr 3, 2024
Merged

Archive to master branch #11919

merged 105 commits into from
Apr 3, 2024

Conversation

KomachiSion
Copy link
Collaborator

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

onewe and others added 30 commits December 5, 2023 09:28
)

- register CONFIG_INFO_STATE_WRAPPER_ROW_MAPPER to RowMapperManager

Close #11459
* fix NPE

* fix NPE

* add console-ui dark mode

* merge

* merge
* support metric for module connection

* fix pmd

* add ut
* 使用磁盘实现Nacos客户端版本降级

* 使用磁盘实现Nacos客户端版本降级

* 使用磁盘实现Nacos客户端版本降级

* 使用磁盘实现Nacos客户端版本降级

* 创建对象时去除cachedir,去除磁盘定时保存任务

* 创建对象时去除cachedir,去除磁盘定时保存任务

* 删除saveFailoverData方法

* 移除getServiceInfo方法中的容灾逻辑

* 移除getServiceInfo方法中的容灾逻辑

* 删除掉注释的方法

* 使用serviceMap对比

* 使用serviceMap对比

* failoverSwith去除serviceNameSet集合

* failoverSwith去除serviceNameSet集合

* failoverSwith去除serviceNameSet集合

* 特殊情况下增补日志

* 格式化checkstyle

* 对UtilAndComs  checkstyle

* 对test类  checkstyle

* 去除无效变量

* 去除无效变量

* 修改serviceInfo对象被重新覆盖的问题

* 优化getServiceInfo方法

* 降级开关初次开启时发送通知

* 降级开关开启时,也发送通知

* 当降级开启时,不再订阅服务信息。去除多余的init方法

* 本地修复CI报错

* 本地修复CI报错

* 本地修复CI报错

* 监控指标优化内部版本同步

* 监控指标优化内部版本同步

* serviceName字段去除""
* [ISSUE #11325]Fix logging for Config pull events.

* Update style.
Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](qos-ch/logback@v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](qos-ch/logback@v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* support metric for grpc server executor

* remove unused field

* add copyright

* add ut
… nacos original security configs (#11470)

* fix issue #10752

* fix issue #10752
…with username. (#11495)

* Fix frequently request login api when using 2.X client with username.

* Fix frequently request login api when using 2.X client with username.
…ontrol pending write queue. (#11514)

* 修复客户端cmsgc导致服务端推送积压直接内存oom问题

* 修复ut及bug

* 修复ut及bug,checkstyle

* 修复ut

* 修复覆盖率

* checkstyle
* Add ut for client module auth package.

* Add ut for client module env package.

* Add ut for client module env package.

* For copyright

* Fix UT might failed problem.
* 优化增量dump,减少开销

* check style fix

* pmd fix

* testcase fix

* testcase fix

* checkstyle fix
* 修复客户端cmsgc导致服务端推送积压直接内存oom问题

* 修复ut及bug

* 修复ut及bug,checkstyle

* 修复ut及bug

* 修复ut

* 修复覆盖率

* 修复测试用例

* 修复测试用例,覆盖率

* 修复测试用例,覆盖率,删除无用代码

* 修复测试用例,覆盖率,pmd&checkstyle

* fix test case
* [ISSUES #11499] fix address server health check error

Close #11499

* [ISSUES #11499] add some unit tests for HealthController
…mp (#11532)

* Add unit test for DumpAllProcessor

* [#11531] Add unit tests for package com.alibaba.nacos.config.server.service.dump ———— Add unit test for DumpAllProcessor
* Add UT for client module logging package.

* Add UT for client module utils package.

* Add UT for client module naming package.

* For checkstyle.

* For PMD.
…s cipher. (#11546)

* [ISSUE #11544] Supplementary single test, when the prefix of dataId is cipher.

* [ISSUE #11544] Supplementary single test, when the prefix of dataId is cipher. Adjusting code format.

* [ISSUE #11544] Supplementary single test, when the prefix of dataId is cipher. Change static code block to @before annotation.

* [ISSUE #11544] Supplementary single test, when the prefix of dataId is cipher. run ci.
* fix test case

* test case coverage

* open config module testcases

* config module testcases coverage

* test case coverage up to 55%

* test case coverage up to 55%

* test case coverage up to 60%

* fix test case

* fix test case

* fix test case

* fix test case

* fix test case

* fix test case

* coverage makeup

* coverage makeup

* coverage makeup

* coverage makeup
* support metric for grpc server request

* change way to judge field

* optimize record
KomachiSion and others added 29 commits March 4, 2024 11:23
…nmodifiable (#11801)

* Update LocalSimpleCountRateCounter.java

fixbug

* Update LocalSimpleCountRateCounter.java

bugfix

* fix:默认的nacos反脆弱插件的问题

* fix:默认的nacos反脆弱插件的问题

* fix:默认的nacos反脆弱插件的问题

* fix:默认的nacos反脆弱插件的问题

* fix:默认的nacos反脆弱插件的问题,调整为tryAdd

* fix:默认的nacos反脆弱插件的问题,调整为tryAdd

* 调整测试方式,保障流水线成功

* 重构PageHandlerAdapterFactory,这里将handlerAdapters,handlerAdapterMap设置为unmodifiable

* 重构PageHandlerAdapterFactory,这里将handlerAdapters,handlerAdapterMap设置为unmodifiable
* Fix failover switch triggered mistakenly and optimise metrics

* format code

* Fix checkstyle

* Fix unit test
* remove unused exception

* Add ReuseHttpServletRequest ut

* fix ut description

* fix code style

* fix code style

* fix code style
* remove unused exception

* Add ReuseHttpServletRequest ut

* fix ut description

* fix code style

* fix code style

* fix code style

* Add ReuseUploadFileHttpServletRequest ut

* fix code style

* fix ut with unapproved license

* fix code style
* remove unused exception

* Add ReuseHttpServletRequest ut

* fix ut description

* fix code style

* fix code style

* fix code style

* Add ReuseUploadFileHttpServletRequest ut

* fix code style

* fix ut with unapproved license

* fix code style

* Add CheckConfiguration ut
* remove unused exception

* Add ReuseHttpServletRequest ut

* fix ut description

* fix code style

* fix code style

* fix code style

* Add ReuseUploadFileHttpServletRequest ut

* fix code style

* fix ut with unapproved license

* fix code style

* Add CheckConfiguration ut

* Add ParamCheckerFilter ut

* fix code style

* fix License

* fix code style
* add client labels collect and attach labels to conn

* remove some constants

* fixup test case
* UT for NamespacePersist

* NamespacePersistTest fix
* remove batch

* simplify label collector ,optimize log

* simplify label collector ,optimize log

* testcase fix
* fix get batch service instances error

* fix checkstyle

* fix get wrong res when batch instance

* add the clientId to return data
add deletion graalvm reflect config
* fix:Response wrong status code for some situation for openAPI

* fix:Response wrong status code for some situation for openAPI for PrometheusApiExceptionHandler

* fix:PrometheusApiExceptionHandler status modify

* fix:add unit test

* fix:modify the unit test description

* fix:the code style modify

* fix:the UT modify
* format check on client labels

* log optimize

* testcase fix
* 修复openApi publishConfigCas失效

* 修复openApi publishConfigCas失效

* fix unit test
…ows (#11883)

* fix:add param for ConfigInfoMapperByMySql#findAllConfigInfoBaseFetchRows

* fix:code style modify

* fix:code style modify

* fix:code style modify

---------

Co-authored-by: zhangyang <[email protected]>
@KomachiSion KomachiSion merged commit 2f49431 into master Apr 3, 2024
71 of 74 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.