Return-Path: 
 <commits-return-15128-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
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 492FF1755E
	for <apmail-ambari-commits-archive@www.apache.org>;
 Wed,  4 Mar 2015 14:57:26 +0000 (UTC)
Received: (qmail 38056 invoked by uid 500); 4 Mar 2015 14:57:24 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 38025 invoked by uid 500); 4 Mar 2015 14:57:24 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 38016 invoked by uid 99); 4 Mar 2015 14:57:24 -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, 04 Mar 2015 14:57:24 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 33287E0833; Wed,  4 Mar 2015 14:57:24 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ncole@apache.org
To: commits@ambari.apache.org
Message-Id: <e920629551684d71ba9af81b5c772771@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-9904. RU: Clarify Hive Metastore
 instructions (ncole)
Date: Wed,  4 Mar 2015 14:57:24 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 bb8cef4d2 -> 2ae008c82


AMBARI-9904. RU: Clarify Hive Metastore instructions (ncole)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ae008c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ae008c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ae008c8

Branch: refs/heads/branch-2.0.0
Commit: 2ae008c822fdf814002cf3b8ebab5f26942f55c9
Parents: bb8cef4
Author: Nate Cole <ncole@hortonworks.com>
Authored: Wed Mar 4 09:57:19 2015 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Wed Mar 4 09:57:19 2015 -0500

----------------------------------------------------------------------
 .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ae008c8/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 539b3e7..4cdccb1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -40,7 +40,7 @@
 
       <execute-stage service="HIVE" component="HIVE_METASTORE" title="Pre Upgrade Hive">
         <task xsi:type="manual">
-          <message>Before continuing, please backup the Hive Metastore database located on the following host(s): {{hosts.all}}.  During the upgrade process, you will be instructed when it is time to upgrade the Hive Metastore database.  To prepare, review the README documentation at /usr/hdp/{{version}}/hive/scripts/metastore/upgrade for when you are asked to perform this manual step (during the Hive stage of upgrade).  Do not upgrade the database at this time.  You will be prompted when to perform the database upgrade.</message>
+          <message>Before continuing, please backup the Hive Metastore database located on the following host(s): {{hosts.all}}.  During the upgrade process, you will be instructed when it is time to upgrade the Hive Metastore database.  To prepare, review the README documentation at /usr/hdp/{{version}}/hive/scripts/metastore/upgrade/[db] for the correct database type when you are asked to perform this manual step (during the Hive stage of upgrade).  Do NOT upgrade the database at this time.  You will be prompted when to perform the database upgrade.</message>
         </task>
       </execute-stage>
 
@@ -427,7 +427,7 @@
       <component name="HIVE_METASTORE">
         <pre-upgrade>
           <task xsi:type="manual">
-            <message>The Hive Metastore database schema must be upgraded before proceeding.  Please consult the README documentation at /usr/hdp/{{version}}/hive/scripts/metastore/upgrade to correctly upgrade the Hive Metastore database. This database upgrade should be performed on the following host(s): {{hosts.all}}.</message>
+            <message>The Hive Metastore database schema must be upgraded before proceeding.  Please consult the README documentation at /usr/hdp/{{version}}/hive/scripts/metastore/upgrade/[db] for the correct database type to correctly upgrade the Hive Metastore database.  Note that the README may indicate to stop the Metastore; this step is not required, as Ambari will restart the required processes.  The database upgrade should be performed on the following host(s): {{hosts.all}}.</message>
           </task>
         </pre-upgrade>
         <pre-downgrade />