mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'origin/4.18'
This commit is contained in:
commit
6d916cad34
@ -647,13 +647,12 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
|
|||||||
@Override
|
@Override
|
||||||
protected void runInContext() {
|
protected void runInContext() {
|
||||||
try {
|
try {
|
||||||
LOGGER.debug("HostStatsCollector is running...");
|
|
||||||
|
|
||||||
SearchCriteria<HostVO> sc = createSearchCriteriaForHostTypeRoutingStateUpAndNotInMaintenance();
|
SearchCriteria<HostVO> sc = createSearchCriteriaForHostTypeRoutingStateUpAndNotInMaintenance();
|
||||||
|
|
||||||
Map<Object, Object> metrics = new HashMap<>();
|
|
||||||
List<HostVO> hosts = _hostDao.search(sc, null);
|
List<HostVO> hosts = _hostDao.search(sc, null);
|
||||||
|
|
||||||
|
LOGGER.debug(String.format("HostStatsCollector is running to process %d UP hosts", hosts.size()));
|
||||||
|
|
||||||
|
Map<Object, Object> metrics = new HashMap<>();
|
||||||
for (HostVO host : hosts) {
|
for (HostVO host : hosts) {
|
||||||
HostStatsEntry hostStatsEntry = (HostStatsEntry) _resourceMgr.getHostStatistics(host.getId());
|
HostStatsEntry hostStatsEntry = (HostStatsEntry) _resourceMgr.getHostStatistics(host.getId());
|
||||||
if (hostStatsEntry != null) {
|
if (hostStatsEntry != null) {
|
||||||
@ -1195,13 +1194,12 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
|
|||||||
@Override
|
@Override
|
||||||
protected void runInContext() {
|
protected void runInContext() {
|
||||||
try {
|
try {
|
||||||
LOGGER.trace("VmStatsCollector is running...");
|
|
||||||
|
|
||||||
SearchCriteria<HostVO> sc = createSearchCriteriaForHostTypeRoutingStateUpAndNotInMaintenance();
|
SearchCriteria<HostVO> sc = createSearchCriteriaForHostTypeRoutingStateUpAndNotInMaintenance();
|
||||||
List<HostVO> hosts = _hostDao.search(sc, null);
|
List<HostVO> hosts = _hostDao.search(sc, null);
|
||||||
|
|
||||||
Map<Object, Object> metrics = new HashMap<>();
|
LOGGER.debug(String.format("VmStatsCollector is running to process VMs across %d UP hosts", hosts.size()));
|
||||||
|
|
||||||
|
Map<Object, Object> metrics = new HashMap<>();
|
||||||
for (HostVO host : hosts) {
|
for (HostVO host : hosts) {
|
||||||
Date timestamp = new Date();
|
Date timestamp = new Date();
|
||||||
Map<Long, VMInstanceVO> vmMap = getVmMapForStatsForHost(host);
|
Map<Long, VMInstanceVO> vmMap = getVmMapForStatsForHost(host);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user