modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java
| 20 +++-------
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
| 12 ++----
2 files changed, 10 insertions(+), 22 deletions(-)
New commits:
commit ac065ffc68885c3b8def933dccedd006f117eaa2
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Oct 22 16:52:22 2013 -0500
[BZ 1004050] Minor updates for the way create() works since the session is now
externally managed. Also simplified the abstract class code.
diff --git
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java
index 07a1de4..dc78601 100644
---
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java
+++
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java
@@ -29,12 +29,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.AuthenticationException;
-import com.datastax.driver.core.exceptions.NoHostAvailableException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,8 +58,6 @@ abstract class AbstractManager {
}
}
- private Cluster cluster;
- private Session session;
private SessionManager sessionManager;
private final String username;
private final String password;
@@ -72,15 +67,12 @@ abstract class AbstractManager {
protected AbstractManager(String username, String password, String[] nodes, int
cqlPort,
SessionManager sessionManager) {
- try {
- this.username = username;
- this.password = password;
- this.cqlPort = cqlPort;
- this.nodes = nodes;
- this.sessionManager = sessionManager;
- } catch (NoHostAvailableException e) {
- throw new RuntimeException("Unable create storage node session.",
e);
- }
+
+ this.username = username;
+ this.password = password;
+ this.cqlPort = cqlPort;
+ this.nodes = nodes;
+ this.sessionManager = sessionManager;
try {
UpdateFolder managementFolder = new UpdateFolder(MANAGEMENT_BASE_FOLDER);
diff --git
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
index 2f89df5..ac406d5 100644
---
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
+++
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
@@ -78,19 +78,11 @@ class VersionManager extends AbstractManager {
public void install() throws Exception {
log.info("Preparing to install storage schema");
- boolean clusterSessionInitialized = false;
try {
initClusterSession();
- clusterSessionInitialized = true;
} catch (AuthenticationException e) {
log.debug("Authentication exception. Will now attempt to create the
storage schema.");
log.debug(e);
- shutdownClusterConnection();
- } finally {
- //shutdownClusterConnection();
- }
-
- if (!clusterSessionInitialized) {
create();
}
@@ -114,6 +106,10 @@ class VersionManager extends AbstractManager {
*/
//1. Execute the creation of RHQ schema, version table, admin user.
try {
+ //shutdown existing connection
+ shutdownClusterConnection();
+
+ //re-initialize the cluster connection with default cassandra password
initClusterSession(DEFAULT_CASSANDRA_USER, DEFAULT_CASSANDRA_PASSWORD);
updateFolder = new UpdateFolder(Task.Create.getFolder());
Show replies by date