Allow counters to be created with same name, provider and source as a deleted one #10223

Pearl1594 · 2025-01-21T02:14:27Z

Description

This PR fixes: #10043

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

…eleted one

codecov · 2025-01-21T02:21:47Z

Codecov Report

Attention: Patch coverage is 8.33333% with 22 lines in your changes missing coverage. Please review.

Project coverage is 15.99%. Comparing base (37c4df9) to head (11f1217).
Report is 72 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
.../java/com/cloud/network/as/dao/CounterDaoImpl.java	0.00%	12 Missing ⚠️
.../api/command/admin/autoscale/CreateCounterCmd.java	0.00%	5 Missing ⚠️
...ava/com/cloud/network/as/AutoScaleManagerImpl.java	28.57%	4 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #10223   +/-   ##
=========================================
  Coverage     15.99%   15.99%           
- Complexity    13086    13088    +2     
=========================================
  Files          5649     5649           
  Lines        495714   495733   +19     
  Branches      60017    60018    +1     
=========================================
+ Hits          79289    79302   +13     
- Misses       407572   407577    +5     
- Partials       8853     8854    +1

Flag	Coverage Δ
uitests	`4.01% <ø> (ø)`
unittests	`16.83% <8.33%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Pearl1594 · 2025-01-21T04:32:08Z

@blueorangutan package

blueorangutan · 2025-01-21T04:34:04Z

@Pearl1594 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-01-21T05:24:39Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12137

rohityadavcloud · 2025-01-21T06:27:46Z

@blueorangutan test

blueorangutan · 2025-01-21T06:30:04Z

@rohityadavcloud a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

DaanHoogland

one comment,

Also the issue reported that deleteCounter doesn't work. Is that genuine?

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql

blueorangutan · 2025-01-21T20:01:04Z

[SF] Trillian test result (tid-12142)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 46204 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10223-t12142-kvm-ol8.zip
Smoke tests completed. 133 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql

github-actions · 2025-01-30T16:22:16Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql

…20.sql

Pearl1594 · 2025-02-25T15:40:48Z

@blueorangutan package

weizhouapache · 2025-02-25T15:49:48Z

@Pearl1594
with this PR, can user create a counter with same name, provider and source as non-deleted one ?
(I think it should fail)

Pearl1594 · 2025-02-25T17:04:27Z

@Pearl1594 with this PR, can user create a counter with same name, provider and source as non-deleted one ? (I think it should fail)

@weizhouapache It allows to create a counter with same name provider and source - as long as the value is different. Is that not expected?

…create-counters-dup

github-actions · 2025-02-25T18:09:09Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

weizhouapache · 2025-02-25T18:15:04Z

@Pearl1594 with this PR, can user create a counter with same name, provider and source as non-deleted one ? (I think it should fail)

@weizhouapache It allows to create a counter with same name provider and source - as long as the value is different. Is that not expected?

Thanks for testing @Pearl1594
I think the name should be unique for each provider and source. The second command should fail as well. Just my thoughts, no need to address it.

Can you test with same provider/source/value but different name ? It is the original issue.

Pearl1594 · 2025-02-25T19:48:54Z

It seems to allow that:

I think the original issue was not being able to create counter with same name, provider and source as a deleted counter

However, now that you asked to test it @weizhouapache - I am not sure if this is correct in the first place.

… non-deleted counter

Pearl1594 · 2025-02-25T21:00:44Z

@weizhouapache I added a fix - could you please verify if the below behaviour is what's expected:

Thanks.

sonarqubecloud · 2025-02-25T21:56:02Z

Quality Gate failed

Failed conditions
15.2% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube Cloud

weizhouapache · 2025-02-26T07:23:46Z

@Pearl1594
thanks for the update.

I checked the counter table in my database, it has unique key

UNIQUE KEY `uc_counter__provider__source__value` (`provider`,`source`,`value`),

the reporter also mentioned

deleteCounter function removes counter and allow us to create a counter with the same value

so it looks like the counter name can be same as other counters, sorry my bad.

currently if create a counter with same provider/source/value, it throws exception entity exists due to the new unique key, which is not very clear to users.
It would be good to replace the check on name with value in your PR, for example

- findByNameProviderSource(String name, String source, String provider)
+ findByNameProviderValue(String name, String value, String provider)

DaanHoogland

clgtm

DaanHoogland · 2025-03-06T14:52:59Z

@Pearl1594 what is the status of this? Ar you going to work to apply @weizhouapache 's sugection in #10223 (comment) ?

Pearl1594 · 2025-03-06T15:16:28Z

I need to revert a change because from an earlier discussion I had made changes to prevent counters from having the same name. But that seems like it should be allowed. So I need to work on this.

github-actions · 2025-04-16T10:23:52Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

DaanHoogland · 2025-04-18T12:56:14Z

@Pearl1594 can you address the comments and conflict?

Allow counters to be created with same name, provider and source as d…

294696d

…eleted one

Pearl1594 requested review from DaanHoogland and weizhouapache January 21, 2025 02:14

fix api response

fdb9a71

boring-cyborg bot added component:api component:networking labels Jan 21, 2025

DaanHoogland reviewed Jan 21, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql Outdated Show resolved Hide resolved

drop unique key only if it exists

7a1e54d

Pearl1594 requested a review from DaanHoogland January 22, 2025 14:34

weizhouapache reviewed Jan 22, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql Outdated Show resolved Hide resolved

create a procedure

2ace4dd

github-actions bot added the status:has-conflicts label Jan 30, 2025

Merge branch '4.19' into fix-create-counters-dup

96691f6

github-actions bot removed the status:has-conflicts label Jan 30, 2025

DaanHoogland reviewed Jan 30, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-41910to41920.sql Outdated Show resolved Hide resolved

Update engine/schema/src/main/resources/META-INF/db/schema-41910to419…

6b5ece3

…20.sql

DaanHoogland added this to the 4.19.3 milestone Feb 13, 2025

Pearl1594 requested review from DaanHoogland and weizhouapache February 25, 2025 15:40

Pearl1594 added 2 commits February 25, 2025 13:06

Merge branch '4.20' of https://github.com/apache/cloudstack into fix-…

e80c713

…create-counters-dup

move query to 4.20.1 schema file

1ee387d

boring-cyborg bot added component:agent component:build component:integration labels Feb 25, 2025

github-actions bot added the status:has-conflicts label Feb 25, 2025

Pearl1594 changed the base branch from 4.19 to 4.20 February 25, 2025 18:09

Pearl1594 modified the milestones: 4.19.3, 4.20.1 Feb 25, 2025

prevent addition of counters with same name, provider and source as a…

11f1217

… non-deleted counter

github-actions bot removed the status:has-conflicts label Feb 25, 2025

Pearl1594 linked an issue Feb 26, 2025 that may be closed by this pull request

bug(api): createCounter/deleteCounter functions not working properly #10043

Open

DaanHoogland approved these changes Mar 6, 2025

View reviewed changes

Pearl1594 added this to ACS 4.20.1 Mar 17, 2025

Pearl1594 moved this to In Progress in ACS 4.20.1 Mar 17, 2025

rohityadavcloud mentioned this pull request Apr 15, 2025

bug(api): createCounter/deleteCounter functions not working properly #10043

Open

rohityadavcloud approved these changes Apr 15, 2025

View reviewed changes

github-actions bot added the status:has-conflicts label Apr 16, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow counters to be created with same name, provider and source as a deleted one #10223

Allow counters to be created with same name, provider and source as a deleted one #10223

Pearl1594 commented Jan 21, 2025

codecov bot commented Jan 21, 2025 •

edited

Loading

Pearl1594 commented Jan 21, 2025

blueorangutan commented Jan 21, 2025

blueorangutan commented Jan 21, 2025

rohityadavcloud commented Jan 21, 2025

blueorangutan commented Jan 21, 2025

DaanHoogland left a comment

blueorangutan commented Jan 21, 2025

github-actions bot commented Jan 30, 2025

Pearl1594 commented Feb 25, 2025

weizhouapache commented Feb 25, 2025

Pearl1594 commented Feb 25, 2025 •

edited

Loading

github-actions bot commented Feb 25, 2025

weizhouapache commented Feb 25, 2025 •

edited

Loading

Pearl1594 commented Feb 25, 2025 •

edited

Loading

Pearl1594 commented Feb 25, 2025

sonarqubecloud bot commented Feb 25, 2025

weizhouapache commented Feb 26, 2025

DaanHoogland left a comment

DaanHoogland commented Mar 6, 2025

Pearl1594 commented Mar 6, 2025

github-actions bot commented Apr 16, 2025

DaanHoogland commented Apr 18, 2025

Allow counters to be created with same name, provider and source as a deleted one #10223

Are you sure you want to change the base?

Allow counters to be created with same name, provider and source as a deleted one #10223

Conversation

Pearl1594 commented Jan 21, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov bot commented Jan 21, 2025 • edited Loading

Codecov Report

Pearl1594 commented Jan 21, 2025

blueorangutan commented Jan 21, 2025

blueorangutan commented Jan 21, 2025

rohityadavcloud commented Jan 21, 2025

blueorangutan commented Jan 21, 2025

DaanHoogland left a comment

Choose a reason for hiding this comment

blueorangutan commented Jan 21, 2025

github-actions bot commented Jan 30, 2025

Pearl1594 commented Feb 25, 2025

weizhouapache commented Feb 25, 2025

Pearl1594 commented Feb 25, 2025 • edited Loading

github-actions bot commented Feb 25, 2025

weizhouapache commented Feb 25, 2025 • edited Loading

Pearl1594 commented Feb 25, 2025 • edited Loading

Pearl1594 commented Feb 25, 2025

sonarqubecloud bot commented Feb 25, 2025

Quality Gate failed

weizhouapache commented Feb 26, 2025

DaanHoogland left a comment

Choose a reason for hiding this comment

DaanHoogland commented Mar 6, 2025

Pearl1594 commented Mar 6, 2025

github-actions bot commented Apr 16, 2025

DaanHoogland commented Apr 18, 2025

codecov bot commented Jan 21, 2025 •

edited

Loading

Pearl1594 commented Feb 25, 2025 •

edited

Loading

weizhouapache commented Feb 25, 2025 •

edited

Loading

Pearl1594 commented Feb 25, 2025 •

edited

Loading