[Engine-patches] Change in ovirt-engine[ovirt-engine-3.3]: engine: add response timeout

[gchaplik]

Hello Laszlo Hornyak,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/18559

to review the following change.

Change subject: engine: add response timeout
......................................................................

engine: add response timeout

Make response timeout configurable for the external scheduler

Change-Id: Ia16e36f6a964a406750bff4a738f4c6d9a1655fa
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
M packaging/etc/engine-config/engine-config.properties
4 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/18559/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java
index 0c85b29..2eee70c 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java
@@ -34,6 +34,7 @@
         config = new XmlRpcClientConfigImpl();
         config.setEnabledForExtensions(true);
         config.setConnectionTimeout((Integer) 
Config.GetValue(ConfigValues.ExternalSchedulerConnectionTimeout));
+        config.setReplyTimeout((Integer) 
Config.GetValue(ConfigValues.ExternalSchedulerResponseTimeout));
         try {
             config.setServerURL(new URL(extSchedUrl));
         } catch (MalformedURLException e) {
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
index ab3c123..139fb45 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
@@ -1457,9 +1457,13 @@
     @DefaultValueAttribute("100")
     ExternalSchedulerConnectionTimeout(532),
 
+    @TypeConverterAttribute(Integer.class)
+    @DefaultValueAttribute("120000")
+    ExternalSchedulerResponseTimeout(533),
+
     @TypeConverterAttribute(Boolean.class)
     @DefaultValueAttribute("false")
-    ExternalSchedulerEnabled(533),
+    ExternalSchedulerEnabled(534),
 
     Invalid(65535);
 
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index f68af6a..9590bee 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -591,6 +591,7 @@
 select 
fn_db_add_config_value('ExternalSchedulerServiceURL','http://localhost:18781/','general');
 select 
fn_db_add_config_value('ExternalSchedulerConnectionTimeout','100','general');
 select fn_db_add_config_value('ExternalSchedulerEnabled','false','general');
+select 
fn_db_add_config_value('ExternalSchedulerResponseTimeout','120000','general');
 
 
------------------------------------------------------------------------------------
 --                  Update with override section
diff --git a/packaging/etc/engine-config/engine-config.properties 
b/packaging/etc/engine-config/engine-config.properties
index 421fb2b..6fcfea0 100644
--- a/packaging/etc/engine-config/engine-config.properties
+++ b/packaging/etc/engine-config/engine-config.properties
@@ -303,3 +303,5 @@
 ExternalSchedulerConnectionTimeout.type=Integer
 ExternalSchedulerEnabled.description=External scheduler enabled - if disabled, 
the VM scheduler will not consider the external filters and load balancers.
 ExternalSchedulerEnabled.type=Boolean
+ExternalSchedulerResponseTimeout.description=The response timeout of the 
external scheduler proxy
+ExternalSchedulerResponseTimeout.type=Integer


-- 
To view, visit http://gerrit.ovirt.org/18559
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia16e36f6a964a406750bff4a738f4c6d9a1655fa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
Gerrit-Reviewer: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches