server: check limit on correct store during snapshot allocation

[shwstppr]

Description

Fixes #11551

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?

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

[weizhouapache]

code lgtm

@shwstppr
the issue number seems incorrect

[codecov]

Codecov Report

❌ Patch coverage is 66.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.17%. Comparing base (253ac03) to head (a103b76).
⚠️ Report is 2 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...om/cloud/storage/snapshot/SnapshotManagerImpl.java	66.66%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #11558   +/-   ##
=========================================
  Coverage     16.17%   16.17%           
  Complexity    13297    13297           
=========================================
  Files          5656     5656           
  Lines        498136   498140    +4     
  Branches      60432    60434    +2     
=========================================
+ Hits          80584    80588    +4     
  Misses       408584   408584           
  Partials       8968     8968           

Flag	Coverage Δ
uitests	4.00% <ø> (ø)
unittests	17.03% <66.66%> (+<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.

[shwstppr]

@blueorangutan package

[blueorangutan]

@shwstppr 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 ✖️ debian ✖️ suse15. SL-JID 14869

[vishesh92]

clgtm

[vishesh92]

@blueorangutan package

[blueorangutan]

@vishesh92 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 14899

[weizhouapache]

there is another issue: we may need to fix the process of resouce count calculation

cloudstack/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java

Lines 1497 to 1504 in 70a4503

	SearchCriteria<SumCount> sc2 = snapshotSizeSearch.create();
	sc2.setParameters("state", ObjectInDataStoreStateMachine.State.Ready);
	sc2.setParameters("storeRole", DataStoreRole.Image);
	sc2.setJoinParameters("snapshots", "accountId", accountId);
	List<SumCount> snapshots = _snapshotDataStoreDao.customSearch(sc2, null);
	if (snapshots != null) {
	totalSnapshotsSize = snapshots.get(0).sum;
	}

similar change is needed when calculate the primary storage usage

[weizhouapache]

@blueorangutan package

[blueorangutan]

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

[weizhouapache]

verified ok

• snapshot.backup.to.secondary = false
• take volume snapshot
• without this PR, the resource count of secondary_storage is updated
• with this PR, the resource count of primary_storage is updated

[blueorangutan]

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

[weizhouapache]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

[SF] Trillian test result (tid-14313)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 53172 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11558-t14313-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

[weizhouapache]

Merging based on approvals and tests