You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2015/08/24 15:17:34 UTC

svn commit: r1697383 - /jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java

Author: alexparvulescu
Date: Mon Aug 24 13:17:33 2015
New Revision: 1697383

URL: http://svn.apache.org/r1697383
Log:
OAK-3273 ColdStandby make sync start and end timestamp updates atomic
 - patch provided by Valentin Olteanu

Modified:
    jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java

Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java?rev=1697383&r1=1697382&r2=1697383&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java Mon Aug 24 13:17:33 2015
@@ -186,13 +186,15 @@ public final class StandbyClient impleme
         }
 
         try {
-            syncStartTimestamp = System.currentTimeMillis();
+            long startTimestamp = System.currentTimeMillis();
             // Start the client.
             ChannelFuture f = b.connect(host, port).sync();
             // Wait until the connection is closed.
             f.channel().closeFuture().sync();
             this.failedRequests = 0;
-            this.lastSuccessfulRequest = System.currentTimeMillis() / 1000;
+            this.syncStartTimestamp = startTimestamp;
+            this.syncEndTimestamp = System.currentTimeMillis();
+            this.lastSuccessfulRequest = syncEndTimestamp / 1000;
         } catch (Exception e) {
             this.failedRequests++;
             log.error("Failed synchronizing state.", e);
@@ -201,7 +203,6 @@ public final class StandbyClient impleme
                 this.active = false;
                 shutdownNetty();
             }
-            syncEndTimestamp = System.currentTimeMillis();
         }
     }