[Kimchi-devel] [PATCH][Kimchi] Fix logging and error messages in objectstore upgrade

[Ramon Medeiros]

Reviewed-By: Ramon Medeiros <ramonn at br.ibm.com>

On 04/29/2016 12:58 AM, Rodrigo Trujillo wrote:
> There are bugs in excepts in objectstore upgrade functions:
> - wok_log is in wrong position, after raise, and is never called;
> - log message misses '%s' operator
>
> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo at linux.vnet.ibm.com>
> ---
>   utils.py | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/utils.py b/utils.py
> index 3837e74..c4cd07d 100644
> --- a/utils.py
> +++ b/utils.py
> @@ -111,8 +111,8 @@ def upgrade_objectstore_data(item, old_uri, new_uri):
>       except sqlite3.Error, e:
>           if conn:
>               conn.rollback()
> +        wok_log.error("Error while upgrading objectstore data: %s", e.args[0])
>           raise OperationFailed("KCHUTILS0006E")
> -        wok_log.error("Error while upgrading objectstore data:", e.args[0])
>       finally:
>           if conn:
>               conn.close()
> @@ -157,8 +157,8 @@ def upgrade_objectstore_template_disks(libv_conn):
>       except sqlite3.Error, e:
>           if conn:
>               conn.rollback()
> +        wok_log.error("Error while upgrading objectstore data: %s", e.args[0])
>           raise OperationFailed("KCHUTILS0006E")
> -        wok_log.error("Error while upgrading objectstore data:", e.args[0])
>       finally:
>           if conn:
>               conn.close()
> @@ -200,8 +200,8 @@ def upgrade_objectstore_memory():
>       except sqlite3.Error, e:
>           if conn:
>               conn.rollback()
> +        wok_log.error("Error while upgrading objectstore data: %s", e.args[0])
>           raise OperationFailed("KCHUTILS0006E")
> -        wok_log.error("Error while upgrading objectstore data:", e.args[0])
>       finally:
>           if conn:
>               conn.close()

-- 

Ramon Nunes Medeiros
Kimchi Developer
Linux Technology Center Brazil
IBM Systems & Technology Group
Phone : +55 19 2132 7878
ramonn at br.ibm.com