Piotr Kliczewski has uploaded a new change for review. Change subject: core: connection timeout overriden by client timeout ......................................................................
core: connection timeout overriden by client timeout Connection timeout setting was overriden by client timeout. Bug-Url: https://bugzilla.redhat.com/1147487 Change-Id: I6b8b3154071b98f802f001481abf80be5865fe74 Signed-off-by: pkliczewski <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M ovirt-engine.spec.in M pom.xml 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/33668/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java index 2e7392c..7d4bb19 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java @@ -445,9 +445,9 @@ } private void updateHeartbeatPolicy(boolean isheartbeat) { - RetryPolicy policy = client.getRetryPolicy(); + RetryPolicy policy = client.getClientRetryPolicy(); policy.setHeartbeat(isheartbeat); - client.setRetryPolicy(policy); + client.setClientRetryPolicy(policy); } @Override diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index bfab301..2cb5d93 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -298,7 +298,7 @@ Requires: ovirt-host-deploy-java >= 1.3.0 Requires: python-cheetah Requires: spice-html5 -Requires: vdsm-jsonrpc-java >= 1.0.7 +Requires: vdsm-jsonrpc-java >= 1.0.8 %if %{ovirt_install_systemd} Requires(post): systemd @@ -549,7 +549,7 @@ Requires: openssh-server Requires: ovirt-host-deploy >= 1.3.0 Requires: ovirt-host-deploy-offline >= 1.3.0 -Requires: vdsm-jsonrpc-java >= 1.0.7 +Requires: vdsm-jsonrpc-java >= 1.0.8 %description setup-plugin-allinone All-in-one plugin for %{ovirt_product_name_short}'s setup diff --git a/pom.xml b/pom.xml index b26912c..9694883 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <otopi.version>1.2.0</otopi.version> <ovirt-host-deploy.version>1.3.0</ovirt-host-deploy.version> <org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version> - <vdsm-jsonrpc-java.version>1.0.7</vdsm-jsonrpc-java.version> + <vdsm-jsonrpc-java.version>1.0.8</vdsm-jsonrpc-java.version> <slf4j.version>1.7.5</slf4j.version> <slf4j-jdk14.version>1.5.6</slf4j-jdk14.version> <gwt.version>2.5.1</gwt.version> -- To view, visit http://gerrit.ovirt.org/33668 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b8b3154071b98f802f001481abf80be5865fe74 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5.0 Gerrit-Owner: Piotr Kliczewski <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
