Piotr Kliczewski has uploaded a new change for review.

Change subject: jsonrpc: reset heartbeat during network setup
......................................................................

jsonrpc: reset heartbeat during network setup


Bug-Url: https://bugzilla.redhat.com/1208525
Change-Id: If5e618fdddcafe134639d209897a9fb89d76d551
Signed-off-by: pkliczewski <piotr.kliczew...@gmail.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/39601/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 aef972f..b78151c 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
@@ -443,10 +443,11 @@
                         .withParameter("bondings", bonding)
                         .withParameter("options", options)
                         .build();
+        final RetryPolicy policy = client.getClientRetryPolicy();
         final FutureCallable callable = new FutureCallable(new 
Callable<Map<String, Object>>() {
             @Override
             public Map<String, Object> call() throws Exception {
-                updateHeartbeatPolicy(false);
+                updateHeartbeatPolicy(policy.clone(), false);
                 return new FutureMap(client, 
request).withResponseKey("status");
             }
         });
@@ -455,7 +456,7 @@
                     @Override
                     public boolean isDone() {
                         if (callable.isDone()) {
-                            updateHeartbeatPolicy(true);
+                            updateHeartbeatPolicy(policy, true);
                             return true;
                         }
                         return false;
@@ -465,8 +466,7 @@
         return future;
     }
 
-    private void updateHeartbeatPolicy(boolean isHeartbeat) {
-        RetryPolicy policy = client.getClientRetryPolicy();
+    private void updateHeartbeatPolicy(RetryPolicy policy, boolean 
isHeartbeat) {
         policy.setIncomingHeartbeat(isHeartbeat);
         policy.setOutgoingHeartbeat(isHeartbeat);
         client.setClientRetryPolicy(policy);


-- 
To view, visit https://gerrit.ovirt.org/39601
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5e618fdddcafe134639d209897a9fb89d76d551
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to