apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent overflow on StatsCollector + add a few enhancements on code (#3932)

Browse Source
This commit is contained in:
Gabriel Beims Bräscher 2020-03-13 15:51:12 -03:00 committed by GitHub
parent 19fb23781b
commit cd6f0cb1e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/src/main/java/com/cloud/server/StatsCollector.java
View File

@ -192,6 +192,10 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
private static final String DISK_WRITE_IOPS_FIELD = "disk_write_iops"; private static final String DISK_WRITE_IOPS_FIELD = "disk_write_iops";
private static final String DISK_WRITE_KBS_FIELD = "disk_write_kbs"; private static final String DISK_WRITE_KBS_FIELD = "disk_write_kbs";
private static final int HOURLY_TIME = 60;
private static final int DAILY_TIME = HOURLY_TIME * 24;
private static final Long ONE_MINUTE_IN_MILLISCONDS = 60000L;
private static final String DEFAULT_DATABASE_NAME = "cloudstack"; private static final String DEFAULT_DATABASE_NAME = "cloudstack";
private static final String INFLUXDB_HOST_MEASUREMENT = "host_stats"; private static final String INFLUXDB_HOST_MEASUREMENT = "host_stats";
private static final String INFLUXDB_VM_MEASUREMENT = "vm_stats"; private static final String INFLUXDB_VM_MEASUREMENT = "vm_stats";
@ -328,11 +332,11 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
protected void init(Map<String, String> configs) { protected void init(Map<String, String> configs) {
_executor = Executors.newScheduledThreadPool(6, new NamedThreadFactory("StatsCollector")); _executor = Executors.newScheduledThreadPool(6, new NamedThreadFactory("StatsCollector"));
hostStatsInterval = NumbersUtil.parseLong(configs.get("host.stats.interval"), 60000L); hostStatsInterval = NumbersUtil.parseLong(configs.get("host.stats.interval"), ONE_MINUTE_IN_MILLISCONDS);
hostAndVmStatsInterval = NumbersUtil.parseLong(configs.get("vm.stats.interval"), 60000L); hostAndVmStatsInterval = NumbersUtil.parseLong(configs.get("vm.stats.interval"), ONE_MINUTE_IN_MILLISCONDS);
storageStatsInterval = NumbersUtil.parseLong(configs.get("storage.stats.interval"), 60000L); storageStatsInterval = NumbersUtil.parseLong(configs.get("storage.stats.interval"), ONE_MINUTE_IN_MILLISCONDS);
volumeStatsInterval = NumbersUtil.parseLong(configs.get("volume.stats.interval"), 600000L); volumeStatsInterval = NumbersUtil.parseLong(configs.get("volume.stats.interval"), ONE_MINUTE_IN_MILLISCONDS);
autoScaleStatsInterval = NumbersUtil.parseLong(configs.get("autoscale.stats.interval"), 60000L); autoScaleStatsInterval = NumbersUtil.parseLong(configs.get("autoscale.stats.interval"), ONE_MINUTE_IN_MILLISCONDS);
String statsUri = statsOutputUri.value(); String statsUri = statsOutputUri.value();
if (StringUtils.isNotBlank(statsUri)) { if (StringUtils.isNotBlank(statsUri)) {
@ -427,8 +431,6 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
Calendar cal = Calendar.getInstance(usageTimezone); Calendar cal = Calendar.getInstance(usageTimezone);
cal.setTime(new Date()); cal.setTime(new Date());
long endDate = 0; long endDate = 0;
int HOURLY_TIME = 60;
final int DAILY_TIME = 60 * 24;
if (_usageAggregationRange == DAILY_TIME) { if (_usageAggregationRange == DAILY_TIME) {
cal.set(Calendar.HOUR_OF_DAY, 0); cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0); cal.set(Calendar.MINUTE, 0);
@ -454,9 +456,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
s_logger.warn("Usage stats job aggregation range is to small, using the minimum value of " + UsageUtils.USAGE_AGGREGATION_RANGE_MIN); s_logger.warn("Usage stats job aggregation range is to small, using the minimum value of " + UsageUtils.USAGE_AGGREGATION_RANGE_MIN);
_usageAggregationRange = UsageUtils.USAGE_AGGREGATION_RANGE_MIN; _usageAggregationRange = UsageUtils.USAGE_AGGREGATION_RANGE_MIN;
} }
_diskStatsUpdateExecutor.scheduleAtFixedRate(new VmDiskStatsUpdaterTask(), (endDate - System.currentTimeMillis()), (_usageAggregationRange * 60 * 1000),
TimeUnit.MILLISECONDS);
long period = _usageAggregationRange * ONE_MINUTE_IN_MILLISCONDS;
_diskStatsUpdateExecutor.scheduleAtFixedRate(new VmDiskStatsUpdaterTask(), (endDate - System.currentTimeMillis()), period, TimeUnit.MILLISECONDS);
} }
/** /**
@ -1209,7 +1211,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
for (AutoScaleVmGroupPolicyMapVO asVmgPmap : listMap) { for (AutoScaleVmGroupPolicyMapVO asVmgPmap : listMap) {
AutoScalePolicyVO policyVO = _asPolicyDao.findById(asVmgPmap.getPolicyId()); AutoScalePolicyVO policyVO = _asPolicyDao.findById(asVmgPmap.getPolicyId());
if (policyVO != null) { if (policyVO != null) {
Integer quitetime = policyVO.getQuietTime(); int quitetime = policyVO.getQuietTime();
Date quitetimeDate = policyVO.getLastQuiteTime(); Date quitetimeDate = policyVO.getLastQuiteTime();
long last_quitetime = 0L; long last_quitetime = 0L;
if (quitetimeDate != null) { if (quitetimeDate != null) {
@ -1236,7 +1238,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
if (counter_param.equals(counter_source.toString())) if (counter_param.equals(counter_source.toString()))
break; break;
counter_count++; counter_count++;
} while (1 == 1); } while (true);
Double sum = avgCounter.get(counter_count); Double sum = avgCounter.get(counter_count);
Double avg = sum / currentVM; Double avg = sum / currentVM;
@ -1526,9 +1528,6 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
boolean ioWriteDifferentFromPrevious = previousVmDiskStats.getCurrentIOWrite() != currentVmDiskStats.getCurrentIOWrite(); boolean ioWriteDifferentFromPrevious = previousVmDiskStats.getCurrentIOWrite() != currentVmDiskStats.getCurrentIOWrite();
return bytesReadDifferentFromPrevious || bytesWriteDifferentFromPrevious || ioReadDifferentFromPrevious || ioWriteDifferentFromPrevious; return bytesReadDifferentFromPrevious || bytesWriteDifferentFromPrevious || ioReadDifferentFromPrevious || ioWriteDifferentFromPrevious;
} }
if (currentVmDiskStats == null) {
return false;
}
return true; return true;
} }

6
server/src/test/java/com/cloud/server/StatsCollectorTest.java
View File

@ -159,12 +159,6 @@ public class StatsCollectorTest {
Assert.assertTrue(result); Assert.assertTrue(result);
} }
@Test
public void isCurrentVmDiskStatsDifferentFromPreviousTestBothNull() {
boolean result = statsCollector.isCurrentVmDiskStatsDifferentFromPrevious(null, null);
Assert.assertFalse(result);
}
@Test @Test
public void isCurrentVmDiskStatsDifferentFromPreviousTestDifferentIoWrite() { public void isCurrentVmDiskStatsDifferentFromPreviousTestDifferentIoWrite() {
configureAndTestisCurrentVmDiskStatsDifferentFromPrevious(123l, 123l, 123l, 12l, true); configureAndTestisCurrentVmDiskStatsDifferentFromPrevious(123l, 123l, 123l, 12l, true);