You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/07/07 14:49:16 UTC
[02/29] ambari git commit: AMBARI-21347. Service Page: Some Alerts
are missing their Status (magyari_sandor)
AMBARI-21347. Service Page: Some Alerts are missing their Status (magyari_sandor)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd250992
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd250992
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd250992
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: dd250992acd3c541f325ab0c30673bfc49176fda
Parents: 4b5e213
Author: Sandor Magyari <sm...@hortonworks.com>
Authored: Mon Jun 26 20:01:59 2017 +0200
Committer: Sandor Magyari <sm...@hortonworks.com>
Committed: Tue Jun 27 12:21:29 2017 +0200
----------------------------------------------------------------------
.../controller/AmbariManagementControllerImpl.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dd250992/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 1db9bc9..827c785 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
@@ -187,6 +187,7 @@ import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.UnlimitedKeyJCERequirement;
import org.apache.ambari.server.state.configgroup.ConfigGroupFactory;
+import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import org.apache.ambari.server.state.quicklinksprofile.QuickLinkVisibilityController;
import org.apache.ambari.server.state.quicklinksprofile.QuickLinkVisibilityControllerFactory;
import org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfile;
@@ -198,6 +199,7 @@ import org.apache.ambari.server.state.stack.WidgetLayout;
import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpInProgressEvent;
+import org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpSucceededEvent;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStopEvent;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostUpgradeEvent;
@@ -3062,7 +3064,15 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
// START task should run configuration script.
if (newState == State.INSTALLED && skipInstallTaskForComponent(requestProperties, cluster, scHost)) {
LOG.info("Skipping create of INSTALL task for {} on {}.", scHost.getServiceComponentName(), scHost.getHostName());
- scHost.setState(State.INSTALLED);
+ // set state to INSTALLING, then immediately send an ServiceComponentHostOpSucceededEvent to allow
+ // transitioning from INSTALLING --> INSTALLED.
+ scHost.setState(State.INSTALLING);
+ long now = System.currentTimeMillis();
+ try {
+ scHost.handleEvent(new ServiceComponentHostOpSucceededEvent(scHost.getServiceComponentName(), scHost.getHostName(), now));
+ } catch (InvalidStateTransitionException e) {
+ LOG.error("Error transitioning ServiceComponentHost state to INSTALLED", e);
+ }
} else {
createHostAction(cluster, stage, scHost, configurations, configurationAttributes, configTags,
roleCommand, requestParameters, event, skipFailure, effectiveClusterVersion, isUpgradeSuspended,