Skip to content

server: charge snapshot copy primary storage to the snapshot owner ac… #14036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rootnomad wants to merge 4 commits into
base: main
Choose a base branch
from
Open

server: charge snapshot copy primary storage to the snapshot owner ac… #14036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
076a259
server: charge snapshot copy primary storage to the snapshot owner ac…
rootnomad Sep 1, 2026
5a5e884
snapshot: make copySnapshotOnPool package-private
rootnomad Oct 2, 2026
f2dfb46
snapshot: attribute the copy usage record to the snapshot owner
rootnomad Oct 2, 2026
9268030
test: fold the snapshot-copy resource-count test into SnapshotManager…
rootnomad Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@ private void copyNewSnapshotToZonesOnPrimary(CreateSnapshotPayload payload, Snap
}
}

private boolean copySnapshotOnPool(SnapshotInfo snapshot, SnapshotStrategy snapshotStrategy, Long storagePoolId) {
boolean copySnapshotOnPool(SnapshotInfo snapshot, SnapshotStrategy snapshotStrategy, Long storagePoolId) {
DataStore store = dataStoreMgr.getDataStore(storagePoolId, DataStoreRole.Primary);
SnapshotInfo snapshotOnStore = (SnapshotInfo) store.create(snapshot);

Expand All @@ -1780,10 +1780,10 @@ private boolean copySnapshotOnPool(SnapshotInfo snapshot, SnapshotStrategy snaps
return false;
}
snapshotZoneDao.addSnapshotToZone(snapshot.getId(), snapshotOnStore.getDataCenterId());
_resourceLimitMgr.incrementResourceCount(CallContext.current().getCallingUserId(), ResourceType.primary_storage, snapshot.getSize());
if (CallContext.current().getCallingUserId() != Account.ACCOUNT_ID_SYSTEM) {
_resourceLimitMgr.incrementResourceCount(snapshot.getAccountId(), ResourceType.primary_storage, snapshot.getSize());
if (CallContext.current().getCallingAccountId() != Account.ACCOUNT_ID_SYSTEM) {
SnapshotVO snapshotVO = _snapshotDao.findByIdIncludingRemoved(snapshot.getSnapshotId());
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_COPY, CallContext.current().getCallingAccountId(), snapshotOnStore.getDataCenterId(), snapshotVO.getId(), null, null, null, snapshotVO.getSize(),
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_COPY, snapshot.getAccountId(), snapshotOnStore.getDataCenterId(), snapshotVO.getId(), null, null, null, snapshotVO.getSize(),
snapshotVO.getSize(), snapshotVO.getClass().getName(), snapshotVO.getUuid());
}
} catch (InterruptedException | ExecutionException e) {
Expand Down
39 changes: 39 additions & 0 deletions server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.org.Grouping;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Storage.StoragePoolType;
Expand Down Expand Up @@ -55,6 +56,7 @@
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotResult;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotService;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy;
import org.apache.cloudstack.framework.async.AsyncCallFuture;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
Expand Down Expand Up @@ -669,4 +671,41 @@ public void testRemoveClvmPrimarySnapshotStoreRefIfNeeded_NonClvmPool() {
Mockito.verify(snapshotStoreDao, Mockito.never()).removeBySnapshotStore(
Mockito.anyLong(), Mockito.anyLong(), Mockito.any());
}

@Test
@SuppressWarnings("unchecked")
public void copySnapshotOnPoolChargesPrimaryStorageToTheSnapshotOwnerAccount() throws Exception {
long ownerAccountId = 42L;
long snapshotSize = 1024L;
Long poolId = 5L;

SnapshotInfo snapshot = Mockito.mock(SnapshotInfo.class);
SnapshotInfo snapshotOnStore = Mockito.mock(SnapshotInfo.class);
SnapshotStrategy strategy = Mockito.mock(SnapshotStrategy.class);
DataStore store = Mockito.mock(DataStore.class);
AsyncCallFuture<SnapshotResult> future = Mockito.mock(AsyncCallFuture.class);
SnapshotResult result = Mockito.mock(SnapshotResult.class);

Mockito.when(snapshot.getId()).thenReturn(100L);
Mockito.when(snapshot.getSize()).thenReturn(snapshotSize);
Mockito.when(snapshot.getAccountId()).thenReturn(ownerAccountId);
Mockito.when(dataStoreManager.getDataStore(poolId, DataStoreRole.Primary)).thenReturn(store);
Mockito.when(store.create(snapshot)).thenReturn(snapshotOnStore);
Mockito.when(snapshotOnStore.getDataCenterId()).thenReturn(2L);
Mockito.when(snapshotService.copySnapshot(snapshot, snapshotOnStore, strategy)).thenReturn(future);
Mockito.when(future.get()).thenReturn(result);
Mockito.when(result.isFailed()).thenReturn(false);

try (MockedStatic<CallContext> ctxMock = Mockito.mockStatic(CallContext.class)) {
CallContext ctx = Mockito.mock(CallContext.class);
ctxMock.when(CallContext::current).thenReturn(ctx);
// A SYSTEM calling account skips the usage-event branch; this test only covers which account is charged.
Mockito.when(ctx.getCallingAccountId()).thenReturn(Account.ACCOUNT_ID_SYSTEM);

snapshotManager.copySnapshotOnPool(snapshot, strategy, poolId);
}

Mockito.verify(resourceLimitService).incrementResourceCount(
Mockito.eq(ownerAccountId), Mockito.eq(ResourceType.primary_storage), Mockito.eq(snapshotSize));
}
}