From ccb47ff55872947cbb5679ec8353172c0b53938d Mon Sep 17 00:00:00 2001 From: Daniel Seybold Date: Wed, 13 May 2020 20:42:06 +0200 Subject: [PATCH] redirect stderr also to output file --- .../omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java | 2 +- src/main/java/de/uulm/omi/workload/tsbs/Runner.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java b/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java index 54ed0fd..8388fb8 100644 --- a/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java +++ b/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java @@ -45,7 +45,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService { //TPC-C constants private final String TPCC_RESULT_FOLDER = "TPCC/"; private static final String TPCC_BINARY = "./cockroach"; - + @Override public Response workloadResultGet(@NotNull String taskId, @NotNull String workloadType, diff --git a/src/main/java/de/uulm/omi/workload/tsbs/Runner.java b/src/main/java/de/uulm/omi/workload/tsbs/Runner.java index 7c407c5..814fcf6 100644 --- a/src/main/java/de/uulm/omi/workload/tsbs/Runner.java +++ b/src/main/java/de/uulm/omi/workload/tsbs/Runner.java @@ -127,7 +127,7 @@ public class Runner implements Runnable { String loadCommand = ""; loadCommand = TSBSCommandBuilder.generateLoadCommand(TSBS_BINARY, properties.getProperty(WorkloadApiProperties.WORKLOAD_DATA_FOLDER), workload.getDbms(), workload.getTsbsLoadExecution(),workload.getDbEndpoints()); - loadCommand += " > " + properties.getProperty(WorkloadApiProperties.WORKLOAD_RESULTS_FOLDER) + TSBS_RESULT_FOLDER + taskId.trim() + "_load.txt"; + loadCommand += " &> " + properties.getProperty(WorkloadApiProperties.WORKLOAD_RESULTS_FOLDER) + TSBS_RESULT_FOLDER + taskId.trim() + "_load.txt"; LOGGER.debug(loadCommand); workloadProcess @@ -153,7 +153,7 @@ public class Runner implements Runnable { //Phase 4: executing query phase //Execute Queries String executeQueriesCommand = TSBSCommandBuilder.executeQueriesCommand(TSBS_BINARY, properties.getProperty(WorkloadApiProperties.WORKLOAD_DATA_FOLDER), workload.getDbms(), workload.getTsbsQueryExecution(), workload.getDbEndpoints() ); - executeQueriesCommand += " > " + properties.getProperty(WorkloadApiProperties.WORKLOAD_RESULTS_FOLDER) + TSBS_RESULT_FOLDER + taskId.trim() + ".txt"; + executeQueriesCommand += " &> " + properties.getProperty(WorkloadApiProperties.WORKLOAD_RESULTS_FOLDER) + TSBS_RESULT_FOLDER + taskId.trim() + ".txt"; LOGGER.debug(loadCommand); workloadProcess = WorkloadProcess.getInstance(); -- GitLab