From 22a0c0a46cd09e70e3aefd99272765e57e9d2168 Mon Sep 17 00:00:00 2001 From: dahn Date: Mon, 20 Sep 2021 18:00:06 +0200 Subject: [PATCH] change logging during upgrade (#5474) * reduce ERROR logging on ignored exception * string concat formatting Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> Co-authored-by: Daan Hoogland Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com> --- .../cloud/upgrade/dao/Upgrade410to420.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java index 9551a504192..430ebdb8dda 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java @@ -2388,19 +2388,32 @@ public class Upgrade410to420 implements DbUpgrade { conn.prepareStatement("ALTER TABLE `cloud`.`volumes` CHANGE COLUMN `iso_id1` `iso_id` bigint(20) unsigned COMMENT 'The id of the iso from which the volume was created'");) { alter_iso_pstmt.executeUpdate(); }catch (SQLException e) { - s_logger.error("migrateDatafromIsoIdInVolumesTable:Exception:"+e.getMessage(),e); + s_logger.info("migrateDatafromIsoIdInVolumesTable: ignoring Exception: " + e.getMessage()); + if (s_logger.isTraceEnabled()) { + s_logger.trace("migrateDatafromIsoIdInVolumesTable: ignored Exception",e); + } //implies iso_id1 is not present, so do nothing. } }catch (SQLException e) { - s_logger.error("migrateDatafromIsoIdInVolumesTable:Exception:"+e.getMessage(),e); + s_logger.info("migrateDatafromIsoIdInVolumesTable: ignoring Exception: " + e.getMessage()); + if (s_logger.isTraceEnabled()) { + s_logger.trace("migrateDatafromIsoIdInVolumesTable: ignored Exception",e); + } //implies iso_id1 is not present, so do nothing. } } }catch (SQLException e) { - s_logger.error("migrateDatafromIsoIdInVolumesTable:Exception:"+e.getMessage(),e); + s_logger.info("migrateDatafromIsoIdInVolumesTable: ignoring Exception: " + e.getMessage()); + if (s_logger.isTraceEnabled()) { + s_logger.trace("migrateDatafromIsoIdInVolumesTable: ignored Exception",e); + } //implies iso_id1 is not present, so do nothing. } } catch (SQLException e) { + s_logger.info("migrateDatafromIsoIdInVolumesTable: ignoring Exception: " + e.getMessage()); + if (s_logger.isTraceEnabled()) { + s_logger.trace("migrateDatafromIsoIdInVolumesTable: ignored Exception",e); + } //implies iso_id1 is not present, so do nothing. } }