apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run ResourceCountCheckTask only in the longest running management server (#7977)

Browse Source 
* Run recalculation recurrent task only in the longest running management server

* Address review comments
This commit is contained in:
Nicolas Vazquez 2023-10-12 05:51:39 -03:00 committed by GitHub
parent 8a34afa8ab
commit dccd37af50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDao.java
View File

@ -55,4 +55,6 @@ public interface ManagementServerHostDao extends GenericDao<ManagementServerHost
List<Long> listOrphanMsids();
ManagementServerHostVO findOneInUpState(Filter filter);
ManagementServerHostVO findOneByLongestRuntime();
}

12
framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java
View File

@ -25,6 +25,7 @@ import java.util.List;
import java.util.TimeZone;
import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger;
import com.cloud.cluster.ClusterInvalidSessionException;
@ -204,6 +205,7 @@ public class ManagementServerHostDaoImpl extends GenericDaoBase<ManagementServer
StateSearch = createSearchBuilder();
StateSearch.and("state", StateSearch.entity().getState(), SearchCriteria.Op.IN);
StateSearch.and("runid", StateSearch.entity().getRunid(), SearchCriteria.Op.GT);
StateSearch.done();
}
@ -272,4 +274,14 @@ public class ManagementServerHostDaoImpl extends GenericDaoBase<ManagementServer
return null;
}
@Override
public ManagementServerHostVO findOneByLongestRuntime() {
SearchCriteria<ManagementServerHostVO> sc = StateSearch.create();
sc.setParameters("state", ManagementServerHost.State.Up);
sc.setParameters("runid", 0);
Filter filter = new Filter(ManagementServerHostVO.class, "runid", true, 0L, 1L);
List<ManagementServerHostVO> msHosts = listBy(sc, filter);
return CollectionUtils.isNotEmpty(msHosts) ? msHosts.get(0) : null;
}
}

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

@ -31,6 +31,9 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.cloud.cluster.ManagementServerHostVO;
import com.cloud.cluster.dao.ManagementServerHostDao;
import com.cloud.utils.db.GlobalLock;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
@ -44,6 +47,8 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import org.apache.cloudstack.user.ResourceReservation;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -162,6 +167,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
private VpcDao _vpcDao;
@Inject
private VlanDao _vlanDao;
@Inject
private ManagementServerHostDao managementServerHostDao;
protected GenericSearchBuilder<TemplateDataStoreVO, SumCount> templateSizeSearch;
protected GenericSearchBuilder<SnapshotDataStoreVO, SumCount> snapshotSizeSearch;
@ -1171,6 +1178,26 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
@Override
protected void runInContext() {
GlobalLock lock = GlobalLock.getInternLock("ResourceCheckTask");
try {
if (lock.lock(30)) {
try {
ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime();
if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) {
s_logger.trace("Skipping the resource counters recalculation task on this management server");
return;
}
runResourceCheckTaskInternal();
} finally {
lock.unlock();
}
}
} finally {
lock.releaseRef();
}
}
private void runResourceCheckTaskInternal() {
s_logger.info("Started resource counters recalculation periodic task.");
List<DomainVO> domains;
List<AccountVO> accounts;
@ -1192,9 +1219,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
}
for (ResourceType type : ResourceType.values()) {
recalculateDomainResourceCountInContext(Domain.ROOT_DOMAIN, type);
for (Domain domain : domains) {
recalculateDomainResourceCount(domain.getId(), type);
if (CollectionUtils.isEmpty(domains)) {
recalculateDomainResourceCountInContext(Domain.ROOT_DOMAIN, type);
} else {
for (Domain domain : domains) {
recalculateDomainResourceCount(domain.getId(), type);
}
}
// run through the accounts in the root domain
@ -1202,6 +1232,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
recalculateAccountResourceCountInContext(account.getId(), type);
}
}
s_logger.info("Finished resource counters recalculation periodic task.");
}
private void recalculateDomainResourceCountInContext(long domainId, ResourceType type) {