From cd2176f9a618a293a05f4174b21b51fa83ddce3c Mon Sep 17 00:00:00 2001 From: Sigert Goeminne Date: Fri, 11 Aug 2017 12:26:24 +0200 Subject: [PATCH] CLOUDSTACK-10031: change default configuration for router.aggregation.command.each.timeout from 3 to 600 seconds (#2223) Change default configuration for router.aggregation.command.each.timeout from 3 to 600 seconds (#2223) (cherry picked from commit 17bc6afc8228ed2da6e0b09f330e18217483577c) This fixes some test_nic failures caused due to short aggregation command timeout Signed-off-by: Rohit Yadav --- server/src/com/cloud/configuration/Config.java | 2 +- setup/db/db/schema-4920to4930.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index d502536b47b..a5253607748 100644 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -1968,7 +1968,7 @@ public enum Config { NetworkOrchestrationService.class, Integer.class, "router.aggregation.command.each.timeout", - "3", + "600", "timeout in seconds for each Virtual Router command being aggregated. The final aggregation command timeout would be determined by this timeout * commands counts ", null), diff --git a/setup/db/db/schema-4920to4930.sql b/setup/db/db/schema-4920to4930.sql index fa716281fec..ff848591a80 100644 --- a/setup/db/db/schema-4920to4930.sql +++ b/setup/db/db/schema-4920to4930.sql @@ -121,3 +121,5 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid, hypervisor_type, hypervi INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid, hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'KVM', 'default', 'Other PV Virtio-SCSI (64-bit)', 275, utc_timestamp(), 0); INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '6.5', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='6.0' AND (guest_os_id NOT IN (1,2,3,4,62,63,64,65,156,157,221,222) AND guest_os_id NOT BETWEEN 121 AND 130); + +UPDATE `cloud`.`configuration` SET value = '600', default_value = '600' WHERE category = 'Advanced' AND name = 'router.aggregation.command.each.timeout';