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 15.38462% with 44 lines in your changes missing coverage. Please review.

Project coverage is 16.15%. Comparing base (61e74e0) to head (2521172).
Report is 1 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...ava/com/cloud/upgrade/dao/Upgrade42010to42020.java	15.38%	22 Missing ⚠️
.../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	37.50%	4 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #10223      +/-   ##
============================================
- Coverage     16.15%   16.15%   -0.01%     
- Complexity    13273    13275       +2     
============================================
  Files          5656     5657       +1     
  Lines        497728   497775      +47     
  Branches      60360    60363       +3     
============================================
+ Hits          80420    80427       +7     
- Misses       408357   408396      +39     
- Partials       8951     8952       +1

Flag	Coverage Δ
uitests	`4.00% <ø> (ø)`
unittests	`17.00% <15.38%> (-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?

weizhouapache

code lgtm

Just a question, what is the best target branch ?

api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java

DaanHoogland · 2025-07-14T14:57:43Z

@blueorangutan package

blueorangutan · 2025-07-14T15:00:03Z

@DaanHoogland 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.

Pearl1594 · 2025-07-14T15:00:31Z

code lgtm

Just a question, what is the best target branch ?

We could do it for 4.19.4.0 - but since there was no upgrade path from 4.19.2 to 4.19.3 and the impact of this bug seemed minimal, I didn’t consider it worthwhile to introduce an upgrade path from 4.19.3 to 4.19.4. So, raised the fix against 4.20.2.

Pearl1594 · 2025-07-14T15:02:49Z

@blueorangutan package

blueorangutan · 2025-07-14T15:04: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-07-14T17:59:24Z

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

blueorangutan · 2025-07-14T17:59:24Z

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

Pearl1594 · 2025-07-14T18:14:23Z

@blueorangutan test

blueorangutan · 2025-07-14T18:16:04Z

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

DaanHoogland · 2025-07-15T06:50:56Z

code lgtm
Just a question, what is the best target branch ?

We could do it for 4.19.4.0 - but since there was no upgrade path from 4.19.2 to 4.19.3 and the impact of this bug seemed minimal, I didn’t consider it worthwhile to introduce an upgrade path from 4.19.3 to 4.19.4. So, raised the fix against 4.20.2.

ok, when tested we can merge, but than we need to test this particular functionality again after merge forward.

blueorangutan · 2025-07-15T10:01:45Z

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

Test	Result	Time (s)	Test File

Pearl1594 · 2025-07-15T15:53:28Z

@blueorangutan package

blueorangutan · 2025-07-15T15:54:03Z

@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-07-15T17:06:49Z

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

Pearl1594 · 2025-07-15T17:08:00Z

@blueorangutan package

blueorangutan · 2025-07-15T17:10:03Z

@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.

sonarqubecloud · 2025-07-15T17:48:49Z

Quality Gate failed

Failed conditions
3 Security Hotspots
15.1% Coverage on New Code (required ≥ 40%)
37.1% Duplication on New Code (required ≤ 10%)

See analysis details on SonarQube Cloud

blueorangutan · 2025-07-15T18:21:28Z

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

Pearl1594 · 2025-07-15T18:35:28Z

@blueorangutan test

blueorangutan · 2025-07-15T18:36:04Z

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

blueorangutan · 2025-07-16T11:22:26Z

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

Test	Result	Time (s)	Test File
test_01_isolate_network_FW_PF_default_routes_egress_true	`Failure`	117.31	test_routers_network_ops.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true	`Failure`	199.31	test_routers_network_ops.py

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

github-actions bot removed the status:has-conflicts label Jul 14, 2025

weizhouapache approved these changes Jul 14, 2025

View reviewed changes

api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java Outdated Show resolved Hide resolved

Pearl1594 removed this from ACS 4.20.1 Jul 14, 2025

Pearl1594 added 2 commits July 14, 2025 10:55

lint and license check failure addressed

ea739eb

address comment

a92a2ae

fix upgrade path

1efc0a5

Pearl1594 marked this pull request as draft July 15, 2025 15:51

fix check to allow counters with same name but different values

2521172

Pearl1594 marked this pull request as ready for review July 15, 2025 16:51

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

Uh oh!

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?

Uh oh!

codecov bot commented Jan 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Pearl1594 commented Jan 21, 2025

Uh oh!

blueorangutan commented Jan 21, 2025

Uh oh!

blueorangutan commented Jan 21, 2025

Uh oh!

rohityadavcloud commented Jan 21, 2025

Uh oh!

blueorangutan commented Jan 21, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

blueorangutan commented Jan 21, 2025

Uh oh!

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

Uh oh!

Pearl1594 commented Feb 25, 2025

Uh oh!

weizhouapache commented Feb 25, 2025

Uh oh!

Pearl1594 commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DaanHoogland commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

Pearl1594 commented Jul 14, 2025

Uh oh!

Pearl1594 commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

Pearl1594 commented Jul 14, 2025

Uh oh!

blueorangutan commented Jul 14, 2025

Uh oh!

DaanHoogland commented Jul 15, 2025

Uh oh!

blueorangutan commented Jul 15, 2025

Uh oh!

Pearl1594 commented Jul 15, 2025

Uh oh!

blueorangutan commented Jul 15, 2025

Uh oh!

blueorangutan commented Jul 15, 2025

Uh oh!

Pearl1594 commented Jul 15, 2025

Uh oh!

blueorangutan commented Jul 15, 2025

codecov bot commented Jan 21, 2025 •

edited

Loading

Pearl1594 commented Feb 25, 2025 •

edited

Loading