falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [1/8] git commit: FALCON-76 Use cluster readonly endpoint for replication source. Contributed by Suhas Vasu
Date Mon, 23 Sep 2013 23:04:49 GMT
Updated Branches:
  refs/heads/FALCON-85 0879caff4 -> d1c5eafe0


FALCON-76 Use cluster readonly endpoint for replication source. Contributed by Suhas Vasu


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/76fcef48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/76fcef48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/76fcef48

Branch: refs/heads/FALCON-85
Commit: 76fcef48003f0603cb0e22f75ddc9600c6aa8665
Parents: d422dba
Author: Shwetha GS <shwethags@gmail.com>
Authored: Mon Sep 16 13:42:34 2013 +0530
Committer: Shwetha GS <shwethags@gmail.com>
Committed: Mon Sep 16 13:42:34 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                       | 3 +++
 .../main/java/org/apache/falcon/converter/OozieFeedMapper.java    | 2 +-
 .../java/org/apache/falcon/converter/OozieFeedMapperTest.java     | 2 +-
 pom.xml                                                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/76fcef48/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fbf99d3..7283f65 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,9 @@ Trunk (Unreleased)
     Srikanth Sundarrajan)
 
   BUG FIXES
+    FALCON-76 Use cluster readonly endpoint for replication source.
+    (Suhas Vasu via Shweth GS)
+
     FALCON-101 mvn release:prepare fails because of build order. (Shwetha GS
     via Srikanth Sundarrajan)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/76fcef48/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
----------------------------------------------------------------------
diff --git a/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java b/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
index adef3ec..19ea6b0 100644
--- a/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
+++ b/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java
@@ -263,7 +263,7 @@ public class OozieFeedMapper extends AbstractOozieEntityMapper<Feed>
{
             SYNCDATASET inputDataset = (SYNCDATASET) replicationCoord.getDatasets().getDatasetOrAsyncDataset().get(0);
             SYNCDATASET outputDataset = (SYNCDATASET) replicationCoord.getDatasets().getDatasetOrAsyncDataset().get(1);
 
-            inputDataset.setUriTemplate(new Path(ClusterHelper.getStorageUrl(srcCluster),
+            inputDataset.setUriTemplate(new Path(ClusterHelper.getReadOnlyStorageUrl(srcCluster),
                 FeedHelper.getLocation(feed, LocationType.DATA, srcCluster.getName()).getPath()).toString());
             outputDataset.setUriTemplate(getStoragePath(
                 FeedHelper.getLocation(feed, LocationType.DATA, trgCluster.getName()).getPath()));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/76fcef48/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
----------------------------------------------------------------------
diff --git a/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java b/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
index 7fbe179..0f3b3c2 100644
--- a/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
+++ b/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
@@ -121,7 +121,7 @@ public class OozieFeedMapperTest {
         Assert.assertEquals("${coord:minutes(20)}", inputDataset.getFrequency());
         Assert.assertEquals("input-dataset", inputDataset.getName());
         Assert.assertEquals(
-                ClusterHelper.getStorageUrl(srcCluster)
+                ClusterHelper.getReadOnlyStorageUrl(srcCluster)
                         + "/examples/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}",
                 inputDataset.getUriTemplate());
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/76fcef48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d211e21..70ff77a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <slf4j.version>1.2</slf4j.version>
         <oozie.version>3.2.2</oozie.version>
         <activemq.version>5.4.3</activemq.version>
-        <hadoop-distcp.version>0.3</hadoop-distcp.version>
+        <hadoop-distcp.version>0.9</hadoop-distcp.version>
         <jetty.version>6.1.26</jetty.version>
         <internal.maven.repo>file:///tmp/falcontemprepo</internal.maven.repo>
         <skipCheck>false</skipCheck>


Mime
View raw message