Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A33351833F for ; Thu, 22 Oct 2015 08:35:26 +0000 (UTC) Received: (qmail 75094 invoked by uid 500); 22 Oct 2015 08:35:26 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 75055 invoked by uid 500); 22 Oct 2015 08:35:26 -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 75046 invoked by uid 99); 22 Oct 2015 08:35:26 -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; Thu, 22 Oct 2015 08:35:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C974E0A31; Thu, 22 Oct 2015 08:35:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Thu, 22 Oct 2015 08:35:26 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-13407. Express Upgrade: Create other Upgrade Packs and Config Packs (dlysnichenko) Repository: ambari Updated Branches: refs/heads/branch-2.1 8024c6516 -> 374cd6854 refs/heads/trunk 5eff7979a -> e652b3587 AMBARI-13407. Express Upgrade: Create other Upgrade Packs and Config Packs (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/374cd685 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/374cd685 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/374cd685 Branch: refs/heads/branch-2.1 Commit: 374cd6854e4dc893a57dfd4059b2ef0ace5df41a Parents: 8024c65 Author: Lisnichenko Dmitro Authored: Thu Oct 22 11:34:18 2015 +0300 Committer: Lisnichenko Dmitro Committed: Thu Oct 22 11:34:18 2015 +0300 ---------------------------------------------------------------------- .../server/checks/ClientRetryPropertyCheck.java | 2 +- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 89 +++ .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 680 +++++++++++++++++++ .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 519 ++++++++++++++ 4 files changed, 1289 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/374cd685/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java index 368bcb8..257d575 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java @@ -37,7 +37,7 @@ import com.google.inject.Singleton; * client retry properties for HDFS, HIVE, and OOZIE are set. */ @Singleton -@UpgradeCheck(group = UpgradeCheckGroup.CLIENT_RETRY_PROPERTY, required = true) +@UpgradeCheck(group = UpgradeCheckGroup.CLIENT_RETRY_PROPERTY, required = false) public class ClientRetryPropertyCheck extends AbstractCheckDescriptor { static final String HIVE_CLIENT_RETRY_MISSING_KEY = "hive.client.retry.missing.key"; http://git-wip-us.apache.org/repos/asf/ambari/blob/374cd685/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml index af2d1d9..c8ce933 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml @@ -181,10 +181,99 @@ UPGRADE false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/374cd685/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml new file mode 100644 index 0000000..d71387a --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml @@ -0,0 +1,680 @@ + + + + + + 2.3.*.* + HDP-2.3 + NON_ROLLING + false + + + + + + true + UPGRADE + + + Before continuing, please stop all YARN queues. If yarn-site's yarn.resourcemanager.work-preserving-recovery.enabled is set to true, then you can skip this step since the clients will retry on their own. + + + + + + Before continuing, please stop all long-running applications deployed using Slider. E.g., su - yarn "/usr/hdp/current/slider-client/bin/slider stop <app_name>" + + + + + + Before continuing, please deactivate and kill any currently running topologies. + + + + + + true + false + + + FLUME_HANDLER + + + + DRPC_SERVER + STORM_UI_SERVER + SUPERVISOR + STORM_REST_API + NIMBUS + + + + KNOX_GATEWAY + + + + KAFKA_BROKER + + + + FALCON_SERVER + + + + OOZIE_SERVER + + + + SPARK_JOBHISTORYSERVER + + + + WEBHCAT_SERVER + HIVE_SERVER + HIVE_METASTORE + + + + NODEMANAGER + RESOURCEMANAGER + APP_TIMELINE_SERVER + + + + HISTORYSERVER + + + + + UPGRADE + true + + + Before continuing, please backup the Oozie Server database on {{hosts.all}}. + + + + + + Before continuing, please backup the Hive Metastore database located on the following host(s): {{hosts.all}}. + + + + + + + Before continuing, please backup the Knox data. E.g., "cp -RL /etc/knox/data/security ~/knox_backup" on the following host(s): {{hosts.all}}. + + + + + + + take_snapshot + + + + + + + prepare_non_rolling_upgrade + + + + + + Before continuing, please backup the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. + + + + + + + + true + false + + + HBASE_REGIONSERVER + HBASE_MASTER + + + + DATANODE + NAMENODE + SECONDARY_NAMENODE + ZKFC + JOURNALNODE + + + + RANGER_USERSYNC + RANGER_ADMIN + + + + ZOOKEEPER_SERVER + + + + + UPGRADE + + + + + DOWNGRADE + true + + + + + + Before continuing, please restore the Oozie Server database on {{hosts.all}}. + + + + + + Before continuing, please restore the Hive Metastore database located on the following host(s): {{hosts.all}}. + + + + + + Before continuing, please restore the Knox data. E.g., "cp -RL ~/knox_backup/* /etc/knox/data/security/" on the following host(s): {{hosts.all}}. + + + + + + + restore_snapshot + + + + + + + restore_snapshot + + + + + + Before continuing, please restore the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. + + + + + + + + UPGRADE + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + actionexecute + + + + + + + + false + true + + false + ZOOKEEPER_SERVER + ZOOKEEPER_CLIENT + + + + + false + true + + RANGER_ADMIN + RANGER_USERSYNC + RANGER_KMS_SERVER + + + + + false + true + + JOURNALNODE + ZKFC + NAMENODE + SECONDARY_NAMENODE + DATANODE + HDFS_CLIENT + + + + + false + true + UPGRADE + + + + + wait_for_safemode_off + + + + + + false + true + + HISTORYSERVER + MAPREDUCE2_CLIENT + + + APP_TIMELINE_SERVER + RESOURCEMANAGER + NODEMANAGER + YARN_CLIENT + + + + + false + true + + HBASE_MASTER + HBASE_REGIONSERVER + HBASE_CLIENT + + + + + false + true + + + TEZ_CLIENT + + + + PIG + + + + SQOOP + + + + + true + UPGRADE + + HDFS + YARN + MAPREDUCE2 + HBASE + + + + + false + true + + HIVE_METASTORE + HIVE_SERVER + WEBHCAT_SERVER + HIVE_CLIENT + HCAT + + + + + + UPGRADE + true + + + + upgrade_oozie_database_and_sharelib + + + + + + + DOWNGRADE + true + + + + create_sharelib + + + + + + false + true + + OOZIE_SERVER + OOZIE_CLIENT + + + + + false + true + + FALCON_SERVER + FALCON_CLIENT + + + + + false + true + + KAFKA_BROKER + + + + + false + true + + KNOX_GATEWAY + + + + + false + true + + NIMBUS + STORM_REST_API + SUPERVISOR + STORM_UI_SERVER + DRPC_SERVER + + + + + Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar. + + + + + + false + true + + FLUME_HANDLER + + + + + true + + + The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}} + + + + + UPGRADE + + Please confirm you are ready to finalize. + + + + + + + finalize_non_rolling_upgrade + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/374cd685/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml new file mode 100644 index 0000000..e92a413 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml @@ -0,0 +1,519 @@ + + + + + + 2.3.*.* + HDP-2.3 + NON_ROLLING + + + + + + true + UPGRADE + + + Before continuing, please stop all YARN queues. If yarn-site's yarn.resourcemanager.work-preserving-recovery.enabled is set to true, then you can skip this step since the clients will retry on their own. + + + + + + Before continuing, please stop all long-running applications deployed using Slider. E.g., su - yarn "/usr/hdp/current/slider-client/bin/slider stop <app_name>" + + + + + + Before continuing, please deactivate and kill any currently running topologies. + + + + + + true + false + + + FLUME_HANDLER + + + + DRPC_SERVER + STORM_UI_SERVER + SUPERVISOR + STORM_REST_API + NIMBUS + + + + KNOX_GATEWAY + + + + KAFKA_BROKER + + + + FALCON_SERVER + + + + OOZIE_SERVER + + + + SPARK_JOBHISTORYSERVER + + + + WEBHCAT_SERVER + HIVE_SERVER + HIVE_METASTORE + + + + NODEMANAGER + RESOURCEMANAGER + APP_TIMELINE_SERVER + + + + HISTORYSERVER + + + + + UPGRADE + true + + + Before continuing, please backup the Oozie Server database on {{hosts.all}}. + + + + + + Before continuing, please backup the Hive Metastore database located on the following host(s): {{hosts.all}}. + + + + + + + Before continuing, please backup the Knox data. E.g., "cp -RL /etc/knox/data/security ~/knox_backup" on the following host(s): {{hosts.all}}. + + + + + + + take_snapshot + + + + + + + prepare_non_rolling_upgrade + + + + + + Before continuing, please backup the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. + + + + + + Before continuing, please backup Ranger KMS database + + + + + + true + false + + + HBASE_REGIONSERVER + HBASE_MASTER + PHOENIX_QUERY_SERVER + + + + DATANODE + NAMENODE + SECONDARY_NAMENODE + ZKFC + JOURNALNODE + NFS_GATEWAY + + + + RANGER_USERSYNC + RANGER_ADMIN + RANGER_KMS_SERVER + + + + ZOOKEEPER_SERVER + + + + + UPGRADE + + + + + DOWNGRADE + true + + + + + + Before continuing, please restore the Oozie Server database on {{hosts.all}}. + + + + + + Before continuing, please restore the Hive Metastore database located on the following host(s): {{hosts.all}}. + + + + + + Before continuing, please restore the Knox data. E.g., "cp -RL ~/knox_backup/* /etc/knox/data/security/" on the following host(s): {{hosts.all}}. + + + + + + + restore_snapshot + + + + + + + restore_snapshot + + + + + + Before continuing, please restore the Ranger Admin database and Ranger Audit database on the following host(s): {{hosts.all}}. + + + + + + + + + + + + + + true + + + + actionexecute + + + + + + + + false + true + + false + ZOOKEEPER_SERVER + ZOOKEEPER_CLIENT + + + + + false + true + + RANGER_ADMIN + RANGER_USERSYNC + RANGER_KMS_SERVER + + + + + false + true + + JOURNALNODE + ZKFC + NAMENODE + SECONDARY_NAMENODE + DATANODE + HDFS_CLIENT + NFS_GATEWAY + + + + + false + true + UPGRADE + + + + + wait_for_safemode_off + + + + + + false + true + + HISTORYSERVER + MAPREDUCE2_CLIENT + + + APP_TIMELINE_SERVER + RESOURCEMANAGER + NODEMANAGER + YARN_CLIENT + + + + + false + true + + HBASE_MASTER + HBASE_REGIONSERVER + HBASE_CLIENT + PHOENIX_QUERY_SERVER + + + + + false + true + + + TEZ_CLIENT + + + + MAHOUT + + + + PIG + + + + SQOOP + + + + + true + UPGRADE + + HDFS + YARN + MAPREDUCE2 + HBASE + + + + + false + true + + HIVE_METASTORE + HIVE_SERVER + WEBHCAT_SERVER + HIVE_CLIENT + HCAT + + + + + false + true + + SPARK_JOBHISTORYSERVER + SPARK_CLIENT + + + + + + UPGRADE + true + + + + upgrade_oozie_database_and_sharelib + + + + + + + DOWNGRADE + true + + + + create_sharelib + + + + + + false + true + + OOZIE_SERVER + OOZIE_CLIENT + + + + + false + true + + FALCON_SERVER + FALCON_CLIENT + + + + + false + true + + KAFKA_BROKER + + + + + false + true + + KNOX_GATEWAY + + + + + false + true + + NIMBUS + STORM_REST_API + SUPERVISOR + STORM_UI_SERVER + DRPC_SERVER + + + + + + Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar. + + + + + + true + + ACCUMULO_MASTER + ACCUMULO_TSERVER + ACCUMULO_MONITOR + ACCUMULO_GC + ACCUMULO_TRACER + ACCUMULO_CLIENT + + + + + + Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar. + + + + + + false + true + + SLIDER + + + + + false + true + + FLUME_HANDLER + + + + + true + + + The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}} + + + + + UPGRADE + + Please confirm you are ready to finalize. + + + + + + + finalize_non_rolling_upgrade + + + + + + + + + + \ No newline at end of file