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 b63a58236955b8c915900e2ac01b5122ede78c03..ece027954b58f91041f62030b1af51e7a30f3397 100644 --- a/src/main/java/de/uulm/omi/workload/tsbs/Runner.java +++ b/src/main/java/de/uulm/omi/workload/tsbs/Runner.java @@ -3,11 +3,6 @@ package de.uulm.omi.workload.tsbs; import de.uulm.omi.cloudiator.dbms.evaluator.model.TSBSWorkload; import de.uulm.omi.utils.WorkloadApiProperties; import de.uulm.omi.workload.WorkloadProcess; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -136,6 +131,7 @@ public class Runner implements Runnable { 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"; LOGGER.debug(loadCommand); + /* String commandToLog = loadCommand + System.getProperty("line.separator"); try { Files.write(Paths.get(properties.getProperty(WorkloadApiProperties.WORKLOAD_RESULTS_FOLDER) + TSBS_RESULT_FOLDER + taskId.trim() + "_load.txt"),commandToLog.getBytes(StandardCharsets.UTF_8), @@ -144,6 +140,7 @@ public class Runner implements Runnable { e.printStackTrace(); return; } + */ workloadProcess .startWorkload(TSBS_BINARY, UNIX_SHELL, UNIX_COMMAND_PARAM, loadCommand, taskId, @@ -170,6 +167,7 @@ public class Runner implements Runnable { 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"; LOGGER.debug(loadCommand); + /* commandToLog = executeQueriesCommand + System.getProperty("line.separator"); try { Files.write(Paths.get(properties.getProperty(WorkloadApiProperties.WORKLOAD_RESULTS_FOLDER) + TSBS_RESULT_FOLDER + taskId.trim() + ".txt"),commandToLog.getBytes(StandardCharsets.UTF_8), @@ -178,6 +176,7 @@ public class Runner implements Runnable { e.printStackTrace(); return; } + */ workloadProcess = WorkloadProcess.getInstance(); workloadProcess