cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to 5b41be3
Date Tue, 13 Aug 2013 06:46:46 GMT
Updated Branches:
  refs/heads/master aea98d224 -> 5b41be356


CLOUDSTACK-4270
ASF 4.1 to 4.2 Upgrade: Missing Global Configuration parameters on the Upgraded Setup related
to "storage.cache". Adding them
Signed off by : nitin mehta<nitin.mehta@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b41be35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b41be35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b41be35

Branch: refs/heads/master
Commit: 5b41be3567b97fb9f23ec10d4bb9717682663178
Parents: aea98d2
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Tue Aug 13 12:14:27 2013 +0530
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Tue Aug 13 12:16:31 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 2 +-
 setup/db/db/schema-410to420.sql                | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b41be35/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 0329ffd..d2f470c 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -71,7 +71,7 @@ public enum Config {
 	StorageOverprovisioningFactor("Storage", StoragePoolAllocator.class, String.class, "storage.overprovisioning.factor",
"2", "Used for storage overprovisioning calculation; available storage will be (actualStorageSize
* storage.overprovisioning.factor)", null, ConfigurationParameterScope.zone.toString()),
 	StorageStatsInterval("Storage", ManagementServer.class, String.class, "storage.stats.interval",
"60000", "The interval (in milliseconds) when storage stats (per host) are retrieved from
agents.", null),
 	MaxVolumeSize("Storage", ManagementServer.class, Integer.class, "storage.max.volume.size",
"2000", "The maximum size for a volume (in GB).", null),
-    StorageCacheReplacementLRUTimeInterval("Storage", ManagementServer.class, Integer.class,
"storage.cache.replacement.lru.interval", "30", "time interval for unsed data on cache storage
(in days).", null),
+    StorageCacheReplacementLRUTimeInterval("Storage", ManagementServer.class, Integer.class,
"storage.cache.replacement.lru.interval", "30", "time interval for unused data on cache storage
(in days).", null),
     StorageCacheReplacementEnabled("Storage", ManagementServer.class, Boolean.class, "storage.cache.replacement.enabled",
"true", "enable or disable cache storage replacement algorithm.", null),
     StorageCacheReplacementInterval("Storage", ManagementServer.class, Integer.class, "storage.cache.replacement.interval",
"86400", "time interval between cache replacement threads (in seconds).", null),
     MaxUploadVolumeSize("Storage",  ManagementServer.class, Integer.class, "storage.max.volume.upload.size",
"500", "The maximum size for a uploaded volume(in GB).", null),

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b41be35/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index e3b2d01..a0327c6 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2298,3 +2298,8 @@ UPDATE `cloud`.`autoscale_policies` set uuid=id WHERE uuid is NULL;
 UPDATE `cloud`.`counter` set uuid=id WHERE uuid is NULL;
 UPDATE `cloud`.`conditions` set uuid=id WHERE uuid is NULL;
 update `cloud`.`configuration` set component = 'SnapshotManager' where category = 'Snapshots'
and component = 'none';
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'management-server',
'storage.cache.replacement.lru.interval', '30', 'time interval for unused data on cache storage
(in days).');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'management-server',
'storage.cache.replacement.enabled', 'true', 'enable or disable cache storage replacement
algorithm.');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'management-server',
'storage.cache.replacement.interval', '86400', 'time interval between cache replacement threads
(in seconds).');
+


Mime
View raw message