aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crosperf/experiment_status.py11
-rw-r--r--crosperf/schedv2.py1
2 files changed, 7 insertions, 5 deletions
diff --git a/crosperf/experiment_status.py b/crosperf/experiment_status.py
index ae18dbca..ce562b95 100644
--- a/crosperf/experiment_status.py
+++ b/crosperf/experiment_status.py
@@ -97,15 +97,16 @@ class ExperimentStatus(object):
(key, self._GetNamesAndIterations(val)))
thread_status = ""
- if self.experiment.log_level == "verbose":
- thread_status_format = "Thread Status: \n{}\n"
- if self.experiment.schedv2() is None:
+ thread_status_format = "Thread Status: \n{}\n"
+ if (self.experiment.schedv2() is None and
+ self.experiment.log_level == "verbose"):
# Add the machine manager status.
thread_status = thread_status_format.format(
self.experiment.machine_manager.AsString())
- else:
+ elif self.experiment.schedv2():
+ # In schedv2 mode, we always print out thread status.
thread_status = thread_status_format.format(
- self.experiment.schedv2().threads_status_as_string())
+ self.experiment.schedv2().threads_status_as_string())
result = "{}{}".format(thread_status, "\n".join(status_strings))
diff --git a/crosperf/schedv2.py b/crosperf/schedv2.py
index 50df8edd..a8ef4d57 100644
--- a/crosperf/schedv2.py
+++ b/crosperf/schedv2.py
@@ -10,6 +10,7 @@ from collections import defaultdict
from machine_image_manager import MachineImageManager
from threading import Lock
from threading import Thread
+from utils import command_executer
from utils import logger