Repository: ambari Updated Branches: refs/heads/branch-2.2 dd7963937 -> 305e67be7 refs/heads/trunk 65752c9bd -> 376fc6ffc
AMBARI-14508. Upgrade from 1.6.1(and possibly other < 2.0.0) to 2.2.1 failed. (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b9bfd98 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b9bfd98 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b9bfd98 Branch: refs/heads/trunk Commit: 2b9bfd982f7203a6fc7f4f2432a93376e0cf52b3 Parents: 65752c9 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Tue Dec 29 14:16:45 2015 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Tue Dec 29 14:17:45 2015 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog221.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2b9bfd98/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java index 1257f70..b33d44e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java @@ -139,8 +139,12 @@ public class UpgradeCatalog221 extends AbstractUpgradeCatalog { clusterID, "hive_server_process"); List<AlertDefinitionEntity> hiveAlertDefinitions = new ArrayList(); - hiveAlertDefinitions.add(hiveMetastoreProcessAlertDefinitionEntity); - hiveAlertDefinitions.add(hiveServerProcessAlertDefinitionEntity); + if(hiveMetastoreProcessAlertDefinitionEntity != null) { + hiveAlertDefinitions.add(hiveMetastoreProcessAlertDefinitionEntity); + } + if(hiveServerProcessAlertDefinitionEntity != null) { + hiveAlertDefinitions.add(hiveServerProcessAlertDefinitionEntity); + } for(AlertDefinitionEntity alertDefinition : hiveAlertDefinitions){ String source = alertDefinition.getSource();
