Feat/calculate ip count when use batchregister #8858

chenhao26-nineteen · 2022-08-02T14:12:07Z

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

What is the purpose of the change

fix calculate ip count when use batchregister

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.

codecov-commenter · 2022-08-02T14:26:25Z

Codecov Report

Merging #8858 (6668a55) into develop (de5ec35) will increase coverage by 0.06%.
The diff coverage is 33.33%.

@@              Coverage Diff              @@
##             develop    #8858      +/-   ##
=============================================
+ Coverage      43.24%   43.30%   +0.06%     
- Complexity      4711     4718       +7     
=============================================
  Files            912      912              
  Lines          32567    32584      +17     
  Branches        3757     3761       +4     
=============================================
+ Hits           14082    14110      +28     
+ Misses         17130    17117      -13     
- Partials        1355     1357       +2

Impacted Files	Coverage Δ
...m/alibaba/nacos/naming/monitor/MetricsMonitor.java	`83.75% <0.00%> (-9.31%)`	⬇️
...ba/nacos/naming/core/v2/client/AbstractClient.java	`67.60% <53.84%> (+24.05%)`	⬆️
...m/alibaba/nacos/naming/misc/HttpClientManager.java	`69.04% <0.00%> (-14.29%)`	⬇️
...baba/nacos/naming/healthcheck/HealthCheckTask.java	`48.52% <0.00%> (ø)`
...os/client/auth/ram/identify/CredentialService.java	`82.69% <0.00%> (+3.84%)`	⬆️
...a/nacos/naming/core/v2/pojo/BatchInstanceData.java	`10.00% <0.00%> (+10.00%)`	⬆️
...ba/nacos/naming/core/v2/client/ClientSyncData.java	`28.12% <0.00%> (+28.12%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update de5ec35...6668a55. Read the comment docs.

hujun-w-2 · 2022-08-03T08:05:54Z

coverage

chenhao26-nineteen · 2022-08-03T08:47:46Z

coverage

i will fix it

hujun-w-2 · 2022-08-03T09:35:34Z

naming/src/main/java/com/alibaba/nacos/naming/core/v2/client/AbstractClient.java

+    public static void incrementIpCountWithBatchRegister(InstancePublishInfo instancePublishInfo) {
+        BatchInstancePublishInfo batchInstancePublishInfo = (BatchInstancePublishInfo) instancePublishInfo;
+        List<InstancePublishInfo> instancePublishInfos = batchInstancePublishInfo.getInstancePublishInfos();
+        for (int i = 0; i < instancePublishInfos.size(); i++) {


能否直接set数据，不用for循环

hujun-w-2 · 2022-08-03T09:37:40Z

naming/src/main/java/com/alibaba/nacos/naming/core/v2/client/AbstractClient.java

+            }
+        }
+        for (int i = 0; i < subscriberCollection.size(); i++) {
+            MetricsMonitor.decrementSubscribeCount();


尝试不用for

hujun-w-2 · 2022-08-03T10:40:16Z

naming/src/main/java/com/alibaba/nacos/naming/core/v2/client/AbstractClient.java

+     * increment IpCount when use batchRegister.
+     * @param instancePublishInfo must be BatchInstancePublishInfo
+     */
+    public static void incrementIpCountWithBatchRegister(InstancePublishInfo instancePublishInfo) {


该方法可以移到metrix相关类中，abstractClient里面只是调用就好

i will fix it

@xiaochangbai

* Add exception detail stacks when connect to server failed. * [ISSUE#8653]Fix health check bug (#8639) * fix health bug. * fix health bug. * fix health bug. * test update * format code * 注释 * check service exist * check service exist * test fail * user group() * add unit test. * add unit test. * add unit test. * add unit test. * add unit test. * add unit test. * Add comment for config aspect. * [ISSUE#8481]Unified TRACE capacity building (#8805) * [ISSUE#8481]Unified TRACE capacity building * [ISSUE#8481]Unified TRACE capacity building 1. Event type add to traceEvent. 2. The event about instance add instancePort. 3. Add health check type to healthChangeEvent. 4. Other fixup. * Add Generic Type for Simple Cache Map (#8812) * import config file auth fail (#8844) * import config file auth fail * run ci * run ci2 * Feat/calculate ip count when use batchregister (#8858) Feat/calculate ip count when use batchregister * [ISSUE #8880] add a request exception handler (#8881) * [ISSUE #8880] add a request exception handler Close #8880 * [ISSUE #8880] retry ci * Upgrade to 2.1.1 (#8899) * [ISSUE#8910] bug fix calcu ipCount (#8911) * bug fix calcu ipCount * update logic * judge endpoint (#8933) * [ISSUE #8925] fix that the value of hasQueryString is always false (#8927) Close #8925 * [ISSUES#8905]simplify some code (#8908) * refactor: 💡 update console-ui theme (#8951) ✅ Closes: #8950 * Update IoUtils.java (#8948) An IOException has been catch，so throws IOException Is invalid * [ISSUE #8931] Fix bug :BatchInstanceData cannot Serializable question (#8940) * [fix] fix BatchInstanceData cannot Serializable question * fix update serialVersionUID auto generate * [ISSUE #8925] fix that the replaceAll operation is invalid (#8929) Close #8925 * fix #8947. (#8959) * judge endpoint * add some junit test (#8966) * add some junit test * fix some junit * add license * optimize: internationalization of product description content on landing pages (#8956) * Improve code specifications. (#8965) Flip the call to equals method to avoid null pointer exception. * fix LookupFactoryTest ut / ci (#8985) * fix ci * run ci * check cla report * check style * add some auth plugin test (#8988) * add some auth plugin test * ru ci * remove namespaceShowName uniqueness check (#8989) * add unit test for ReflectUtils (#8999) * add unit test for ReflectUtils * reformat code * [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common] (#8997) * [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common] * [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common] * [ISSUE #8993]Close input stream and output stream by try with resource[nacos-common] * add some utils UT (#9006) add some utils UT * Fix grpc push data not filter by cluster. (#9019) * [#344] rename initialization sql files (#8969) * [ISSUE #9014] performance optimization--refacte TpsMonitorPoint (#9021) * performance optimization * fix check style * fix test unit * fix test unit for `getTimeFormatOfSecond` method. * fix unit test for LimiterTest. * fix error usage case for asserEquals method；eliminate interactions between test methods * Fix spelling mistakes. (#9026) * [ISSUE #9013] enhance grpc client (#9017) * fix issue #9013 * reformat code style * reformat code style * reformat code style * reformat code style * reformat code style * reformat code style * reformat code style * change config name * do some enhance * add queue size to configProperties * reformat code style * Change configuration load order * Fix ServerListMgr is not shutdown. (#9048) * set server.error.include-message to ALWAYS (#9045) * [ISSUE #8934] add header back after convert request to jsonBytes (#8935) * [ISSUE #9023] fix corner case config dataId 'cipher-' that cannot create (#9024) * [ISSUE #9023] fix corner case config dataId 'cipher-' that cannot create * [ISSUE #9023] remove unused import * [ISSUE #9023] PMD fix * [ISSUE #9023] add comments * [ISSUE #9023] should return first token instead of any * [ISSUE #9023] add more EncryptionHandler ut * [ISSUE #9023] fix style * [ISSUE #9023] fix style, keep indentation in blank line Co-authored-by: KomachiSion <xiweng.yy@alibaba-inc.com> Co-authored-by: 胡俊 <510830970@qq.com> Co-authored-by: MajorHe1 <53824889+MajorHe1@users.noreply.github.com> Co-authored-by: GuiShao <zhupeng.zhu@alibaba-inc.com> Co-authored-by: ZhangShenao <15201440436@163.com> Co-authored-by: chenhao26 <35129699+chenhao26-nineteen@users.noreply.github.com> Co-authored-by: onewe <admin@onew.me> Co-authored-by: 胡俊 <hujun3@xiaomi.com> Co-authored-by: liushaoyu-soft <455028117@qq.com> Co-authored-by: heimanba <371510756@qq.com> Co-authored-by: 无处不在 <42382506+wuchubuzai2018@users.noreply.github.com> Co-authored-by: Weizhan Yun <yunweizhan@gmail.com> Co-authored-by: liaochuntao <liaochuntao@live.com> Co-authored-by: @xiaochangbai <704566072@qq.com> Co-authored-by: shiherua <56618514+shiherua@users.noreply.github.com> Co-authored-by: Karson <karsontao@hotmail.com> Co-authored-by: yjqg6666 <jinking.this@gmail.com> Co-authored-by: 阿魁 <670569467@qq.com> Co-authored-by: wuwen <wuwen.55@aliyun.com> Co-authored-by: hutt <200714916@qq.com>

chenhao26-nineteen added 2 commits August 2, 2022 21:57

fix metrics of ipCount when use BatchRegister

20913b7

delete method

5c3b8ed

add some test in AbstractClient class to improve unit test coverage

020c710

hujun-w-2 reviewed Aug 3, 2022

View reviewed changes

fix for code

f3f5cf0

hujun-w-2 requested changes Aug 3, 2022

View reviewed changes

chenhao26-nineteen added 2 commits August 3, 2022 18:55

extract method to metrics

00c01cf

run it

6668a55

hujun-w-2 approved these changes Aug 3, 2022

View reviewed changes

hujun-w-2 merged commit 0b428e0 into alibaba:develop Aug 3, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/calculate ip count when use batchregister #8858

Feat/calculate ip count when use batchregister #8858

chenhao26-nineteen commented Aug 2, 2022

codecov-commenter commented Aug 2, 2022 •

edited

hujun-w-2 commented Aug 3, 2022

chenhao26-nineteen commented Aug 3, 2022

hujun-w-2 Aug 3, 2022

chenhao26-nineteen Aug 3, 2022

hujun-w-2 Aug 3, 2022

hujun-w-2 Aug 3, 2022

chenhao26-nineteen Aug 3, 2022

Feat/calculate ip count when use batchregister #8858

Feat/calculate ip count when use batchregister #8858

Conversation

chenhao26-nineteen commented Aug 2, 2022

What is the purpose of the change

Brief changelog

Verifying this change

codecov-commenter commented Aug 2, 2022 • edited

Codecov Report

hujun-w-2 commented Aug 3, 2022

chenhao26-nineteen commented Aug 3, 2022

hujun-w-2 Aug 3, 2022

Choose a reason for hiding this comment

chenhao26-nineteen Aug 3, 2022

Choose a reason for hiding this comment

hujun-w-2 Aug 3, 2022

Choose a reason for hiding this comment

hujun-w-2 Aug 3, 2022

Choose a reason for hiding this comment

chenhao26-nineteen Aug 3, 2022

Choose a reason for hiding this comment

codecov-commenter commented Aug 2, 2022 •

edited