Return-Path: 
 <commits-return-17509-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 888C9177A1
	for <apmail-ambari-commits-archive@www.apache.org>;
 Sun,  7 Jun 2015 01:46:51 +0000 (UTC)
Received: (qmail 2462 invoked by uid 500); 7 Jun 2015 01:46:51 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 2431 invoked by uid 500); 7 Jun 2015 01:46:51 -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 2421 invoked by uid 99); 7 Jun 2015 01:46:51 -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; Sun, 07 Jun 2015 01:46:51 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 0FF22DFCDD; Sun,  7 Jun 2015 01:46:50 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jonathanhurley@apache.org
To: commits@ambari.apache.org
Date: Sun, 07 Jun 2015 01:46:51 -0000
Message-Id: <b0c95ce48bf9400d8f9e0495f24f659e@git.apache.org>
In-Reply-To: <2623008169f54719a3ab04cf464308bd@git.apache.org>
References: <2623008169f54719a3ab04cf464308bd@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] ambari git commit: AMBARI-11749 - Missing entries in
 oozie-site.xml after Falcon rolling upgrade (jonathanhurley)

AMBARI-11749 - Missing entries in oozie-site.xml after Falcon rolling upgrade (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 4a0227e6e3f9e26b78dfa8a7ff714702231c677b
Parents: 5722f52
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Fri Jun 5 23:48:11 2015 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Sat Jun 6 21:21:25 2015 -0400

----------------------------------------------------------------------
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a0227e6/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 0cee7b1..7967173 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -901,6 +901,15 @@
               <keep-key>oozie.service.HadoopAccessorService.hadoop.configurations</keep-key>
               <keep-key>oozie.service.HadoopAccessorService.kerberos.enabled</keep-key>
               <keep-key>oozie.service.URIHandlerService.uri.handlers</keep-key>
+
+              <!-- required by Falcon and should be preserved -->
+              <keep-key>oozie.service.ELService.ext.functions.coord-job-submit-instances</keep-key>
+              <keep-key>oozie.service.ELService.ext.functions.coord-action-create-inst</keep-key>
+              <keep-key>oozie.service.ELService.ext.functions.coord-action-create</keep-key>
+              <keep-key>oozie.service.ELService.ext.functions.coord-job-submit-data</keep-key>
+              <keep-key>oozie.service.ELService.ext.functions.coord-action-start</keep-key>
+              <keep-key>oozie.service.ELService.ext.functions.coord-sla-submit</keep-key>
+              <keep-key>oozie.service.ELService.ext.functions.coord-sla-create</keep-key>
             </transfer>
           </task>
         </pre-upgrade>
@@ -917,18 +926,6 @@
 
     <service name="FALCON">
       <component name="FALCON_SERVER">
-        <pre-upgrade>
-          <task xsi:type="configure">
-            <type>oozie-site</type>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-job-submit-instances" to-key="oozie.service.ELService.ext.functions.coord-job-submit-instances"/>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-action-create-inst" to-key="oozie.service.ELService.ext.functions.coord-action-create-inst"/>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-action-create" to-key="oozie.service.ELService.ext.functions.coord-action-create"/>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-job-submit-data" to-key="oozie.service.ELService.ext.functions.coord-job-submit-data"/>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-action-start" to-key="oozie.service.ELService.ext.functions.coord-action-start"/>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-sla-submit" to-key="oozie.service.ELService.ext.functions.coord-sla-submit"/>
-            <transfer operation="copy" from-key="oozie.service.ELService.ext.functions.coord-sla-create" to-key="oozie.service.ELService.ext.functions.coord-sla-create"/>
-          </task>
-        </pre-upgrade>
         <upgrade>
           <task xsi:type="restart" />
         </upgrade>