You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2018/11/13 18:39:04 UTC
[ambari] branch trunk updated: [AMBARI-24892] Warn During Upgrade
When Plugin ClassLoader is not Found (#2604)
This is an automated email from the ASF dual-hosted git repository.
jonathanhurley pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7caa2a5 [AMBARI-24892] Warn During Upgrade When Plugin ClassLoader is not Found (#2604)
7caa2a5 is described below
commit 7caa2a54a5943b200765171edf32ea0337425b7a
Author: Jonathan Hurley <jo...@apache.org>
AuthorDate: Tue Nov 13 13:38:58 2018 -0500
[AMBARI-24892] Warn During Upgrade When Plugin ClassLoader is not Found (#2604)
---
.../apache/ambari/server/checks/UpgradeCheckRegistry.java | 2 ++
.../org/apache/ambari/server/upgrade/UpgradeCatalog280.java | 13 ++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
index 44d8cba..b529f28 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
@@ -207,6 +207,8 @@ public class UpgradeCheckRegistry {
LOG.error(
"Unable to perform the following upgrade checks because no libraries could be loaded for the {} stack: {}",
ownerStackId, StringUtils.join(pluginCheckClassNames, ","));
+
+ pluginChecks.m_failedChecks.addAll(pluginCheckClassNames);
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java
index 007a336..938e453 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog280.java
@@ -75,19 +75,18 @@ public class UpgradeCatalog280 extends AbstractUpgradeCatalog {
}
protected void addColumnsToRequestScheduleTable() throws SQLException {
- dbAccessor.addColumn(UPGRADE_TABLE,
- new DBAccessor.DBColumnInfo(UPGRADE_PACK_STACK_ID, String.class, 255,
- "", false));
- }
-
- protected void addColumnsToUpgradeTable() throws SQLException {
dbAccessor.addColumn(REQUEST_SCHEDULE_TABLE_NAME,
new DBAccessor.DBColumnInfo(REQUEST_SCHEDULE_BATCH_TOLERATION_LIMIT_PER_BATCH_COLUMN_NAME, Short.class, null,
null, true));
dbAccessor.addColumn(REQUEST_SCHEDULE_TABLE_NAME,
new DBAccessor.DBColumnInfo(REQUEST_SCHEDULE_PAUSE_AFTER_FIRST_BATCH_COLUMN_NAME, Boolean.class, null,
- null, true));
+ null, true));
+ }
+ protected void addColumnsToUpgradeTable() throws SQLException {
+ dbAccessor.addColumn(UPGRADE_TABLE,
+ new DBAccessor.DBColumnInfo(UPGRADE_PACK_STACK_ID, String.class, 255,
+ "", false));
}
protected void removeLastValidState() throws SQLException {