diff --git a/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceYCSBWriteScenario.java b/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceYCSBWriteScenario.java index d2f9af20b20e931d40e05bee4088b9f831b7ae70..b58dab4546abdaab3203068f61fa193767f3b61a 100644 --- a/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceYCSBWriteScenario.java +++ b/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceYCSBWriteScenario.java @@ -19,9 +19,11 @@ import de.uulm.omi.evaluation.task.DeployDB; import de.uulm.omi.evaluation.task.FetchYcsbResult; import de.uulm.omi.evaluation.task.InitEvaluation; import de.uulm.omi.evaluation.task.InitRun; +import de.uulm.omi.evaluation.task.LogTask; import de.uulm.omi.evaluation.task.Plotting; import de.uulm.omi.evaluation.task.Plotting.PlottingTask; -import de.uulm.omi.evaluation.task.RemoteCommand; +import de.uulm.omi.evaluation.task.TaskState; +import de.uulm.omi.evaluation.task.TaskType; import de.uulm.omi.evaluation.task.YcsbWorkload; import de.uulm.omi.utils.YcsbWorkloadType; import org.jeasy.flows.engine.WorkFlowEngine; @@ -100,15 +102,21 @@ public class PerformanceYCSBWriteScenario extends EvaluationScenario { runFlow = aNewSequentialFlow() .execute(initRun) .execute(deployDB) + .execute(new LogTask(evaluationContext, TaskType.DEPLOY_DB, TaskState.STARTED)) .execute(checkDeployment) + .execute(new LogTask(evaluationContext, TaskType.DEPLOY_DB, TaskState.FINISHED)) .execute(ycsbWorkload) + .execute(new LogTask(evaluationContext, TaskType.YCSB_LOAD, TaskState.STARTED)) .execute(checkWorkload) + .execute(new LogTask(evaluationContext, TaskType.YCSB_LOAD, TaskState.FINISHED)) .execute(fetchYcsbResult) .execute(mergeYCSB) .execute(evaluationTimeseries) .execute(workloadTimeseries) .execute(systemTimeseries) + .execute(new LogTask(evaluationContext, TaskType.CLEANUP, TaskState.STARTED)) .execute(cleanUpResources) + .execute(new LogTask(evaluationContext, TaskType.CLEANUP, TaskState.FINISHED)) .execute(cleanUpRun) .build(); diff --git a/src/main/java/de/uulm/omi/evaluation/scenario/ScalabilityYCSBWriteScenario.java b/src/main/java/de/uulm/omi/evaluation/scenario/ScalabilityYCSBWriteScenario.java index e9dca7ee4437f1a326125eb0df365bb807214c08..17334553e7854a66975a94d6cda574fd3506320c 100644 --- a/src/main/java/de/uulm/omi/evaluation/scenario/ScalabilityYCSBWriteScenario.java +++ b/src/main/java/de/uulm/omi/evaluation/scenario/ScalabilityYCSBWriteScenario.java @@ -17,9 +17,12 @@ import de.uulm.omi.evaluation.task.DeployDB; import de.uulm.omi.evaluation.task.FetchYcsbResult; import de.uulm.omi.evaluation.task.InitEvaluation; import de.uulm.omi.evaluation.task.InitRun; +import de.uulm.omi.evaluation.task.LogTask; import de.uulm.omi.evaluation.task.Plotting; import de.uulm.omi.evaluation.task.Plotting.PlottingTask; import de.uulm.omi.evaluation.task.RemoteCommand; +import de.uulm.omi.evaluation.task.TaskState; +import de.uulm.omi.evaluation.task.TaskType; import de.uulm.omi.evaluation.task.YcsbWorkload; import de.uulm.omi.utils.YcsbWorkloadType; import org.jeasy.flows.engine.WorkFlowEngine; @@ -103,19 +106,25 @@ public class ScalabilityYCSBWriteScenario extends EvaluationScenario { failureAwareFlow = aNewSequentialFlow() .execute(initRun) .execute(deployDB) + .execute(new LogTask(evaluationContext, TaskType.DEPLOY_DB, TaskState.STARTED)) .then(aNewConditionalFlow() .execute(checkDeployment) .when(WorkReportPredicate.COMPLETED) .then(aNewSequentialFlow() + .execute(new LogTask(evaluationContext, TaskType.DEPLOY_DB, TaskState.FINISHED)) .execute(ycsbWorkload) + .execute(new LogTask(evaluationContext, TaskType.YCSB_LOAD, TaskState.STARTED)) .execute(checkWorkload) + .execute(new LogTask(evaluationContext, TaskType.YCSB_LOAD, TaskState.FINISHED)) .execute(fetchYcsbResult) .execute(remoteCommand) .execute(mergeYCSB) .execute(evaluationTimeseries) .execute(workloadTimeseries) .execute(systemTimeseries) + .execute(new LogTask(evaluationContext, TaskType.CLEANUP, TaskState.STARTED)) .execute(cleanUpResources) + .execute(new LogTask(evaluationContext, TaskType.CLEANUP, TaskState.FINISHED)) .execute(cleanUpRun) .build()) .otherwise(