Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CCFA5200D51 for ; Wed, 22 Nov 2017 09:45:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CB6C3160BDA; Wed, 22 Nov 2017 08:45:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EC28A160C10 for ; Wed, 22 Nov 2017 09:45:11 +0100 (CET) Received: (qmail 57038 invoked by uid 500); 22 Nov 2017 08:45:11 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 56929 invoked by uid 99); 22 Nov 2017 08:45:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Nov 2017 08:45:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BE06F5F80; Wed, 22 Nov 2017 08:45:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Date: Wed, 22 Nov 2017 08:45:10 -0000 Message-Id: <5264ef797fae412c81b817f01011637c@git.apache.org> In-Reply-To: <11287bd77bf44906bf6920dac4c213d4@git.apache.org> References: <11287bd77bf44906bf6920dac4c213d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/7] ambari git commit: AMBARI-22136 Enable server_action tasks defined in EU/RU upgrade pack xml files to take parameters (push to branch-2.6) (dili) archived-at: Wed, 22 Nov 2017 08:45:13 -0000 AMBARI-22136 Enable server_action tasks defined in EU/RU upgrade pack xml files to take parameters (push to branch-2.6) (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb65aab9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb65aab9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb65aab9 Branch: refs/heads/branch-feature-AMBARI-22457 Commit: fb65aab92ea3024728b2e100b0a90a8f6bbf13d9 Parents: a1d59b7 Author: Di Li Authored: Fri Nov 17 15:43:02 2017 -0500 Committer: Di Li Committed: Fri Nov 17 15:43:02 2017 -0500 ---------------------------------------------------------------------- .../ambari/server/actionmanager/Stage.java | 3 +- .../internal/UpgradeResourceProvider.java | 2 + .../stack/upgrade/ServerSideActionTask.java | 15 +++++++ .../state/stack/upgrade/TaskParameter.java | 41 ++++++++++++++++++++ .../src/main/resources/upgrade-pack.xsd | 9 +++++ 5 files changed, 69 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java index 1d6ceaf..0563bfd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java @@ -443,7 +443,8 @@ public class Stage { * @param retryAllowed * indicates whether retry after failure is allowed */ - public synchronized void addServerActionCommand(String actionName, @Nullable String userName, + public synchronized void addServerActionCommand(String actionName, + @Nullable String userName, Role role, RoleCommand command, String clusterName, ServiceComponentHostServerActionEvent event, @Nullable Map commandParams, @Nullable String commandDetail, @Nullable Map> configTags, http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/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 b6846f7..ff326aa 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 @@ -1409,6 +1409,8 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider stage.setStageId(stageId); entity.setStageId(Long.valueOf(stageId)); + Map taskParameters = task.getParameters(); + commandParams.putAll(taskParameters); stage.addServerActionCommand(task.getImplementationClass(), getManagementController().getAuthName(), Role.AMBARI_SERVER_ACTION, RoleCommand.EXECUTE, cluster.getClusterName(), http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java index 045c9ac..ee16bf7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java @@ -18,7 +18,9 @@ package org.apache.ambari.server.state.stack.upgrade; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; @@ -31,6 +33,19 @@ public abstract class ServerSideActionTask extends Task { @XmlAttribute(name="class") protected String implClass; + @XmlElement(name = "parameter") + public List parameters; + + public Map getParameters(){ + Map result = new HashMap(); + if (parameters != null) { + for (TaskParameter parameter : parameters) { + result.put(parameter.name, parameter.value); + } + } + return result; + } + public static final String actionVerb = "Executing"; public String getImplementationClass() { http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskParameter.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskParameter.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskParameter.java new file mode 100644 index 0000000..7773a67 --- /dev/null +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskParameter.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ambari.server.state.stack.upgrade; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; + +/** + * Optional parameter defined in upgrade packs to be used by server actions. + * These parameters are passed to corresponding server action as part of the command parameters. + * */ +public class TaskParameter { + + /** + * Name of the parameter + * */ + @XmlAttribute (name = "name") + public String name; + + /** + * Parameter value + * */ + @XmlValue + public String value; +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/resources/upgrade-pack.xsd ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade-pack.xsd b/ambari-server/src/main/resources/upgrade-pack.xsd index 249725e..9e50a08 100644 --- a/ambari-server/src/main/resources/upgrade-pack.xsd +++ b/ambari-server/src/main/resources/upgrade-pack.xsd @@ -292,6 +292,15 @@ + + + + + + + + +