Repository: cloudstack Updated Branches: refs/heads/4.4 ba5500213 -> 32b8c071b
change xapitimeout to 600 second, looks like we need to change some XAPI calls to Async before shorten the timeout Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32b8c071 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32b8c071 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32b8c071 Branch: refs/heads/4.4 Commit: 32b8c071b6e7eb70b43b5a54bc18fb6d9eb14148 Parents: ba55002 Author: Anthony Xu <[email protected]> Authored: Wed Apr 16 11:04:03 2014 -0700 Committer: Anthony Xu <[email protected]> Committed: Wed Apr 16 11:04:49 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/configuration/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32b8c071/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 52efd73..1e42ca5 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -683,7 +683,7 @@ public enum Config { null), StorageCleanupEnabled("Advanced", StorageManager.class, Boolean.class, "storage.cleanup.enabled", "true", "Enables/disables the storage cleanup thread.", null), UpdateWait("Advanced", AgentManager.class, Integer.class, "update.wait", "600", "Time to wait (in seconds) before alerting on a updating agent", null), - XapiWait("Advanced", AgentManager.class, Integer.class, "xapiwait", "60", "Time (in seconds) to wait for XAPI to return", null), + XapiWait("Advanced", AgentManager.class, Integer.class, "xapiwait", "600", "Time (in seconds) to wait for XAPI to return", null), MigrateWait("Advanced", AgentManager.class, Integer.class, "migratewait", "3600", "Time (in seconds) to wait for VM migrate finish", null), HAWorkers("Advanced", AgentManager.class, Integer.class, "ha.workers", "5", "Number of ha worker threads.", null), MountParent(
