You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/09/18 02:08:27 UTC
ambari git commit: AMBARI-13099. Config changes w/ blueprint
provisioning are not picked up (Oliver Szabo via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk ec9e4149f -> d40bf10b8
AMBARI-13099. Config changes w/ blueprint provisioning are not picked up (Oliver Szabo via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d40bf10b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d40bf10b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d40bf10b
Branch: refs/heads/trunk
Commit: d40bf10b8fc2be9046e278f4bd2685fc62f06513
Parents: ec9e414
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Sep 17 17:08:12 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Sep 17 17:08:12 2015 -0700
----------------------------------------------------------------------
.../server/actionmanager/ExecutionCommandWrapper.java | 14 --------------
.../controller/AmbariManagementControllerImpl.java | 13 +------------
2 files changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d40bf10b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
index 20a6932..40038eb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
@@ -17,7 +17,6 @@
*/
package org.apache.ambari.server.actionmanager;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -32,8 +31,6 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -56,17 +53,6 @@ public class ExecutionCommandWrapper {
this.executionCommand = executionCommand;
}
- public ExecutionCommand getExecutionCommand(boolean forceRefreshAllConfig) {
- // for Blueprint-based installs, force a refresh on the configuration
- // prior to sending the commands down
- if (forceRefreshAllConfig && (executionCommand != null)) {
- executionCommand.setForceRefreshConfigTagsBeforeExecution(Collections.singleton("*"));
- }
-
- // delegate to main wrapper method to handle the configuration merging
- return getExecutionCommand();
- }
-
@SuppressWarnings("serial")
public ExecutionCommand getExecutionCommand() {
if (executionCommand != null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d40bf10b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 37de331..6ba6bac 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -1864,13 +1864,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
- final boolean isBlueprintInstall = isBlueprintInstall(commandParamsInp);
- if (isBlueprintInstall) {
- LOG.info("AmbariManagementControllerImpl.createHostAction: Blueprint install detected, forcing refresh of all configuration types");
- }
-
ExecutionCommand execCmd = stage.getExecutionCommandWrapper(scHost.getHostName(),
- scHost.getServiceComponentName()).getExecutionCommand(isBlueprintInstall);
+ scHost.getServiceComponentName()).getExecutionCommand();
Host host = clusters.getHost(scHost.getHostName());
@@ -2044,12 +2039,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
- private static boolean isBlueprintInstall(Map<String, String> commandParams) {
- return commandParams != null && commandParams.containsKey(CLUSTER_PHASE_PROPERTY) &&
- ((commandParams.get(CLUSTER_PHASE_PROPERTY).equals(CLUSTER_PHASE_INITIAL_INSTALL)) ||
- ((commandParams.get(CLUSTER_PHASE_PROPERTY).equals(CLUSTER_PHASE_INITIAL_START))));
- }
-
/**
* Computes os-dependent packages for service/host. Does not take into
* account package dependencies for ANY_OS. Instead of this method