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 7F14C200B48 for ; Mon, 18 Jul 2016 20:11:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7D995160A6D; Mon, 18 Jul 2016 18:11:08 +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 0207F160A5D for ; Mon, 18 Jul 2016 20:11:06 +0200 (CEST) Received: (qmail 85113 invoked by uid 500); 18 Jul 2016 18:11:06 -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 85104 invoked by uid 99); 18 Jul 2016 18:11:06 -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; Mon, 18 Jul 2016 18:11:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F7EDDFAF5; Mon, 18 Jul 2016 18:11:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alejandro@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17747. EU/RU Kafka should come right after ZK instead of before Atlas, fix role command order (alejandro) Date: Mon, 18 Jul 2016 18:11:06 +0000 (UTC) archived-at: Mon, 18 Jul 2016 18:11:08 -0000 Repository: ambari Updated Branches: refs/heads/trunk 208e75278 -> e47efc67d AMBARI-17747. EU/RU Kafka should come right after ZK instead of before Atlas, fix role command order (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e47efc67 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e47efc67 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e47efc67 Branch: refs/heads/trunk Commit: e47efc67dad09fc7fa3b73d2ac4b84bf77771cf6 Parents: 208e752 Author: Alejandro Fernandez Authored: Mon Jul 18 11:13:18 2016 -0700 Committer: Alejandro Fernandez Committed: Mon Jul 18 11:13:18 2016 -0700 ---------------------------------------------------------------------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 44 ++++++------ .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 68 +++++++----------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 58 +++++++--------- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 65 +++++++++--------- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 43 ++++++------ .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 40 +++++------ .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 45 ++++++------ .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 72 +++++++------------- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 32 ++++----- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 38 +++++------ .../stacks/HDP/2.5/role_command_order.json | 3 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 45 ++++++------ .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 32 ++++----- 13 files changed, 266 insertions(+), 319 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/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 index ef81111..36de7b8 100644 --- 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 @@ -91,10 +91,6 @@ KNOX_GATEWAY - - KAFKA_BROKER - - FALCON_SERVER @@ -201,6 +197,10 @@ RANGER_KMS_SERVER + + KAFKA_BROKER + + ZOOKEEPER_SERVER @@ -290,6 +290,15 @@ + + false + true + + + KAFKA_BROKER + + + false true @@ -414,6 +423,8 @@ true UPGRADE + ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -515,15 +526,6 @@ - - false - true - - - KAFKA_BROKER - - - false true @@ -661,6 +663,14 @@ + + + + + + + + @@ -948,14 +958,6 @@ - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index 3e46276..5752c26 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -68,10 +68,6 @@ false - - ATLAS_SERVER - - FLUME_HANDLER @@ -95,10 +91,6 @@ KNOX_GATEWAY - - KAFKA_BROKER - - FALCON_SERVER @@ -206,6 +198,10 @@ RANGER_KMS_SERVER + + KAFKA_BROKER + + ZOOKEEPER_SERVER @@ -331,6 +327,15 @@ + + false + true + + + KAFKA_BROKER + + + false true @@ -455,6 +460,8 @@ true UPGRADE + ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -508,16 +515,6 @@ - - false - true - false - - - ATLAS_SERVER - - - false true @@ -566,15 +563,6 @@ - - false - true - - - KAFKA_BROKER - - - false true @@ -639,7 +627,6 @@ UPGRADE FALCON - KAFKA KNOX STORM SLIDER @@ -712,6 +699,14 @@ + + + + + + + + @@ -999,14 +994,6 @@ - - - - - - - - @@ -1160,14 +1147,5 @@ - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml index 7be5a19..7d96155 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml @@ -77,10 +77,6 @@ false - - ATLAS_SERVER - - FLUME_HANDLER @@ -104,10 +100,6 @@ KNOX_GATEWAY - - KAFKA_BROKER - - FALCON_SERVER @@ -215,6 +207,10 @@ RANGER_KMS_SERVER + + KAFKA_BROKER + + ZOOKEEPER_SERVER @@ -409,6 +405,15 @@ + + false + true + + + KAFKA_BROKER + + + false true @@ -533,6 +538,8 @@ true UPGRADE + ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -634,15 +641,6 @@ - - false - true - - - KAFKA_BROKER - - - false true @@ -707,7 +705,6 @@ UPGRADE FALCON - KAFKA KNOX STORM SLIDER @@ -780,6 +777,14 @@ + + + + + + + + @@ -1067,14 +1072,6 @@ - - - - - - - - @@ -1224,14 +1221,5 @@ - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index 4f5778b..9360036 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -118,6 +118,13 @@ ZOOKEEPER_SERVER + + + true + + KAFKA_BROKER + + true @@ -163,6 +170,7 @@ UPGRADE ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -330,13 +338,6 @@ - - true - - KAFKA_BROKER - - - true @@ -444,6 +445,31 @@ + + + + + + + stop + + + + + + + + + + + + + + + + + @@ -787,31 +813,6 @@ - - - - - - - stop - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 46cda9b..b139d2e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -116,6 +116,13 @@ + + true + + KAFKA_BROKER + + + true false @@ -365,13 +372,6 @@ - - true - - KAFKA_BROKER - - - true @@ -478,6 +478,21 @@ + + + + + + + + + + + + + + + @@ -844,20 +859,6 @@ - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml index 47d9fdb..09007a6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml @@ -126,6 +126,13 @@ + + true + + KAFKA_BROKER + + + true false @@ -375,13 +382,6 @@ - - true - - KAFKA_BROKER - - - true @@ -524,6 +524,19 @@ + + + + + + + + + + + + + @@ -918,19 +931,6 @@ - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml index c9326aa..6ac33d3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml @@ -91,10 +91,6 @@ KNOX_GATEWAY - - KAFKA_BROKER - - FALCON_SERVER @@ -202,6 +198,10 @@ RANGER_KMS_SERVER + + KAFKA_BROKER + + ZOOKEEPER_SERVER @@ -285,6 +285,15 @@ + + false + true + + + KAFKA_BROKER + + + false true @@ -409,6 +418,8 @@ true UPGRADE + ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -510,15 +521,6 @@ - - false - true - - - KAFKA_BROKER - - - false true @@ -583,7 +585,6 @@ UPGRADE FALCON - KAFKA KNOX STORM SLIDER @@ -657,6 +658,14 @@ + + + + + + + + @@ -944,14 +953,6 @@ - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml index 2daa9b8..c82e938 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml @@ -71,11 +71,6 @@ false - - - ATLAS_SERVER - - FLUME_HANDLER @@ -99,10 +94,6 @@ KNOX_GATEWAY - - KAFKA_BROKER - - FALCON_SERVER @@ -210,6 +201,10 @@ RANGER_KMS_SERVER + + KAFKA_BROKER + + ZOOKEEPER_SERVER @@ -368,6 +363,15 @@ + + false + true + + + KAFKA_BROKER + + + false true @@ -492,6 +496,8 @@ true UPGRADE + ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -545,17 +551,6 @@ - - - false - true - false - - - ATLAS_SERVER - - - false true @@ -604,15 +599,6 @@ - - false - true - - - KAFKA_BROKER - - - false true @@ -672,13 +658,11 @@ - true UPGRADE FALCON - KAFKA KNOX STORM SLIDER @@ -752,6 +736,14 @@ + + + + + + + + @@ -1039,14 +1031,6 @@ - - - - - - - - @@ -1196,15 +1180,5 @@ - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml index 78d22ab..1c00e71 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml @@ -116,7 +116,14 @@ ZOOKEEPER_SERVER - + + + true + + KAFKA_BROKER + + + true false @@ -328,13 +335,6 @@ - - true - - KAFKA_BROKER - - - true @@ -442,6 +442,14 @@ + + + + + + + + @@ -780,14 +788,6 @@ - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml index dd7a87f..a9336bb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml @@ -121,6 +121,13 @@ + + true + + KAFKA_BROKER + + + true false @@ -370,13 +377,6 @@ - - true - - KAFKA_BROKER - - - true @@ -519,6 +519,18 @@ + + + + + + + + + + + + @@ -881,18 +893,6 @@ - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json index 64a77e2..40e8ff8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json @@ -13,7 +13,8 @@ "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "LOGSEARCH_SOLR-START"], "LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START"], "SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START","LIVY_SERVER-START"], - "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"] + "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"], + "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "LOGSEARCH_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"] }, "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster", "optional_no_glusterfs": { http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index 8c35210..03c2dd9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -95,10 +95,6 @@ KNOX_GATEWAY - - KAFKA_BROKER - - FALCON_SERVER @@ -209,6 +205,10 @@ RANGER_KMS_SERVER + + KAFKA_BROKER + + ZOOKEEPER_SERVER @@ -288,6 +288,15 @@ + + false + true + + + KAFKA_BROKER + + + false true @@ -413,6 +422,8 @@ true UPGRADE + ZOOKEEPER + KAFKA HDFS YARN MAPREDUCE2 @@ -548,15 +559,6 @@ - - false - true - - - KAFKA_BROKER - - - false true @@ -612,7 +614,6 @@ UPGRADE FALCON - KAFKA KNOX STORM FLUME @@ -685,6 +686,14 @@ + + + + + + + + @@ -989,14 +998,6 @@ - - - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/e47efc67/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index d365f79..6e45b3b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -116,7 +116,14 @@ ZOOKEEPER_SERVER - + + + true + + KAFKA_BROKER + + + true false @@ -357,13 +364,6 @@ - - true - - KAFKA_BROKER - - - true @@ -464,6 +464,14 @@ + + + + + + + + @@ -817,14 +825,6 @@ - - - - - - - -