Author: [email protected]
Date: Wed Feb 29 13:51:12 2012
New Revision: 2127
Log:
[AMDATUCASSANDRA-174] Removed the timeout
Modified:
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientActivatorServiceImpl.java
Modified:
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientActivatorServiceImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientActivatorServiceImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-client/src/main/java/org/amdatu/cassandra/client/service/CassandraClientActivatorServiceImpl.java
Wed Feb 29 13:51:12 2012
@@ -38,7 +38,6 @@
*/
public class CassandraClientActivatorServiceImpl {
// Timeout for the initial Thrift connection
- private static final int THRIFT_RETRIES = 5;
private static final int THRIFT_TIMEOUT = 3000;
// Service dependencies injected by the dependency manager
@@ -65,27 +64,26 @@
public void run() {
// First wait until we can establish a Thrift connection to the
daemon, the connection is
// established as soon as the daemon is running.
- if (waitForConnection()) {
+ waitForConnection();
- // Register a new CassandraDaemonAvailable service
- CassandraDaemonAvailable service = new
CassandraDaemonAvailable() {
- };
-
- m_serviceAvailableComponent =
m_dependencyManager.createComponent()
- .setInterface(CassandraDaemonAvailable.class.getName(),
null)
- .setImplementation(service);
- m_dependencyManager.add(m_serviceAvailableComponent);
- }
+ // Register a new CassandraDaemonAvailable service
+ CassandraDaemonAvailable service = new CassandraDaemonAvailable() {
+ };
+
+ m_serviceAvailableComponent = m_dependencyManager.createComponent()
+ .setInterface(CassandraDaemonAvailable.class.getName(), null)
+ .setImplementation(service);
+ m_dependencyManager.add(m_serviceAvailableComponent);
}
}
- private boolean waitForConnection() {
- // Try THRIFT_RETRIES times to get a connection
- int retry = 0;
+ private void waitForConnection() {
+ // Block until we successfully created a connection
Cluster cluster = null;
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- while (retry < THRIFT_RETRIES) {
+ boolean success = false;
+ while (!success) {
try {
// Perform a classloader switch to prevent log4j trying to
load classes from the system classloader
// instead of the bundle classloader.
@@ -94,10 +92,9 @@
cluster = new ThriftCluster(clusterName,
m_configuration.getCassandraHostConfigurator());
cluster.describeKeyspaces();
m_logService.log(LogService.LOG_INFO, "Thrift connection
established successfully");
- return true;
+ success = true;
}
catch (Exception e) {
- retry++;
Thread.sleep(THRIFT_TIMEOUT);
}
finally {
@@ -110,6 +107,5 @@
finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
- return false;
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
