AMBARI-21800. Some services had issue coming up after express upgrade on IOP clusters. (swagle)
Change-Id: Ifc3ebf613fca4712c2c87110706033dd24cf704b Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b41f06f7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b41f06f7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b41f06f7 Branch: refs/heads/2.5-maint Commit: b41f06f7b126cf5beb4e1c9504aafe9157c2507a Parents: f5dc535 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Wed Aug 23 19:34:34 2017 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Wed Aug 23 19:34:34 2017 -0700 ---------------------------------------------------------------------- .../apache/ambari/server/metadata/RoleCommandOrder.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b41f06f7/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java index 234ef26..ef9e1fa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java @@ -133,7 +133,7 @@ public class RoleCommandOrder implements Cloneable { this.sectionKeys = sectionKeys; dependencies.clear(); - StackId stackId = cluster.getCurrentStackVersion(); + StackId stackId = cluster.getDesiredStackVersion(); StackInfo stack = null; try { stack = ambariMetaInfo.getStack(stackId.getStackName(), @@ -141,6 +141,8 @@ public class RoleCommandOrder implements Cloneable { } catch (AmbariException e) { } + LOG.info("Generating RCO graph for cluster {} and stack {}", cluster.getClusterName(), stackId); + Map<String,Object> userData = stack.getRoleCommandOrder().getContent(); Map<String,Object> generalSection = (Map<String, Object>) userData.get(GENERAL_DEPS_KEY); @@ -266,10 +268,9 @@ public class RoleCommandOrder implements Cloneable { roleCommandDeps.add(new RoleCommandPair(rco.getRole(), RoleCommand.RESTART)); } - if (LOG.isDebugEnabled()) { - LOG.debug("Adding dependency for " + restartPair + ", " + - "dependencies => " + roleCommandDeps); - } + LOG.info("Adding dependency for " + restartPair + ", " + + "dependencies => " + roleCommandDeps); + missingDependencies.put(restartPair, roleCommandDeps); } }
