From 7965ada1fab9c363e88c2b4d291309a47af79810 Mon Sep 17 00:00:00 2001 From: Daniel Seybold Date: Mon, 25 Nov 2019 12:20:45 +0100 Subject: [PATCH] fixed issues in tsbs api that cause compile errors, looging needs to be more expressive --- .../api/impl/WorkloadApiServiceImpl.java | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 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 e7375fa..1b66f71 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 @@ -151,7 +151,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService { @Override public Response workloadTsbsLoadPost(String taskId, TSBSLoadWorkload workload, - SecurityContext securityContext) throws NotFoundException, IOException, InterruptedException { + SecurityContext securityContext) throws NotFoundException { //check if already a workloadProcess running @@ -179,10 +179,19 @@ public class WorkloadApiServiceImpl extends WorkloadApiService { generateDataCommand += " | gzip > " + resultFileName; ProcessBuilder genDataProcess= new ProcessBuilder(); genDataProcess.command(UNIX_SHELL, UNIX_COMMAND_PARAM, generateDataCommand); - Process processData = genDataProcess.start(); + Process processData = null; + try { + processData = genDataProcess.start(); + } catch (IOException e) { + e.printStackTrace(); + } System.out.println(generateDataCommand); while (processData.isAlive()) { + try { Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } } System.out.println("finished data generation"); @@ -200,9 +209,18 @@ public class WorkloadApiServiceImpl extends WorkloadApiService { System.out.println(generateQueriesCommand); ProcessBuilder genQueryProcess = new ProcessBuilder(); genQueryProcess.command(UNIX_SHELL, UNIX_COMMAND_PARAM, generateQueriesCommand); - Process processGenQueries = genQueryProcess.start(); + Process processGenQueries = null; + try { + processGenQueries = genQueryProcess.start(); + } catch (IOException e) { + e.printStackTrace(); + } while (processGenQueries.isAlive()) { + try { Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } } System.out.println("finished query generation"); @@ -214,10 +232,19 @@ public class WorkloadApiServiceImpl extends WorkloadApiService { System.out.println(loadCommand); ProcessBuilder loadProcess = new ProcessBuilder(); loadProcess.command(UNIX_SHELL, UNIX_COMMAND_PARAM, loadCommand); - Process processLoad = loadProcess.start(); + Process processLoad = null; + try { + processLoad = loadProcess.start(); + } catch (IOException e) { + e.printStackTrace(); + } while (processLoad.isAlive()) { + try { Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); } + } System.out.println("finished loading"); // Execute Queries -- GitLab