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 EDFD5200C25 for ; Fri, 24 Feb 2017 10:18:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EC98D160B69; Fri, 24 Feb 2017 09:18:53 +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 E7E24160B5C for ; Fri, 24 Feb 2017 10:18:52 +0100 (CET) Received: (qmail 2114 invoked by uid 500); 24 Feb 2017 09:18:52 -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 2105 invoked by uid 99); 24 Feb 2017 09:18:52 -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; Fri, 24 Feb 2017 09:18:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC998DFC1C; Fri, 24 Feb 2017 09:18:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: echekanskiy@apache.org To: commits@ambari.apache.org Message-Id: <7456420762ad46b580441e00e86e9109@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-20126. Add support for Spark2 upgrade from HDP-2.5 (dgrinenko via echekankiy) Date: Fri, 24 Feb 2017 09:18:51 +0000 (UTC) archived-at: Fri, 24 Feb 2017 09:18:54 -0000 Repository: ambari Updated Branches: refs/heads/trunk 043d6c06c -> 19da5823c AMBARI-20126. Add support for Spark2 upgrade from HDP-2.5 (dgrinenko via echekankiy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/19da5823 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19da5823 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19da5823 Branch: refs/heads/trunk Commit: 19da5823c8adc8cd18048040c93f43941c0e568f Parents: 043d6c0 Author: Eugene Chekanskiy Authored: Fri Feb 24 11:18:33 2017 +0200 Committer: Eugene Chekanskiy Committed: Fri Feb 24 11:18:33 2017 +0200 ---------------------------------------------------------------------- .../2.0.0/package/scripts/job_history_server.py | 2 +- .../2.0.0/package/scripts/livy2_server.py | 2 +- .../2.0.0/package/scripts/spark_client.py | 2 +- .../package/scripts/spark_thrift_server.py | 9 ++-- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 11 +++++ .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 50 +++++++++++++++++++ .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 39 +++++++++++++++ .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 51 ++++++++++++++++++++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 41 ++++++++++++++++ 9 files changed, 199 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/19da5823/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py index 154c83d..2631b49 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/job_history_server.py @@ -41,7 +41,7 @@ class JobHistoryServer(Script): self.install_packages(env) - def configure(self, env, upgrade_type=None): + def configure(self, env, upgrade_type=None, config_dir=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/19da5823/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py index 8c66998..cb4f5ee 100644 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py @@ -44,7 +44,7 @@ class LivyServer(Script): self.install_packages(env) - def configure(self, env, upgrade_type=None): + def configure(self, env, upgrade_type=None, config_dir=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/19da5823/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py index 2c19b88..563b7e9 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py @@ -34,7 +34,7 @@ class SparkClient(Script): self.install_packages(env) self.configure(env) - def configure(self, env, upgrade_type=None): + def configure(self, env, upgrade_type=None, config_dir=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/19da5823/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py index 426c05c..72307cb 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_thrift_server.py @@ -40,7 +40,7 @@ class SparkThriftServer(Script): self.install_packages(env) - def configure(self, env ,upgrade_type=None): + def configure(self, env, upgrade_type=None, config_dir=None): import params env.set_params(params) setup_spark(env, 'server', upgrade_type = upgrade_type, action = 'config') @@ -69,10 +69,9 @@ class SparkThriftServer(Script): import params env.set_params(params) - if params.version and check_stack_feature(StackFeature.SPARK2_THRIFTSERVER, params.version): - Logger.info("Executing Spark2 Thrift Server Stack Upgrade pre-restart") - conf_select.select(params.stack_name, "spark2", params.version) - stack_select.select("spark2-thriftserver", params.version) + Logger.info("Executing Spark2 Thrift Server Stack Upgrade pre-restart") + conf_select.select(params.stack_name, "spark2", params.version) + stack_select.select("spark2-thriftserver", params.version) def get_log_folder(self): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/19da5823/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index 3069b34..da334be 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -94,6 +94,17 @@ + + + + + spark2-defaults + + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/19da5823/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index 9516b6a..d396033 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -110,6 +110,11 @@ LIVY_SERVER + + SPARK2_JOBHISTORYSERVER + SPARK2_THRIFTSERVER + + ZEPPELIN_MASTER @@ -538,6 +543,12 @@ Add queue customization property + + + + Add queue customization property + +