8000 Support cassandra.directory and cassandra.branch props for CCMBridge. by tolbertam · Pull Request #454 · apache/cassandra-java-driver · GitHub
[go: up one dir, main page]
Skip to content

Support cassandra.directory and cassandra.branch props for CCMBridge. #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olim7t merged 1 commit into from
Sep 29, 2015
Merged

Support cassandra.directory and cassandra.branch props for CCMBridge. #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public class CCMBridge {

public static final String IP_PREFIX;

private static final String CASSANDRA_VERSION_REGEXP = "\\d\\.\\d\\.\\d+(-\\w+)?";
static final File CASSANDRA_DIR;
static final String CASSANDRA_VERSION;

static final String CASSANDRA_INSTALL_ARGS;

public static final String DEFAULT_CLIENT_TRUSTSTORE_PASSWORD = "cassandra1sfun";
public static final String DEFAULT_CLIENT_TRUSTSTORE_PATH = "/client.truststore";

Expand Down Expand Up @@ -89,13 +89,15 @@ public class CCMBridge {
private static final String CCM_COMMAND;

static {
String version = System.getProperty("cassandra.version");
if (version.matches(CASSANDRA_VERSION_REGEXP)) {
CASSANDRA_DIR = null;
CASSANDRA_VERSION = "-v " + version;
CASSANDRA_VERSION = System.getProperty("cassandra.version");
String installDirectory = System.getProperty("cassandra.directory");
String branch = System.getProperty("cassandra.branch");
if (installDirectory != null && !installDirectory.trim().isEmpty()) {
CASSANDRA_INSTALL_ARGS = "--install-dir=" + new File(installDirectory).getAbsolutePath();
} else if(branch != null && !branch.trim().isEmpty()) {
CASSANDRA_INSTALL_ARGS = "-v git:" + branch;
} else {
CASSANDRA_DIR = new File(version);
CASSANDRA_VERSION = "";
CASSANDRA_INSTALL_ARGS = "-v " + CASSANDRA_VERSION;
}

String ip_prefix = System.getProperty("ipprefix");
Expand Down Expand Up @@ -286,7 +288,6 @@ private void execute(String command, Object... args) {
logger.debug("Executing: " + fullCommand);
CommandLine cli = CommandLine.parse(fullCommand);
Executor executor = new DefaultExecutor();
executor.setWorkingDirectory(CASSANDRA_DIR);

LogOutputStream outStream = new LogOutputStream() {
@Override protected void processLine(String line, int logLevel) {
Expand Down Expand Up @@ -594,7 +595,7 @@ public static class Builder {
private final String clusterName;
private Integer[] nodes = { 1 };
private boolean start = true;
private String cassandraVersion = CASSANDRA_VERSION;
private String cassandraInstallArgs = CASSANDRA_INSTALL_ARGS;
private String[] startOptions = new String[0];
private Map<String, String> cassandraConfiguration = Maps.newHashMap();

Expand Down Expand Up @@ -634,7 +635,7 @@ public Builder notStarted() {

/** Defaults to system property cassandra.version */
public Builder withCassandraVersion(String cassandraVersion) {
this.cassandraVersion = "-v " + cassandraVersion;
this.cassandraInstallArgs = "-v " + cassandraVersion;
return this;
}

Expand Down Expand Up @@ -663,7 +664,7 @@ private String buildCreateCommand() {
StringBuilder result = new StringBuilder(CCM_COMMAND + " create");
result.append(" " + clusterName);
result.append(" -i" + IP_PREFIX);
result.append(" " + cassandraVersion);
result.append(" " + cassandraInstallArgs);
if (nodes.length > 0)
result.append(" -n " + Joiner.on(":").join(nodes));
if (startOptions.length > 0)
Expand Down
2 changes: 1 addition & 1 deletion driver-core/src/test/java/com/datastax/driver/core/TestListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class TestListener extends TestListenerAdapter implements IInvokedMethodL
private int test_index = 0;

static {
System.out.println("[CCMBridge] Using Cassandra version: " + CCMBridge.CASSANDRA_VERSION);
System.out.println("[CCMBridge] Using Cassandra version: " + CCMBridge.CASSANDRA_VERSION + " (install arguments: " + CCMBridge.CASSANDRA_INSTALL_ARGS + ")");
}

@Override
Expand Down
0