You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by su...@apache.org on 2015/04/16 16:53:00 UTC
[2/2] falcon git commit: FALCON-1154 Replication is broken.
Contributed by Sowmya Ramesh
FALCON-1154 Replication is broken. Contributed by Sowmya Ramesh
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/3d26e7a3
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3d26e7a3
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3d26e7a3
Branch: refs/heads/0.6.1
Commit: 3d26e7a39f1e1bab8e16464bdf80d05f81ac3191
Parents: 48ac166
Author: Suhas Vasu <su...@inmobi.com>
Authored: Thu Apr 16 20:22:25 2015 +0530
Committer: Suhas Vasu <su...@inmobi.com>
Committed: Thu Apr 16 20:22:25 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../src/main/resources/hdfs-replication-workflow.xml | 4 ++++
oozie/src/main/resources/action/feed/eviction-action.xml | 4 ++++
oozie/src/main/resources/action/feed/replication-action.xml | 4 ++++
oozie/src/main/resources/action/pre-process.xml | 4 ++++
5 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/3d26e7a3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a9948fa..547ec0a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -137,6 +137,8 @@ Branch: 0.6.1 (Proposed Release Version: 0.6.1)
(Suhas vasu)
BUG FIXES
+ FALCON-1154 Replication is broken (Sowmya Ramesh via Suhas Vasu)
+
FALCON-1159 Falcon build is broken (Suhas Vasu)
FALCON-1146 feed retention policy deleted everything all the way
http://git-wip-us.apache.org/repos/asf/falcon/blob/3d26e7a3/addons/recipes/hdfs-replication/src/main/resources/hdfs-replication-workflow.xml
----------------------------------------------------------------------
diff --git a/addons/recipes/hdfs-replication/src/main/resources/hdfs-replication-workflow.xml b/addons/recipes/hdfs-replication/src/main/resources/hdfs-replication-workflow.xml
index 4ef8fc7..145d489 100644
--- a/addons/recipes/hdfs-replication/src/main/resources/hdfs-replication-workflow.xml
+++ b/addons/recipes/hdfs-replication/src/main/resources/hdfs-replication-workflow.xml
@@ -43,6 +43,10 @@
<name>oozie.action.sharelib.for.java</name>
<value>distcp</value>
</property>
+ <property>
+ <name>oozie.launcher.oozie.libpath</name>
+ <value>${wf:conf("falcon.libpath")}</value>
+ </property>
</configuration>
<main-class>org.apache.falcon.replication.FeedReplicator</main-class>
<arg>-Dmapred.job.queue.name=${queueName}</arg>
http://git-wip-us.apache.org/repos/asf/falcon/blob/3d26e7a3/oozie/src/main/resources/action/feed/eviction-action.xml
----------------------------------------------------------------------
diff --git a/oozie/src/main/resources/action/feed/eviction-action.xml b/oozie/src/main/resources/action/feed/eviction-action.xml
index 64d5793..4ab67d2 100644
--- a/oozie/src/main/resources/action/feed/eviction-action.xml
+++ b/oozie/src/main/resources/action/feed/eviction-action.xml
@@ -33,6 +33,10 @@
<name>oozie.action.sharelib.for.java</name>
<value>hcatalog</value>
</property>
+ <property>
+ <name>oozie.launcher.oozie.libpath</name>
+ <value>${wf:conf("falcon.libpath")}</value>
+ </property>
</configuration>
<main-class>org.apache.falcon.retention.FeedEvictor</main-class>
<arg>-feedBasePath</arg>
http://git-wip-us.apache.org/repos/asf/falcon/blob/3d26e7a3/oozie/src/main/resources/action/feed/replication-action.xml
----------------------------------------------------------------------
diff --git a/oozie/src/main/resources/action/feed/replication-action.xml b/oozie/src/main/resources/action/feed/replication-action.xml
index beedd57..ff8f4f3 100644
--- a/oozie/src/main/resources/action/feed/replication-action.xml
+++ b/oozie/src/main/resources/action/feed/replication-action.xml
@@ -37,6 +37,10 @@
<name>oozie.action.sharelib.for.java</name>
<value>distcp</value>
</property>
+ <property>
+ <name>oozie.launcher.oozie.libpath</name>
+ <value>${wf:conf("falcon.libpath")}</value>
+ </property>
</configuration>
<main-class>org.apache.falcon.replication.FeedReplicator</main-class>
<arg>-Dfalcon.include.path=${sourceRelativePaths}</arg>
http://git-wip-us.apache.org/repos/asf/falcon/blob/3d26e7a3/oozie/src/main/resources/action/pre-process.xml
----------------------------------------------------------------------
diff --git a/oozie/src/main/resources/action/pre-process.xml b/oozie/src/main/resources/action/pre-process.xml
index 50306e5..fc4125c 100644
--- a/oozie/src/main/resources/action/pre-process.xml
+++ b/oozie/src/main/resources/action/pre-process.xml
@@ -33,6 +33,10 @@
<name>oozie.action.sharelib.for.java</name>
<value>hcatalog</value>
</property>
+ <property>
+ <name>oozie.launcher.oozie.libpath</name>
+ <value>${wf:conf("falcon.libpath")}</value>
+ </property>
</configuration>
<main-class>org.apache.falcon.workflow.LateDataHandler</main-class>
<arg>-out</arg>