Repository: ambari Updated Branches: refs/heads/branch-1.7.0 3a2cd15d8 -> 504fe667c refs/heads/trunk 5eb44e362 -> b7799aa93
AMBARI-8098. Upgrade to 1.7.0 fails if Oozie was not installed with NPE (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7799aa9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7799aa9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7799aa9 Branch: refs/heads/trunk Commit: b7799aa93527a4240a7be7a14bcd08c720ded5be Parents: 5eb44e3 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Sat Nov 1 22:07:42 2014 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Sat Nov 1 22:07:42 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7799aa9/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java index a14707f..de34e6b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java @@ -1076,7 +1076,8 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog { } //oozie_heapsize is added for HDP2, we should check if it exists and not add it for HDP1 - if(cluster.getDesiredConfigByType("oozie-env").getProperties().containsKey("oozie_heapsize")) { + if(cluster.getDesiredConfigByType("oozie-env") != null && + cluster.getDesiredConfigByType("oozie-env").getProperties().containsKey("oozie_heapsize")) { Map<String, String> oozieProps = new HashMap<String, String>(); oozieProps.put("oozie_heapsize","2048m"); oozieProps.put("oozie_permsize","256m");
