Process log files for failed/success results
diff --git a/turbo_hipster/lib/utils.py b/turbo_hipster/lib/utils.py
index 9635f8d..ecb6c37 100644
--- a/turbo_hipster/lib/utils.py
+++ b/turbo_hipster/lib/utils.py
@@ -202,7 +202,8 @@
dest_file = os.path.join(dest_dir, dest_filename)
shutil.copyfile(file_path, dest_file)
- return local_config['prepend_url'] + dest_filename
+ return local_config['prepend_url'] + os.path.join(job_unique_number,
+ dest_filename)
def scp_push_file(job_unique_number, file_path, local_config):
diff --git a/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py b/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py
index c986ee6..d54d518 100644
--- a/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py
+++ b/turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py
@@ -71,22 +71,22 @@
def check_log_for_errors(logfile):
""" Run regex over the given logfile to find errors """
- MIGRATION_START_RE = re.compile('([0-9]+) -> ([0-9]+)\.\.\.$')
- MIGRATION_END_RE = re.compile('^done$')
- MIGRATION_COMMAND_START = '***** Start DB upgrade to state of'
- MIGRATION_COMMAND_END = '***** Finished DB upgrade to state of'
+ MIGRATION_START_RE = re.compile('([0-9]+) -\> ([0-9]+)\.\.\. $')
+ MIGRATION_END_RE = re.compile('done$')
+ #MIGRATION_COMMAND_START = '***** Start DB upgrade to state of'
+ #MIGRATION_COMMAND_END = '***** Finished DB upgrade to state of'
- with open(logfile,'r') as fd:
+ with open(logfile, 'r') as fd:
migration_started = False
for line in fd:
- if MIGRATION_START_RE.match(line):
+ if MIGRATION_START_RE.search(line):
if migration_started:
# We didn't see the last one finish,
# something must have failed
return False
migration_started = True
- elif MIGRATION_END_RE.match(line):
+ elif MIGRATION_END_RE.search(line):
if migration_started:
# We found the end to this migration
migration_started = False
diff --git a/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh b/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh
index d213840..3399faf 100755
--- a/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh
+++ b/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh
@@ -57,16 +57,16 @@
nova_manage="$3/bin/nova-manage"
if [ -e $nova_manage ]
then
- echo "***** DB upgrade to state of $1 starts *****"
+ echo "***** Start DB upgrade to state of $1 *****"
python $nova_manage --config-file $2/nova-$1.conf db sync
else
python setup.py -q clean
python setup.py -q develop
python setup.py -q install
- echo "***** DB upgrade to state of $1 starts *****"
+ echo "***** Start DB upgrade to state of $1 *****"
nova-manage --config-file $2/nova-$1.conf db sync
fi
- echo "***** DB upgrade to state of $1 finished *****"
+ echo "***** Finished DB upgrade to state of $1 *****"
set +x
}
@@ -136,5 +136,3 @@
echo "Cleaning up virtual env"
deactivate
rmvirtualenv $1
-
-echo "done"
diff --git a/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py b/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py
index 21907f8..ed84e1d 100644
--- a/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py
+++ b/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py
@@ -93,7 +93,6 @@
self.cancelled = False
self.job = self.gearman_worker.getJob()
self._handle_job()
- return
except:
self.log.exception('Exception retrieving log event.')
@@ -159,7 +158,6 @@
self.datasets[i]['result'] = 'SUCCESS' if result else 'FAILURE'
if not result:
failed = True
- break
if failed:
self.work_data['result'] = "Failed: errors found in dataset log(s)"