ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-17436. Falcon fixes: Fix permissiosn for extensions folder and rename the extensions folder (Venkat Ranganathan via alejandro) [Forced Update!]
Date Wed, 29 Jun 2016 21:24:18 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 834b658b8 -> 278e442ad (forced update)


AMBARI-17436. Falcon fixes: Fix permissiosn for extensions folder and rename the extensions
folder (Venkat Ranganathan via alejandro)


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

Branch: refs/heads/trunk
Commit: 278e442adf07bed539c842945607cae0968f1afe
Parents: 1f73cbe
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Wed Jun 29 14:21:34 2016 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Wed Jun 29 14:26:21 2016 -0700

----------------------------------------------------------------------
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py  | 17 +++----
 .../FALCON/configuration/oozie-site.xml         | 47 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/278e442a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
index 2fd1add..c2f1f53 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
@@ -144,13 +144,6 @@ def falcon(type, action = None, upgrade_type=None):
           source = params.local_data_mirroring_dir)
 
       if params.supports_falcon_extensions:
-        # In HDP 2.5, data-mirroring directory is still needed by Falcon for the data store,
but don't copy any content.
-        # Instead, copy the extensions folder to HDFS.
-        params.HdfsResource(params.dfs_data_mirroring_dir,
-                            type = "directory",
-                            action = "create_on_execute",
-                            owner = params.falcon_user,
-                            mode = 0777)
 
         params.HdfsResource(params.falcon_extensions_dest_dir,
                             type = "directory",
@@ -159,8 +152,16 @@ def falcon(type, action = None, upgrade_type=None):
                             group = params.proxyuser_group,
                             recursive_chown = True,
                             recursive_chmod = True,
-                            mode = 0770,
+                            mode = 0755,
                             source = params.falcon_extensions_source_dir)
+        # Create the extensons HiveDR store
+        params.HdfsResource(os.path.join(params.falcon_extensions_dest_dir, "mirroring"),
+                            type = "directory",
+                            action = "create_on_execute",
+                            owner = params.falcon_user,
+                            group = params.proxyuser_group,
+                            mode = 0770)
+
       # At least one HDFS Dir should be created, so execute the change now.
       params.HdfsResource(None, action = "execute")
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/278e442a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
new file mode 100644
index 0000000..191e667
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<configuration supports_final="false">
+  <property>
+    <name>oozie.service.ELService.ext.functions.workflow</name>
+    <value>
+      now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
+      today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
+      yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
+      currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
+      lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
+      currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
+      lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
+      formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
+      latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
+      future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
+    </value>
+    <description>
+      EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
+      This property is a convenience property to add extensions to the built in executors
without having to
+      include all the built in ones.
+    </description>
+    <value-attributes>
+      <type>custom</type>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+</configuration>


Mime
View raw message