public/ottertune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support monitor

Browse Source
This commit is contained in:
bohanjason
2020-05-29 00:17:35 -04:00
committed by Bohan Zhang
parent c31b9f2490
commit 09226edece
4 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/driver/driver_config.py
View File

@@ -153,6 +153,10 @@ OLTPBENCH_BENCH = 'tpcc'
# CONTROLLER OPTIONS
#==========================================================
# Controller observation time, OLTPBench will be disabled for
# monitoring if the time is specified
CONTROLLER_OBSERVE_SEC = 100
# Path to the controller directory
CONTROLLER_HOME = DRIVER_HOME + '/../controller'

24
client/driver/fabfile.py vendored
View File

@@ -308,11 +308,11 @@ def run_oltpbench_bg():
@task
def run_controller():
def run_controller(interval_sec=-1):
LOG.info('Controller config path: %s', dconf.CONTROLLER_CONFIG)
create_controller_config()
cmd = 'gradle run -PappArgs="-c {} -d output/" --no-daemon > {}'.\
format(dconf.CONTROLLER_CONFIG, dconf.CONTROLLER_LOG)
cmd = 'gradle run -PappArgs="-c {} -t {} -d output/" --no-daemon > {}'.\
format(dconf.CONTROLLER_CONFIG, interval_sec, dconf.CONTROLLER_LOG)
with lcd(dconf.CONTROLLER_HOME): # pylint: disable=not-context-manager
local(cmd)
@@ -642,7 +642,13 @@ def clean_logs():
@task
def clean_oltpbench_results():
# remove oltpbench result files
local('rm -f {}/results/*'.format(dconf.OLTPBENCH_HOME))
local('rm -f {}/results/outputfile*'.format(dconf.OLTPBENCH_HOME))
@task
def clean_controller_results():
# remove oltpbench result files
local('rm -f {}/output/*.json'.format(dconf.CONTROLLER_HOME))
def _set_oltpbench_property(name, line):
@@ -820,6 +826,16 @@ def run_loops(max_iter=10):
LOG.info('The %s-th Loop Ends / Total Loops %s', i + 1, max_iter)
@task
def monitor(max_iter=1):
for i in range(int(max_iter)):
LOG.info('The %s-th Monitor Loop Starts / Total Loops %s', i + 1, max_iter)
clean_controller_results()
run_controller(interval_sec=dconf.CONTROLLER_OBSERVE_SEC)
upload_result()
LOG.info('The %s-th Monitor Loop Ends / Total Loops %s', i + 1, max_iter)
@task
def rename_batch(result_dir=None):
result_dir = result_dir or dconf.RESULT_DIR