Commit 2ccc2b48 authored by Daniel Seybold's avatar Daniel Seybold

fixed Dockerfile and command building for TPC-C

parent 14c74c39
Pipeline #74063 passed with stage
in 14 minutes and 43 seconds
......@@ -53,11 +53,7 @@ ADD lib/ycsb_0.15/jdbc-binding/jdbc-binding-0.15.0.jar /opt/workloads/ycsb/jdbc-
###### CockroachDB loadgen for TPC-C ######
# downlaod cockroachdb loadgen
RUN mkdir /opt/workloads/cockroach/
RUN cd /opt/workloads/cockroach
RUN wget https://binaries.cockroachdb.com/cockroach-v19.2.4.linux-amd64.tgz
RUN tar fxvz cockroach-v19.2.4.linux-amd64.tgz
RUN mv cockroach-v19.2.4.linux-amd64 binary
RUN rm cockroach-v19.2.4.linux-amd64.tgz
RUN cd /opt/workloads/cockroach ; wget https://binaries.cockroachdb.com/cockroach-v19.2.4.linux-amd64.tgz ; tar fxvz cockroach-v19.2.4.linux-amd64.tgz ; mv cockroach-v19.2.4.linux-amd64 binary ; rm cockroach-v19.2.4.linux-amd64.tgz
###### TSBS by Timescale ######
......
......@@ -43,6 +43,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService {
private final String TPCC_RESULT_FOLDER = "TPCC/";
private static final String TPCC_BINARY = "./cockroach";
//TSBS constants
private final String TSBS_RESULT_FOLDER = "/tmp/"; // TODO CHANGE
private static final String TSBS_BINARY = "/opt/workloads/tsbs/bin/";
......
......@@ -66,9 +66,13 @@ public class TPCCCommandBuilder {
workloadCommand += " --histograms \"" + workload.getHistogram() + ".txt\" ";
}
//TODO: remove as this is deprecated
/*
if (workload.isInit()){
workloadCommand += " --init ";
}
*/
if (workload.isInterleaved()){
workloadCommand += " --interleaved ";
......@@ -141,7 +145,7 @@ public class TPCCCommandBuilder {
String connectionUrl;
StringJoiner dbmsEndpoints = new StringJoiner(" ");
StringJoiner dbmsEndpoints = new StringJoiner(",");
for(DBEndpoint endpoint : dbEndpoints){
String postgresEndpoint;
......@@ -152,12 +156,10 @@ public class TPCCCommandBuilder {
postgresEndpoint = endpoint.getIpAddress() + ":26257";
}
String postgresUrl = "\"postgresql://" + postgresEndpoint+"?sslmode=disable\"";
dbmsEndpoints.add(postgresUrl);
dbmsEndpoints.add(postgresEndpoint);
}
connectionUrl = " " + dbmsEndpoints.toString();
connectionUrl = " \"postgresql://" + dbmsEndpoints.toString() + "?sslmode=disable\"";
LOGGER.debug("DBMS connection URL for TPC-C is: " + connectionUrl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment