Skip to content

quota: skip usage records registering the period a volume has been attached #13936

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

Merged
winterhazel merged 1 commit into from
Aug 21, 2026
+68 −0
Merged

quota: skip usage records registering the period a volume has been attached #13936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.apache.cloudstack.quota.vo.QuotaTariffUsageVO;
import org.apache.cloudstack.quota.vo.QuotaTariffVO;
import org.apache.cloudstack.quota.vo.QuotaUsageVO;
import org.apache.cloudstack.usage.UsageTypes;
import org.apache.cloudstack.usage.UsageUnitTypes;
import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
import org.apache.cloudstack.utils.jsinterpreter.JsInterpreter;
Expand Down Expand Up @@ -366,6 +367,11 @@ protected boolean shouldCalculateUsageRecord(AccountVO accountVO, UsageVO usageR
usageRecord.toString(usageAggregationTimeZone), accountVO.reflectionToString());
return false;
}
if (usageRecord.getUsageType() == UsageTypes.VOLUME && usageRecord.getVmInstanceId() != null) {
logger.debug("Considering usage record [{}] as calculated and skipping it because it represents the period " +
"a volume has remained attached to an instance, which Quota does not handle.", usageRecord.toString(usageAggregationTimeZone));
return false;
}
return true;
}

Expand Down
62 changes: 62 additions & 0 deletions framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,29 @@
import java.util.List;
import java.util.Map;

import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.impl.ConfigDepotImpl;
import org.apache.cloudstack.quota.activationrule.presetvariables.Domain;
import org.apache.cloudstack.quota.activationrule.presetvariables.GenericPresetVariable;
import org.apache.cloudstack.quota.activationrule.presetvariables.PresetVariableHelper;
import org.apache.cloudstack.quota.activationrule.presetvariables.PresetVariables;
import org.apache.cloudstack.quota.activationrule.presetvariables.Tariff;
import org.apache.cloudstack.quota.activationrule.presetvariables.Value;
import org.apache.cloudstack.quota.constant.QuotaConfig;
import org.apache.cloudstack.quota.constant.QuotaTypes;
import org.apache.cloudstack.quota.dao.QuotaTariffDao;
import org.apache.cloudstack.quota.dao.QuotaTariffUsageDao;
import org.apache.cloudstack.quota.dao.QuotaUsageDao;
import org.apache.cloudstack.quota.vo.QuotaTariffUsageVO;
import org.apache.cloudstack.quota.vo.QuotaTariffVO;
import org.apache.cloudstack.quota.vo.QuotaUsageVO;
import org.apache.cloudstack.usage.UsageTypes;
import org.apache.cloudstack.usage.UsageUnitTypes;
import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
import org.apache.cloudstack.utils.jsinterpreter.JsInterpreter;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
Expand Down Expand Up @@ -95,8 +101,21 @@ public class QuotaManagerImplTest {
@Mock
QuotaTariffUsageDao quotaTariffUsageDaoMock;

@Mock
ConfigDepotImpl configDepotImplMock;

SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@Before
public void setup() {
ConfigKey.init(configDepotImplMock);
}

@After
public void tearDown() {
ConfigKey.init(null);
}

@Test
public void isLockableTestValidateAccountTypes() {
List<Account.Type> lockablesAccountTypes = Arrays.asList(Account.Type.NORMAL, Account.Type.DOMAIN_ADMIN);
Expand All @@ -113,6 +132,49 @@ public void isLockableTestValidateAccountTypes() {
});
}

@Test
public void shouldCalculateUsageRecordTestQuotaIsDisabledForAccountReturnFalse() {
Mockito.doReturn(1L).when(accountVoMock).getAccountId();
Mockito.doReturn("false").when(configDepotImplMock).getConfigStringValue(Mockito.eq(QuotaConfig.QuotaAccountEnabled.key()), Mockito.eq(ConfigKey.Scope.Account),
Mockito.eq(1L));

boolean result = quotaManagerImplSpy.shouldCalculateUsageRecord(accountVoMock, usageVoMock);

Assert.assertFalse(result);
}

@Test
public void shouldCalculateUsageRecordTestQuotaIsEnabledForAccountAndUsageRecordIsVolumeWithVmInstanceIdReturnFalse() {
Mockito.doReturn(1L).when(accountVoMock).getAccountId();
Mockito.doReturn(UsageTypes.VOLUME).when(usageVoMock).getUsageType();
Mockito.doReturn(1L).when(usageVoMock).getVmInstanceId();

boolean result = quotaManagerImplSpy.shouldCalculateUsageRecord(accountVoMock, usageVoMock);

Assert.assertFalse(result);
}

@Test
public void shouldCalculateUsageRecordTestQuotaIsEnabledForAccountAndUsageRecordIsVolumeWithoutVmInstanceIdReturnTrue() {
Mockito.doReturn(1L).when(accountVoMock).getAccountId();
Mockito.doReturn(UsageTypes.VOLUME).when(usageVoMock).getUsageType();
Mockito.doReturn(null).when(usageVoMock).getVmInstanceId();

boolean result = quotaManagerImplSpy.shouldCalculateUsageRecord(accountVoMock, usageVoMock);

Assert.assertTrue(result);
}

@Test
public void shouldCalculateUsageRecordTestQuotaIsEnabledForAccountAndUsageRecordIsNotVolumeReturnTrue() {
Mockito.doReturn(1L).when(accountVoMock).getAccountId();
Mockito.doReturn(UsageTypes.RUNNING_VM).when(usageVoMock).getUsageType();

boolean result = quotaManagerImplSpy.shouldCalculateUsageRecord(accountVoMock, usageVoMock);

Assert.assertTrue(result);
}

@Test
public void getPendingUsageRecordsForQuotaAggregationTestNullListReturnNull() {
Mockito.doReturn(pairMock).when(usageDaoMock).listUsageRecordsPendingForQuotaAggregation(Mockito.anyLong(), Mockito.anyLong());
Expand Down
Loading