ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [2/2] ambari git commit: AMBARI-11749 - Missing entries in oozie-site.xml after Falcon rolling upgrade (jonathanhurley)
Date Sun, 07 Jun 2015 01:47:52 GMT
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/cee0071d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cee0071d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cee0071d

Branch: refs/heads/branch-2.1
Commit: cee0071d0f89116e9adaeadf3dee1c604df71c93
Parents: d908a79
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:47:38 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/cee0071d/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>


Mime
View raw message