Merge pull request #112 from ubc-cirrus-lab/tests

Bug fix (#111) and Code Cleanup

initialDeploy.sh

@@ -16,7 +16,7 @@ python3 scheduler/resetLastDecisions.py $workflow $hostcount $solvingMode
 # initialize Julia Solver
 mkfifo ./scheduler/juliaStdin
 mkfifo ./scheduler/juliaStdout
-julia scheduler/rpsMultiVMSolver.jl &
+julia scheduler/rpsMultiHostSolver.jl &
 
 # clean the host execution agent queue
 python3 host-agents/execution-agent/cleanup-queue.py vmSubscriber1 vm0

run_tests.sh

@@ -5,7 +5,7 @@
 
 mkfifo ./scheduler/juliaStdin
 mkfifo ./scheduler/juliaStdout
-julia ./scheduler/rpsMultiVMSolver.jl &
+julia ./scheduler/rpsMultiHostSolver.jl &
 
 cp -a ./tests/solver/data/. ./scheduler/data/
 cp -a ./tests/logCollector/. ./log-parser/get-workflow-logs/data/

scheduler/rpsCIScheduler.py

@@ -8,7 +8,7 @@
 import datetime
 from pathlib import Path
 from google.cloud import datastore
-from rpsMultiVMSolver import rpsOffloadingSolver
+from rpsMultiHostSolver import rpsOffloadingSolver
 from Estimator import Estimator
 from getInvocationRate import InvocationRate
 import sys
@@ -304,13 +304,16 @@ def resolveOffloadingSolutions(self):
         triggerType = "resolve"
         checkingFlag = True
         logging.info("Forced to change to resolve!!!")
-    print("LOCK CREATED!!!")
     pid = os.getpid()
     logging.info(str(pid))
     logging.info("LOCK CREATED!!!")
     logging.info(str(datetime.datetime.now()))
     # triggerType = "resolve"
-    solver = CIScheduler(triggerType)
+    try:
+        solver = CIScheduler(triggerType)
+    except:
+        logging.info("Scheduler failed to run!")
+        print("ERROR: Scheduler failed to run!")
     os.remove(str(Path(os.path.dirname(os.path.abspath(__file__)))) + "/lock.txt")
     if (
         os.path.exists(