Usage: Heartbeat should not schedule usage job when a job is already running

[abh1sar]

Description

This PR fixes #12424

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

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

1. Stop Usage server
2. Set usage.stats.job.aggregation.range to 5
3. Start Usage server - wait for a usage job to finish
4. Stop Usage server
5. Execute VM, vol, network creates, Acquire IP addresses etc in a loop using cmk so that lots of events are generated.
6. Start Usage server after 2 hours.
7. Observe that no failed usage job are present in the database and usage logs.

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

[codecov]

Codecov Report

❌ Patch coverage is 9.09091% with 10 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.25%. Comparing base (3d7d412) to head (df5d18d).
⚠️ Report is 5 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...rc/main/java/com/cloud/usage/UsageManagerImpl.java	9.09%	10 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #12616      +/-   ##
============================================
- Coverage     16.26%   16.25%   -0.01%     
+ Complexity    13429    13423       -6     
============================================
  Files          5661     5662       +1     
  Lines        500010   500148     +138     
  Branches      60715    60729      +14     
============================================
- Hits          81331    81310      -21     
- Misses       409606   409753     +147     
- Partials       9073     9085      +12     

Flag	Coverage Δ
uitests	4.15% <ø> (ø)
unittests	17.11% <9.09%> (-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.

[abh1sar]

@blueorangutan package

[blueorangutan]

@abh1sar 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]

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

[abh1sar]

@blueorangutan package

[blueorangutan]

@abh1sar 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]

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

[DaanHoogland]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

[SF] Trillian test result (tid-15433)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51584 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12616-t15433-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_08_arping_in_ssvm	Failure	5.22	test_diagnostics.py
test_09_arping_in_cpvm	Failure	5.21	test_diagnostics.py

[DaanHoogland]

clgtm

[DaanHoogland]

@blueorangutan package

[blueorangutan]

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

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

[abh1sar]

@blueorangutan test

[blueorangutan]

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

[shwstppr]

Code lgtm

[blueorangutan]

[SF] Trillian Build Failed (tid-15444)