From d81e4226194a364b30ee913562351ec6e633f834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Tue, 22 Sep 2020 17:29:56 +0200
Subject: [PATCH] Add calling of evaluation script from the run uc py
implementation
---
execution/run_uc.py | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/execution/run_uc.py b/execution/run_uc.py
index db350b671..3c490afcd 100644
--- a/execution/run_uc.py
+++ b/execution/run_uc.py
@@ -2,6 +2,7 @@ import argparse # parse arguments from cli
import atexit # used to clear resources at exit of program (e.g. ctrl-c)
from kubernetes import client, config # kubernetes api
from kubernetes.stream import stream
+import lag_analysis
import logging # logging
from os import path # path utilities
import subprocess # execute bash commands
@@ -20,6 +21,11 @@ def load_variables():
global args
print('Load CLI variables')
parser = argparse.ArgumentParser(description='Run use case Programm')
+ parser.add_argument('--exp-id', '-id',
+ dest='exp_id',
+ default='1',
+ metavar='EXP_ID',
+ help='ID of the experiment')
parser.add_argument('--use-case', '-uc',
dest='uc_id',
default='1',
@@ -285,14 +291,10 @@ def wait_execution():
return
-def run_evaluation_script():
- """Runs the evaluation script."""
- # TODO: implement
- # # Run eval script
- # source ../.venv/bin/activate
- # python lag_analysis.py $EXP_ID uc1 $DIM_VALUE $INSTANCES
- # $EXECUTION_MINUTES
- # deactivate
+def run_evaluation():
+ """Runs the evaluation function"""
+ print('Run evaluation function')
+ lag_analysis.main(args.exp_id, f'uc{args.uc_id}', args.dim_value, args.instances, args.execution_minutes)
return
@@ -388,7 +390,7 @@ def delete_topics(topics):
print(resp)
print('Wait for topic deletion')
- time.sleep(5)
+ time.sleep(2)
resp = stream(coreApi.connect_get_namespaced_pod_exec,
"kafka-client",
'default',
@@ -538,6 +540,9 @@ def main():
wait_execution()
print('---------------------')
+ run_evaluation()
+ print('---------------------')
+
# Cluster is resetted with atexit method
# reset_cluster(wg, app_svc, app_svc_monitor, app_jmx, app_deploy, topics)
--
GitLab