From 992be514b11d8a61ba2e702144bf2a26d653a757 Mon Sep 17 00:00:00 2001 From: Daniel Seybold Date: Thu, 14 May 2020 13:02:26 +0200 Subject: [PATCH] added load and query command to result file --- .../de/uulm/omi/workload/tsbs/Runner.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) 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 814fcf6..5ca0558 100644 --- a/src/main/java/de/uulm/omi/workload/tsbs/Runner.java +++ b/src/main/java/de/uulm/omi/workload/tsbs/Runner.java @@ -3,6 +3,11 @@ 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; @@ -129,6 +134,14 @@ 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), + StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); + } catch (IOException e) { + e.printStackTrace(); + return; + } workloadProcess .startWorkload(TSBS_BINARY, UNIX_SHELL, UNIX_COMMAND_PARAM, loadCommand, taskId, @@ -155,6 +168,14 @@ 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), + StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); + } catch (IOException e) { + e.printStackTrace(); + return; + } workloadProcess = WorkloadProcess.getInstance(); workloadProcess -- GitLab