Laszlo Hornyak has uploaded a new change for review. 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 <[email protected]> --- 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 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/17826/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 5551bef..7d03e51 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 @@ -1489,9 +1489,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 f99d802..6573ebe 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -607,6 +607,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 -- To view, visit http://gerrit.ovirt.org/17826 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia16e36f6a964a406750bff4a738f4c6d9a1655fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
