[Amdatu-commits] SVN r634 - trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Fri Jan 14 14:20:42 2011
New Revision: 634

Log:
[AMDATU-266] Improved logging of Thrift connection retries, decreased timeout 
to 3 seconds

Modified:
   
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java

Modified: 
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
==============================================================================
--- 
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
 (original)
+++ 
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
 Fri Jan 14 14:20:42 2011
@@ -49,7 +49,8 @@
  */
 public class CassandraDaemonServiceImpl implements CassandraDaemonService {
     // Timeout for the initial Thrift connection
-    private final int THRIFT_TIMEOUT = 120000;
+    private final int THRIFT_RETRIES = 3;
+    private final int THRIFT_TIMEOUT = 3000;
 
     // The default placement strategy
     private final String DEFAULT_PLACEMENT_STRATEGY = 
"org.apache.cassandra.locator.SimpleStrategy";
@@ -303,16 +304,16 @@
             new Cassandra.Client(proto);
             tr.open();
         } catch (TTransportException e) {
-            m_logService.log(LogService.LOG_INFO, "Thrift connection cannot 
yet be established, retrying... (" + retry + ")");
             retry++;
-            if (retry >= 3) {
+            if (retry >= THRIFT_RETRIES) {
                 throw e;
             }
             try {
-                Thread.sleep(3000);
+                Thread.sleep(THRIFT_TIMEOUT);
             }
             catch (InterruptedException e1) {
             }
+            m_logService.log(LogService.LOG_INFO, "Thrift connection cannot 
yet be established, retrying... (" + retry + ")");
         }
         m_logService.log(LogService.LOG_INFO, "Thrift connection established 
successfully");
     }