modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
| 5 ++++-
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java
| 5 +++++
modules/core/util/pom.xml
| 8 +++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 6eb9a98f7316382cd070922402fc1d9957e41076
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Aug 30 12:24:02 2013 -0500
[BZ 1001128] Do not immediately fail if a connection cannot be established with the
RHQ username. It is possible that the schema was never installed. Continue the drop
procedure and by attempting to login with the generic Cassandra user as expected in the
drop procedure.
Also update the command line runner to use password obfuscation before calling the
scheman manager code.
diff --git
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
index fdad697..1e67b1f 100644
---
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
+++
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
@@ -33,6 +33,8 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
+import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
+
/**
* @author John Sanda
*/
@@ -168,7 +170,8 @@ public class SchemaManager {
int cqlPort = Integer.parseInt(args[3]);
String[] hosts = Arrays.copyOfRange(args, 4, args.length);
- SchemaManager schemaManager = new SchemaManager(username, password, hosts,
cqlPort);
+ SchemaManager schemaManager = new SchemaManager(username,
PicketBoxObfuscator.encode(password), hosts,
+ cqlPort);
if ("install".equalsIgnoreCase(command)) {
schemaManager.install();
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 b0d75e3..9184af3 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
@@ -214,6 +214,11 @@ class VersionManager extends AbstractManager {
//1. Reinstated Cassandra superuser
execute(updateFolder.getUpdateFiles().get(0), properties);
log.info("Cassandra user reverted to default configuration.");
+ } catch (AuthenticationException e) {
+ //if the initial auth failed then let later code to attempt to use
+ //the generic user cassandra user to do the cleanup
+ log.debug("Cannot establish connection with the RHQ specific user.
"
+ + "Will continue the drop procedure with the Cassandra admin
user.");
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 654a2fb..2b4d557 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -17,7 +17,7 @@
<properties>
<rhq.internal>false</rhq.internal>
</properties>
-
+
<dependencies>
<!-- Used by the (deprecated) legacy XML parser, which is used to parse RHQ
license files. -->
@@ -45,6 +45,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox</artifactId>
+ <version>${picketbox.version}</version>
+ </dependency>
+
</dependencies>
<build>