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

CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread

Browse Source 
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
This commit is contained in:
mice xia 2012-08-02 21:48:31 +05:30 committed by Nitin Mehta
parent 9ee803ee02
commit 895b6a3e4b
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/configuration/Config.java
View File

@ -140,6 +140,7 @@ public enum Config {
SwiftEnable(
"Advanced", ManagementServer.class, Boolean.class, "swift.enable", "false", "enable swift ", null),
EventPurgeInterval("Advanced", ManagementServer.class, Integer.class, "event.purge.interval", "86400", "The interval (in seconds) to wait before running the event purge thread", null),
AccountCleanupInterval("Advanced", ManagementServer.class, Integer.class, "account.cleanup.interval", "86400", "The interval (in seconds) between cleanup for removed accounts", null),
AllowPublicUserTemplates("Advanced", ManagementServer.class, Integer.class, "allow.public.user.templates", "true", "If false, users will not be able to create public templates.", null),
InstanceName("Advanced", AgentManager.class, String.class, "instance.name", "VM", "Name of the deployment instance.", "instanceName"),

1
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -254,6 +254,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
private void populateConfigValuesForValidationSet() {
configValuesForValidation = new HashSet<String>();
configValuesForValidation.add("event.purge.interval");
configValuesForValidation.add("account.cleanup.interval");
configValuesForValidation.add("alert.wait");
configValuesForValidation.add("consoleproxy.capacityscan.interval");

2
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -392,7 +392,7 @@ public class ManagementServerImpl implements ManagementServer {
s_logger.error("Unable to find HostAllocators");
}
String value = _configs.get("account.cleanup.interval");
String value = _configs.get("event.purge.interval");
int cleanup = NumbersUtil.parseInt(value, 60 * 60 * 24); // 1 day.
_statsCollector = StatsCollector.getInstance(_configs);

2
server/src/com/cloud/test/DatabaseConfig.java
View File

@ -247,6 +247,7 @@ public class DatabaseConfig {
s_configurationComponents.put("capacity.check.period", "management-server");
s_configurationComponents.put("network.throttling.rate", "management-server");
s_configurationComponents.put("multicast.throttling.rate", "management-server");
s_configurationComponents.put("event.purge.interval", "management-server");
s_configurationComponents.put("account.cleanup.interval", "management-server");
s_configurationComponents.put("expunge.delay", "UserVmManager");
s_configurationComponents.put("expunge.interval", "UserVmManager");
@ -330,6 +331,7 @@ public class DatabaseConfig {
s_defaultConfigurationValues.put("restart.retry.interval", "600");
s_defaultConfigurationValues.put("investigate.retry.interval", "60");
s_defaultConfigurationValues.put("migrate.retry.interval", "120");
s_defaultConfigurationValues.put("event.purge.interval", "86400");
s_defaultConfigurationValues.put("account.cleanup.interval", "86400");
s_defaultConfigurationValues.put("system.vm.use.local.storage", "false");
s_defaultConfigurationValues.put("use.local.storage", "false");

3
setup/db/db/schema-303to40.sql
View File

@ -84,6 +84,5 @@ ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `max_data_volumes_limit
SET SQL_SAFE_UPDATES=0;
UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit`=13 WHERE `hypervisor_type`='XenServer' AND (`hypervisor_version`='6.0' OR `hypervisor_version`='6.0.2');
SET SQL_SAFE_UPDATES=1;
INSERT INTO `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'management-server', 'event.purge.interval', '86400', 'The interval (in seconds) to wait before running the event purge thread');