refactor create duplicate alert check by DaanHoogland · Pull Request #10544 · apache/cloudstack

DaanHoogland · 2025-03-11T15:12:02Z

Description

This PR extracts a method for deciding which alert are allowed to be double.

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

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

see #10367

codecov · 2025-03-11T15:29:55Z

Codecov Report

Attention: Patch coverage is 87.50000% with 1 line in your changes missing coverage. Please review.

Project coverage is 15.17%. Comparing base (919c979) to head (8a2a46c).
Report is 8 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
...rc/main/java/com/cloud/alert/AlertManagerImpl.java	87.50%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.19   #10544   +/-   ##
=========================================
  Coverage     15.16%   15.17%           
- Complexity    11336    11337    +1     
=========================================
  Files          5414     5414           
  Lines        475126   475130    +4     
  Branches      57976    57975    -1     
=========================================
+ Hits          72069    72087   +18     
+ Misses       394996   394981   -15     
- Partials       8061     8062    +1

Flag	Coverage Δ
uitests	`4.28% <ø> (ø)`
unittests	`15.89% <87.50%> (+<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.

DaanHoogland · 2025-03-11T15:45:38Z

@blueorangutan package

blueorangutan · 2025-03-11T15:46: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.

blueorangutan · 2025-03-11T16:37:19Z

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

DaanHoogland · 2025-03-12T10:26:45Z

@blueorangutan package

blueorangutan · 2025-03-12T10:28: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.

blueorangutan · 2025-03-12T11:44:41Z

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

DaanHoogland · 2025-03-13T08:22:37Z

@blueorangutan test

blueorangutan · 2025-03-13T08:24:04Z

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

blueorangutan · 2025-03-13T23:09:58Z

[SF] Trillian test result (tid-12679)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 50458 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10544-t12679-kvm-ol8.zip
Smoke tests completed. 132 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_redundant_vpc_site2site_vpn	`Failure`	448.78	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	309.22	test_vpc_vpn.py

shwstppr

Cleanup looks good. Some comments added

server/src/main/java/com/cloud/alert/AlertManagerImpl.java

DaanHoogland · 2025-05-06T09:00:47Z

@blueorangutan package

blueorangutan · 2025-05-06T09:02: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.

shwstppr

code lgtm

blueorangutan · 2025-05-06T10:01:54Z

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

DaanHoogland · 2025-05-06T10:05:11Z

@blueorangutan test

blueorangutan · 2025-05-06T10:06:04Z

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

Pearl1594

code lgtm

blueorangutan · 2025-05-07T02:07:08Z

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

Test	Result	Time (s)	Test File
test_02_list_cpvm_vm	`Failure`	0.08	test_ssvm.py
test_04_cpvm_internals	`Failure`	0.07	test_ssvm.py

Copilot

Pull Request Overview

This PR refactors the duplicate alert check logic in AlertManagerImpl by extracting the conditional alert retrieval into a helper method.

Introduces a new static list of alert types designated as trivial.
Extracts duplicate alert check logic into the getAlertForTrivialAlertType helper method.

Comments suppressed due to low confidence (2)

server/src/main/java/com/cloud/alert/AlertManagerImpl.java:89

[nitpick] Consider renaming the ALERTS constant to TRIVIAL_ALERT_TYPES to more clearly indicate that these alert types bypass duplicate alert checks.

public static final List<AlertType> ALERTS = Arrays.asList(AlertType.ALERT_TYPE_HOST, ...

server/src/main/java/com/cloud/alert/AlertManagerImpl.java:782

[nitpick] The method name getAlertForTrivialAlertType can be misleading since it returns a non-null alert only for non-trivial alert types; consider renaming it to better reflect its behavior, such as getExistingAlertForNonTrivialType.

@Nullable private AlertVO getAlertForTrivialAlertType(AlertType alertType, long dataCenterId, Long podId, Long clusterId) {

DaanHoogland · 2025-05-07T06:41:46Z

don’t think they are related but still investigating those two failures:

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

Test Result Time (s) Test File
test_02_list_cpvm_vm Failure 0.08 test_ssvm.py
test_04_cpvm_internals Failure 0.07 test_ssvm.py

blueorangutan · 2025-05-07T21:23:59Z

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

Test	Result	Time (s)	Test File
test_03_secured_to_nonsecured_vm_migration	`Error`	379.25	test_vm_life_cycle.py
test_04_nonsecured_to_secured_vm_migration	`Error`	405.05	test_vm_life_cycle.py

DaanHoogland · 2025-05-08T07:15:41Z

different set of errors :/ I think we can merge this , @Pearl1594 .

DaanHoogland marked this pull request as ready for review March 11, 2025 15:12

DaanHoogland added this to the 4.19.3 milestone Mar 11, 2025

DaanHoogland force-pushed the ghi10367-doubleAlerts branch from d303c45 to 0d92d30 Compare March 12, 2025 10:26

DaanHoogland requested review from Pearl1594, shwstppr and weizhouapache March 14, 2025 12:38

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

JoaoJandre approved these changes Mar 24, 2025

View reviewed changes

DaanHoogland linked an issue Apr 8, 2025 that may be closed by this pull request

Multiple alerts for HA on VM and host #10367

Closed

DaanHoogland removed a link to an issue Apr 8, 2025

Multiple alerts for HA on VM and host #10367

Closed

refactor create duplicate alert check

4a1fbe6

DaanHoogland force-pushed the ghi10367-doubleAlerts branch from 0d92d30 to 4a1fbe6 Compare May 6, 2025 08:46

shwstppr reviewed May 6, 2025

View reviewed changes

server/src/main/java/com/cloud/alert/AlertManagerImpl.java Outdated Show resolved Hide resolved

server/src/main/java/com/cloud/alert/AlertManagerImpl.java Outdated Show resolved Hide resolved

DaanHoogland commented May 6, 2025

View reviewed changes

server/src/main/java/com/cloud/alert/AlertManagerImpl.java Outdated Show resolved Hide resolved

review addressed

8a2a46c

shwstppr approved these changes May 6, 2025

View reviewed changes

Pearl1594 approved these changes May 6, 2025

View reviewed changes

DaanHoogland requested a review from Copilot May 7, 2025 06:40

Copilot AI reviewed May 7, 2025

View reviewed changes

DaanHoogland merged commit 3959dbd into apache:4.19 May 12, 2025
26 checks passed

github-project-automation bot moved this from In Progress to Done in ACS 4.20.1 May 12, 2025

DaanHoogland deleted the ghi10367-doubleAlerts branch May 12, 2025 11:08

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 19, 2025

refactor create duplicate alert check (apache#10544)

f81102b

Conversation

DaanHoogland commented Mar 11, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

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 Mar 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland commented Mar 11, 2025

Uh oh!

blueorangutan commented Mar 11, 2025

Uh oh!

blueorangutan commented Mar 11, 2025

Uh oh!

DaanHoogland commented Mar 12, 2025

Uh oh!

blueorangutan commented Mar 12, 2025

Uh oh!

blueorangutan commented Mar 12, 2025

Uh oh!

DaanHoogland commented Mar 13, 2025

Uh oh!

blueorangutan commented Mar 13, 2025

Uh oh!

blueorangutan commented Mar 13, 2025

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaanHoogland commented May 6, 2025

Uh oh!

blueorangutan commented May 6, 2025

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 6, 2025

Uh oh!

DaanHoogland commented May 6, 2025

Uh oh!

blueorangutan commented May 6, 2025

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 7, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

DaanHoogland commented May 7, 2025

Uh oh!

blueorangutan commented May 7, 2025

Uh oh!

DaanHoogland commented May 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov bot commented Mar 11, 2025 •

edited

Loading