Repository: cloudstack
Updated Branches:
refs/heads/4.5 7afd12341 -> e12478144
CLOUDSTACK-7903: Decreased minimal usage aggregation range value
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit 9b907902d2d424bc8b3136d97196457f42738fff)
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1247814
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1247814
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1247814
Branch: refs/heads/4.5
Commit: e1247814454551313db2a25ab59f1ff0ead30149
Parents: 7afd123
Author: Ilia Shakitko <i.shaki...@tech.leaseweb.com>
Authored: Tue Nov 18 14:31:51 2014 +0100
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Mon Dec 1 15:55:30 2014 +0530
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 10 +++++-----
server/src/com/cloud/server/StatsCollector.java | 2 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1247814/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index cc9ced4..22cabb3 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -178,6 +178,7 @@ import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.resource.ResourceManager;
import com.cloud.server.ConfigurationServer;
+import com.cloud.server.StatsCollector;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.GuestOSVO;
@@ -425,8 +426,7 @@ VirtualMachineGuru, Listener, Configurable,
StateListener<State, VirtualMachine.
private int _usageAggregationRange = 1440;
private String _usageTimeZone = "GMT";
private final long mgmtSrvrId = MacAddress.getMacAddress().toLong();
- private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;
// 5 seconds
- private static final int USAGE_AGGREGATION_RANGE_MIN = 10; // 10 minutes,
same as com.cloud.usage.UsageManagerImpl.USAGE_AGGREGATION_RANGE_MIN
+ private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;
// 5 seconds
private boolean _dailyOrHourly = false;
ScheduledExecutorService _executor;
@@ -808,9 +808,9 @@ VirtualMachineGuru, Listener, Configurable,
StateListener<State, VirtualMachine.
_dailyOrHourly = false;
}
- if (_usageAggregationRange < USAGE_AGGREGATION_RANGE_MIN) {
- s_logger.warn("Usage stats job aggregation range is to small,
using the minimum value of " + USAGE_AGGREGATION_RANGE_MIN);
- _usageAggregationRange = USAGE_AGGREGATION_RANGE_MIN;
+ if (_usageAggregationRange <
StatsCollector.USAGE_AGGREGATION_RANGE_MIN) {
+ s_logger.warn("Usage stats job aggregation range is to small,
using the minimum value of " + StatsCollector.USAGE_AGGREGATION_RANGE_MIN);
+ _usageAggregationRange =
StatsCollector.USAGE_AGGREGATION_RANGE_MIN;
}
_networkStatsUpdateExecutor.scheduleAtFixedRate(new
NetworkStatsUpdateTask(), (endDate - System.currentTimeMillis()),
(_usageAggregationRange * 60 * 1000),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1247814/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java
b/server/src/com/cloud/server/StatsCollector.java
index 9f4c14e..f4b8e8c 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -199,7 +199,7 @@ public class StatsCollector extends ManagerBase implements
ComponentMethodInterc
private String _usageTimeZone = "GMT";
private final long mgmtSrvrId = MacAddress.getMacAddress().toLong();
private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5;
// 5 seconds
- private static final int USAGE_AGGREGATION_RANGE_MIN = 10; // 10 minutes,
same to com.cloud.usage.UsageManagerImpl.USAGE_AGGREGATION_RANGE_MIN
+ public static final int USAGE_AGGREGATION_RANGE_MIN = 1;
private boolean _dailyOrHourly = false;
//private final GlobalLock m_capacityCheckLock =
GlobalLock.getInternLock("capacity.check");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1247814/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java
b/usage/src/com/cloud/usage/UsageManagerImpl.java
index fe7ee1e..5a3e854 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -42,6 +42,7 @@ import
org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.usage.UsageTypes;
import com.cloud.alert.AlertManager;
+import com.cloud.server.StatsCollector;
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventDetailsVO;
import com.cloud.event.UsageEventVO;
@@ -100,7 +101,6 @@ public class UsageManagerImpl extends ManagerBase
implements UsageManager, Runna
private static final int HOURLY_TIME = 60;
private static final int DAILY_TIME = 60 * 24;
private static final int THREE_DAYS_IN_MINUTES = 60 * 24 * 3;
- private static final int USAGE_AGGREGATION_RANGE_MIN = 10;
@Inject
private AccountDao _accountDao;
@@ -246,9 +246,9 @@ public class UsageManagerImpl extends ManagerBase
implements UsageManager, Runna
s_logger.debug("Current Time: " + currentDate.toString());
_aggregationDuration = Integer.parseInt(aggregationRange);
- if (_aggregationDuration < USAGE_AGGREGATION_RANGE_MIN) {
- s_logger.warn("Usage stats job aggregation range is to small,
using the minimum value of " + USAGE_AGGREGATION_RANGE_MIN);
- _aggregationDuration = USAGE_AGGREGATION_RANGE_MIN;
+ if (_aggregationDuration <
StatsCollector.USAGE_AGGREGATION_RANGE_MIN) {
+ s_logger.warn("Usage stats job aggregation range is to small,
using the minimum value of " + StatsCollector.USAGE_AGGREGATION_RANGE_MIN);
+ _aggregationDuration =
StatsCollector.USAGE_AGGREGATION_RANGE_MIN;
}
_hostname = InetAddress.getLocalHost().getHostName() + "/" +
InetAddress.getLocalHost().getHostAddress();
} catch (NumberFormatException ex) {
