From 3aaf9068eafa16b94d9437cd374da88231f62927 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 19 Aug 2013 11:31:56 -0700 Subject: [PATCH] Reduce hidden effects of sqlalchemy objects The flows are currently holding onto sqlalchemy due to bug #1214083 and this is causing a problem with gettextutils which appears to be deepcopying the raw objects, of which one of those is sqlalchemy objects, which can't seem to be deepcopied. Change-Id: Ie831738799a75e2a4a652c73900cad353a71e327 --- cinder/volume/flows/create_volume.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cinder/volume/flows/create_volume.py b/cinder/volume/flows/create_volume.py index bc400c8ca..1677cd98f 100644 --- a/cinder/volume/flows/create_volume.py +++ b/cinder/volume/flows/create_volume.py @@ -1548,16 +1548,18 @@ def _attach_debug_listeners(flow): """ def flow_log_change(state, details): + # TODO(harlowja): the bug 1214083 is causing problems LOG.debug(_("%(flow)s has moved into state %(state)s from state" " %(old_state)s") % {'state': state, 'old_state': details.get('old_state'), - 'flow': details['flow']}) + 'flow': str(details['flow'])}) def task_log_change(state, details): + # TODO(harlowja): the bug 1214083 is causing problems LOG.debug(_("%(flow)s has moved %(runner)s into state %(state)s with" " result: %(result)s") % {'state': state, - 'flow': details['flow'], - 'runner': details['runner'], + 'flow': str(details['flow']), + 'runner': str(details['runner']), 'result': details.get('result')}) # Register * for all state changes (and not selective state changes to be -- 2.45.2