falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rag...@apache.org
Subject git commit: FALCON-833 FeedReplicationTest.availabilityFlagTest fix. Contributed by Paul Isaychuk
Date Sat, 25 Oct 2014 22:22:20 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 3c5edec9d -> fd774c93d


FALCON-833 FeedReplicationTest.availabilityFlagTest fix. Contributed by Paul Isaychuk


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

Branch: refs/heads/master
Commit: fd774c93d98056300e5f3a41b9e267ee446036a5
Parents: 3c5edec
Author: Raghav Kumar Gautam <raghav@apache.org>
Authored: Sat Oct 25 15:19:52 2014 -0700
Committer: Raghav Kumar Gautam <raghav@apache.org>
Committed: Sat Oct 25 15:19:52 2014 -0700

----------------------------------------------------------------------
 falcon-833.diff                                 | 44 ++++++++++++++++++++
 falcon-regression/CHANGES.txt                   |  3 ++
 .../falcon/regression/FeedReplicationTest.java  |  5 ++-
 .../src/test/resources/availabilityFlag.txt     |  1 +
 4 files changed, 51 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fd774c93/falcon-833.diff
----------------------------------------------------------------------
diff --git a/falcon-833.diff b/falcon-833.diff
new file mode 100644
index 0000000..899bf58
--- /dev/null
+++ b/falcon-833.diff
@@ -0,0 +1,44 @@
+From bcedcd91b763c68e887acc97db94a0f1a980435c Mon Sep 17 00:00:00 2001
+From: pisaychuk <pisaychuk@hortonworks.com>
+Date: Thu, 23 Oct 2014 16:30:41 +0300
+Subject: [PATCH] separate availability flag file added
+
+---
+ .../test/java/org/apache/falcon/regression/FeedReplicationTest.java  | 5 +++--
+ falcon-regression/merlin/src/test/resources/availabilityFlag.txt     | 1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+ create mode 100644 falcon-regression/merlin/src/test/resources/availabilityFlag.txt
+
+diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+index 3526e46..6cbb9ab 100644
+--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
++++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+@@ -274,7 +274,7 @@ public class FeedReplicationTest extends BaseTestClass {
+         LOGGER.info("Time range between : " + startTime + " and " + endTime);
+ 
+         //configure feed
+-        String availabilityFlagName = "README.md";
++        String availabilityFlagName = "availabilityFlag.txt";
+         String feedName = Util.readEntityName(bundles[0].getDataSets().get(0));
+         FeedMerlin feedElement = bundles[0].getFeedElement(feedName);
+         feedElement.setAvailabilityFlag(availabilityFlagName);
+@@ -332,7 +332,8 @@ public class FeedReplicationTest extends BaseTestClass {
+         LOGGER.info("Replication didn't start.");
+ 
+         //create availability flag on source
+-        HadoopUtil.copyDataToFolder(cluster1FS, sourceLocation, availabilityFlagName);
++        HadoopUtil.copyDataToFolder(cluster1FS, sourceLocation,
++            OSUtil.RESOURCES + availabilityFlagName);
+ 
+         //check if instance become running
+         InstanceUtil.waitTillInstanceReachState(cluster2OC, Util.readEntityName(feed), 1,
+diff --git a/falcon-regression/merlin/src/test/resources/availabilityFlag.txt b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
+@@ -0,0 +1 @@
++
+-- 
+1.9.1
+

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fd774c93/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 93f49eb..b59c00f 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -5,6 +5,9 @@ Trunk (Unreleased)
   INCOMPATIBLE CHANGES
 
   NEW FEATURES
+   FALCON-833 FeedReplicationTest.availabilityFlagTest fix (Paul Isaychuk
+   via Raghav Kumar Gautam)
+
    FALCON-838 Add support for https in merlin (Raghav Kumar Gautam and
    Ruslan Ostafiychuk via Raghav Kumar Gautam)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fd774c93/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
index 3526e46..6cbb9ab 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
@@ -274,7 +274,7 @@ public class FeedReplicationTest extends BaseTestClass {
         LOGGER.info("Time range between : " + startTime + " and " + endTime);
 
         //configure feed
-        String availabilityFlagName = "README.md";
+        String availabilityFlagName = "availabilityFlag.txt";
         String feedName = Util.readEntityName(bundles[0].getDataSets().get(0));
         FeedMerlin feedElement = bundles[0].getFeedElement(feedName);
         feedElement.setAvailabilityFlag(availabilityFlagName);
@@ -332,7 +332,8 @@ public class FeedReplicationTest extends BaseTestClass {
         LOGGER.info("Replication didn't start.");
 
         //create availability flag on source
-        HadoopUtil.copyDataToFolder(cluster1FS, sourceLocation, availabilityFlagName);
+        HadoopUtil.copyDataToFolder(cluster1FS, sourceLocation,
+            OSUtil.RESOURCES + availabilityFlagName);
 
         //check if instance become running
         InstanceUtil.waitTillInstanceReachState(cluster2OC, Util.readEntityName(feed), 1,

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fd774c93/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/availabilityFlag.txt b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
@@ -0,0 +1 @@
+


Mime
View raw message