You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/10/07 18:31:08 UTC
ambari git commit: AMBARI-13320. Cannot Perform RU If Ambari Server
Is Not A Part of the Cluster (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 0b9731084 -> 880224fa8
AMBARI-13320. Cannot Perform RU If Ambari Server Is Not A Part of the Cluster (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/880224fa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/880224fa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/880224fa
Branch: refs/heads/branch-2.1
Commit: 880224fa8ba6b858f54f15ed2dc068d96bbf4775
Parents: 0b97310
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Oct 7 19:14:00 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Oct 7 19:14:00 2015 +0300
----------------------------------------------------------------------
.../server/controller/internal/UpgradeResourceProvider.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/880224fa/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 653419b..c00e64b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -1278,9 +1278,9 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
stage.setStageId(stageId);
entity.setStageId(Long.valueOf(stageId));
- stage.addServerActionCommand(task.getImplementationClass(), Role.AMBARI_SERVER_ACTION,
- RoleCommand.EXECUTE, cluster.getClusterName(),
- new ServiceComponentHostServerActionEvent(null, System.currentTimeMillis()), commandParams,
+ stage.addServerActionCommand(task.getImplementationClass(), null, Role.AMBARI_SERVER_ACTION,
+ RoleCommand.EXECUTE, cluster.getClusterName(), hostName,
+ new ServiceComponentHostServerActionEvent(hostName, System.currentTimeMillis()), commandParams,
itemDetail, null, Integer.valueOf(1200), allowRetry,
context.isComponentFailureAutoSkipped());