Add log files
Store a debug log in ./log/ to help the user determine any possible issues that might popup. The stdout (info) might not provide enough information +Added Logic for Rally Change-Id: I9ca1f42c061ae912fde9af414ada0d328615f458
This commit is contained in:
parent
46433fd384
commit
73957eadc4
|
@ -6,3 +6,5 @@ ansible/pbench-host-file
|
||||||
|
|
||||||
# Prevent Results from sneaking into the git repo
|
# Prevent Results from sneaking into the git repo
|
||||||
results/
|
results/
|
||||||
|
|
||||||
|
log/*
|
||||||
|
|
|
@ -11,10 +11,15 @@ import ConfigParser, os
|
||||||
|
|
||||||
# Setting up our logger
|
# Setting up our logger
|
||||||
_logger = logging.getLogger('browbeat')
|
_logger = logging.getLogger('browbeat')
|
||||||
_logger.setLevel(logging.INFO)
|
_logger.setLevel(logging.DEBUG)
|
||||||
_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)5s - %(message)s')
|
_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)5s - %(message)s')
|
||||||
|
_dbg_file = logging.FileHandler('log/debug.log')
|
||||||
|
_dbg_file.setLevel(logging.DEBUG)
|
||||||
|
_dbg_file.setFormatter(_formatter)
|
||||||
_ch = logging.StreamHandler()
|
_ch = logging.StreamHandler()
|
||||||
|
_ch.setLevel(logging.INFO)
|
||||||
_ch.setFormatter(_formatter)
|
_ch.setFormatter(_formatter)
|
||||||
|
_logger.addHandler(_dbg_file)
|
||||||
_logger.addHandler(_ch)
|
_logger.addHandler(_ch)
|
||||||
|
|
||||||
# import ansible
|
# import ansible
|
||||||
|
|
12
lib/Rally.py
12
lib/Rally.py
|
@ -1,6 +1,7 @@
|
||||||
from Connmon import Connmon
|
from Connmon import Connmon
|
||||||
from Pbench import Pbench
|
from Pbench import Pbench
|
||||||
from Tools import Tools
|
from Tools import Tools
|
||||||
|
import os
|
||||||
import datetime
|
import datetime
|
||||||
import glob
|
import glob
|
||||||
import logging
|
import logging
|
||||||
|
@ -39,6 +40,16 @@ class Rally:
|
||||||
task_args, test_name)
|
task_args, test_name)
|
||||||
self.tools.run_cmd(cmd)
|
self.tools.run_cmd(cmd)
|
||||||
|
|
||||||
|
def workload_logger(self,result_dir) :
|
||||||
|
base = result_dir.split('/')
|
||||||
|
if not os.path.isfile("{}/{}/browbeat-rally-run.log".format(base[0],base[1])) :
|
||||||
|
file = logging.FileHandler("{}/{}/browbeat-rally-run.log".format(base[0],base[1]))
|
||||||
|
file.setLevel(logging.DEBUG)
|
||||||
|
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)5s - %(message)s')
|
||||||
|
file.setFormatter(formatter)
|
||||||
|
self.logger.addHandler(file)
|
||||||
|
return None
|
||||||
|
|
||||||
def get_task_id(self, test_name):
|
def get_task_id(self, test_name):
|
||||||
cmd = "grep \"rally task results\" {}.log | awk '{{print $4}}'".format(test_name)
|
cmd = "grep \"rally task results\" {}.log | awk '{{print $4}}'".format(test_name)
|
||||||
return self.tools.run_cmd(cmd)
|
return self.tools.run_cmd(cmd)
|
||||||
|
@ -82,6 +93,7 @@ class Rally:
|
||||||
self.config['browbeat']['results'], time_stamp, benchmark,
|
self.config['browbeat']['results'], time_stamp, benchmark,
|
||||||
scenario)
|
scenario)
|
||||||
self.logger.debug("Created result directory: {}".format(result_dir))
|
self.logger.debug("Created result directory: {}".format(result_dir))
|
||||||
|
self.workload_logger(result_dir)
|
||||||
|
|
||||||
# Override concurrency/times
|
# Override concurrency/times
|
||||||
if 'concurrency' in scenario_args:
|
if 'concurrency' in scenario_args:
|
||||||
|
|
Loading…
Reference in New Issue