Repository: ambari Updated Branches: refs/heads/trunk 5c3c6280d -> 1c506ff7d
AMBARI-21843. Database consistency check fails after upgrade to ambari 2.6.0.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1c506ff7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1c506ff7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1c506ff7 Branch: refs/heads/trunk Commit: 1c506ff7da1dc1763bc24a7665077cf920b4a2bc Parents: 5c3c628 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Wed Aug 30 02:19:52 2017 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Wed Aug 30 02:21:05 2017 +0300 ---------------------------------------------------------------------- .../server/checks/DatabaseConsistencyCheckHelper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1c506ff7/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java index 1e2dac5..d52ea1f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java @@ -317,7 +317,7 @@ public class DatabaseConsistencyCheckHelper { throw new SQLException(); } } catch (SQLException ex) { - LOG.error(String.format("Failed to get %s row count: ", tableName), e); + error(String.format("Failed to get %s row count: ", tableName), e); } } finally { if (rs != null) { @@ -376,7 +376,7 @@ public class DatabaseConsistencyCheckHelper { } } catch (SQLException e) { - LOG.error("Exception occurred during check for config selected more than ones procedure: ", e); + error("Exception occurred during check for config selected more than once procedure: ", e); } finally { if (rs != null) { try { @@ -425,7 +425,7 @@ public class DatabaseConsistencyCheckHelper { } } catch (SQLException e) { - LOG.error("Exception occurred during check for host without state procedure: ", e); + error("Exception occurred during check for host without state procedure: ", e); } finally { if (rs != null) { try { @@ -458,7 +458,7 @@ public class DatabaseConsistencyCheckHelper { } } catch (SQLException e) { - LOG.error("Exception occurred during topology request tables check: ", e); + error("Exception occurred during topology request tables check: ", e); } finally { if (rs != null) { try { @@ -539,7 +539,7 @@ public class DatabaseConsistencyCheckHelper { } } catch (SQLException e) { - LOG.error("Exception occurred during check for same count of host component states and host component desired states: ", e); + error("Exception occurred during check for same count of host component states and host component desired states: ", e); } finally { if (rs != null) { try { @@ -775,7 +775,7 @@ public class DatabaseConsistencyCheckHelper { } } } catch (SQLException e) { - LOG.error("Exception occurred during checking MySQL engine to be innodb: ", e); + error("Exception occurred during checking MySQL engine to be innodb: ", e); } finally { if (rs != null) { try { @@ -1025,7 +1025,7 @@ public class DatabaseConsistencyCheckHelper { } } } catch (SQLException | AmbariException e) { - LOG.error("Exception occurred during complex service check procedure: ", e); + error("Exception occurred during complex service check procedure: ", e); } finally { if (rs != null) { try {
