etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.18'

This commit is contained in:
Rohit Yadav 2023-05-12 12:58:49 +05:30
parent 62fa45aa81 44024a8a8b
commit 2f309b573b
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ui.yml vendored
View File

@ -47,7 +47,6 @@ jobs:
run: |
cd ui
sudo npm install -g @vue/cli npm-check-updates
rm -f package-lock.json
npm install
npm run build
npm run lint

2
engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
View File

@ -63,7 +63,7 @@ public class ReservationDaoImpl extends GenericDaoBase<ReservationVO, Long> impl
@Override
public long getDomainReservation(Long domainId, Resource.ResourceType resourceType) {
long total = 0;
SearchCriteria<ReservationVO> sc = listAccountAndTypeSearch.create();
SearchCriteria<ReservationVO> sc = listDomainAndTypeSearch.create();
sc.setParameters(DOMAIN_ID, domainId);
sc.setParameters(RESOURCE_TYPE, resourceType);
List<ReservationVO> reservations = listBy(sc);

32
server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
View File

@ -433,8 +433,25 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
long currentDomainResourceCount = _resourceCountDao.getResourceCount(domainId, ResourceOwnerType.Domain, type);
long currentResourceReservation = reservationDao.getDomainReservation(domainId, type);
long requestedDomainResourceCount = currentDomainResourceCount + currentResourceReservation + numResources;
String messageSuffix = " domain resource limits of Type '" + type + "'" + " for Domain Id = " + domainId + " is exceeded: Domain Resource Limit = " + toHumanReadableSize(domainResourceLimit)
+ ", Current Domain Resource Amount = " + toHumanReadableSize(currentDomainResourceCount) + ", Requested Resource Amount = " + toHumanReadableSize(numResources) + ".";
String convDomainResourceLimit = String.valueOf(domainResourceLimit);
String convCurrentDomainResourceCount = String.valueOf(currentDomainResourceCount);
String convCurrentResourceReservation = String.valueOf(currentResourceReservation);
String convNumResources = String.valueOf(numResources);
if (type == ResourceType.secondary_storage || type == ResourceType.primary_storage){
convDomainResourceLimit = toHumanReadableSize(domainResourceLimit);
convCurrentDomainResourceCount = toHumanReadableSize(currentDomainResourceCount);
convCurrentResourceReservation = toHumanReadableSize(currentResourceReservation);
convNumResources = toHumanReadableSize(numResources);
}
String messageSuffix = String.format(
" domain resource limits of Type '%s' for Domain Id = %s is exceeded: Domain Resource Limit = %s, " +
"Current Domain Resource Amount = %s, Current Resource Reservation = %s, Requested Resource Amount = %s.",
type, domainId, convDomainResourceLimit,
convCurrentDomainResourceCount, convCurrentResourceReservation, convNumResources
);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Checking if" + messageSuffix);
@ -460,17 +477,22 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
String convertedAccountResourceLimit = String.valueOf(accountResourceLimit);
String convertedCurrentResourceCount = String.valueOf(currentResourceCount);
String convertedCurrentResourceReservation = String.valueOf(currentResourceReservation);
String convertedNumResources = String.valueOf(numResources);
if (type == ResourceType.secondary_storage || type == ResourceType.primary_storage){
convertedAccountResourceLimit = toHumanReadableSize(accountResourceLimit);
convertedCurrentResourceCount = toHumanReadableSize(currentResourceCount);
convertedCurrentResourceReservation = toHumanReadableSize(currentResourceReservation);
convertedNumResources = toHumanReadableSize(numResources);
}
String messageSuffix = " amount of resources of Type = '" + type + "' for " + (project == null ? "Account Name = " + account.getAccountName() : "Project Name = " + project.getName())
+ " in Domain Id = " + account.getDomainId() + " is exceeded: Account Resource Limit = " + convertedAccountResourceLimit + ", Current Account Resource Amount = " + convertedCurrentResourceCount
+ ", Requested Resource Amount = " + convertedNumResources + ".";
String messageSuffix = String.format(
" amount of resources of Type = '%s' for %s in Domain Id = %s is exceeded: " +
"Account Resource Limit = %s, Current Account Resource Amount = %s, Current Account Resource Reservation = %s, Requested Resource Amount = %s.",
type, (project == null ? "Account Name = " + account.getAccountName() : "Project Name = " + project.getName()), account.getDomainId(),
convertedAccountResourceLimit, convertedCurrentResourceCount, convertedCurrentResourceReservation, convertedNumResources
);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Checking if" + messageSuffix);