falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rag...@apache.org
Subject git commit: FALCON-693 Tests with zero inp/outp fixed to use correct workflow, javadocs added. Contributed by Paul Isaychuk
Date Thu, 11 Sep 2014 23:33:11 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 1052de969 -> 0510172c5


FALCON-693 Tests with zero inp/outp fixed to use correct workflow, javadocs added. 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/0510172c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/0510172c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/0510172c

Branch: refs/heads/master
Commit: 0510172c55a066d2f9021f579bde0ebedc5cbb01
Parents: 1052de9
Author: Raghav Kumar Gautam <raghav@apache.org>
Authored: Thu Sep 11 16:33:06 2014 -0700
Committer: Raghav Kumar Gautam <raghav@apache.org>
Committed: Thu Sep 11 16:33:06 2014 -0700

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                      |  3 +++
 .../falcon/regression/NoOutputProcessTest.java     | 17 ++++++++++++++---
 .../regression/prism/PrismFeedUpdateTest.java      |  6 +++++-
 3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0510172c/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index c000eeb..4810bbe 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -9,6 +9,9 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+   FALCON-693 Tests with zero inp/outp fixed to use correct workflow, javadocs
+   added (Paul Isaychuk)
+
    FALCON-711 Test retagged (Paul Isaychuk)
 
    FALCON-696 Pull oozie logs at the end of tests (Raghav Kumar Gautam)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0510172c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
index 638768d..45714ce 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
@@ -58,13 +58,13 @@ public class NoOutputProcessTest extends BaseTestClass {
     OozieClient clusterOC = serverOC.get(0);
     String testDir = baseHDFSDir + "/NoOutputProcessTest";
     String inputPath = testDir + "/input" + MINUTE_DATE_PATTERN;
-    String aggregateWorkflowDir = testDir + "/aggregator";
+    String workflowForNoIpOp = baseHDFSDir + "/PrismProcessScheduleTest/noInOp";
     private static final Logger logger = Logger.getLogger(NoOutputProcessTest.class);
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
         logger.info("in @BeforeClass");
-        HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
+        uploadDirToClusters(workflowForNoIpOp, OSUtil.RESOURCES + "workflows/aggregatorNoOutput/");
         Bundle b = BundleUtil.readELBundle();
         b.generateUniqueBundle();
         b = new Bundle(b, cluster);
@@ -83,12 +83,13 @@ public class NoOutputProcessTest extends BaseTestClass {
         bundles[0] = BundleUtil.readELBundle();
         bundles[0].generateUniqueBundle();
         bundles[0] = new Bundle(bundles[0], cluster);
-        bundles[0].setProcessWorkflow(aggregateWorkflowDir);
+        bundles[0].setProcessWorkflow(workflowForNoIpOp);
         bundles[0].setInputFeedDataPath(inputPath);
         bundles[0].setProcessValidity("2010-01-03T02:30Z", "2010-01-03T02:45Z");
         bundles[0].setProcessPeriodicity(5, TimeUnit.minutes);
         ProcessMerlin process = new ProcessMerlin(bundles[0].getProcessData());
         process.setOutputs(null);
+        process.setLateProcess(null);
         bundles[0].setProcessData(process.toString());
         bundles[0].submitFeedsScheduleProcess(prism);
     }
@@ -98,6 +99,11 @@ public class NoOutputProcessTest extends BaseTestClass {
         removeBundles();
     }
 
+    /**
+     * Waits till process ends successfully. Check that JMS messages related to entities
+     * reflects info about succeeded process instances as expected.
+     * @throws Exception
+     */
     @Test(enabled = true, groups = {"singleCluster"})
     public void checkForJMSMsgWhenNoOutput() throws Exception {
         logger.info("attaching messageConsumer to:   " + "FALCON.ENTITY.TOPIC");
@@ -114,6 +120,11 @@ public class NoOutputProcessTest extends BaseTestClass {
         Util.printMessageData(messageConsumer);
     }
 
+    /**
+     * Waits till process ends successfully. Checks that JMS messages related to entities
+     * and to particular process reflects info about succeeded process instances as expected.
+     * @throws Exception
+     */
     @Test(enabled = true, groups = {"singleCluster"})
     public void rm() throws Exception {
         JmsMessageConsumer consumerEntityMsg =

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0510172c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
index 9c71375..7d6a90c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
@@ -63,6 +63,7 @@ public class PrismFeedUpdateTest extends BaseTestClass {
     OozieClient cluster1OC = serverOC.get(0);
     String baseTestDir = baseHDFSDir + "/PrismFeedUpdateTest";
     String aggregateWorkflowDir = baseTestDir + "/aggregator";
+    String workflowForNoIpOp = baseHDFSDir + "/PrismProcessScheduleTest/noinop";
     public final String cluster1colo = cluster1.getClusterHelper().getColoName();
     public final String cluster2colo = cluster2.getClusterHelper().getColoName();
     private static final Logger logger = Logger.getLogger(PrismFeedUpdateTest.class);
@@ -71,6 +72,7 @@ public class PrismFeedUpdateTest extends BaseTestClass {
     @BeforeClass(alwaysRun = true)
     public void uploadWorkflow() throws Exception {
         uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
+        uploadDirToClusters(workflowForNoIpOp, OSUtil.RESOURCES + "workflows/aggregatorNoOutput/");
     }
 
     @BeforeMethod(alwaysRun = true)
@@ -91,12 +93,14 @@ public class PrismFeedUpdateTest extends BaseTestClass {
     }
 
     /**
-     * TODO : complete test case
+     * Set 2 processes with common output feed. Second one is zero-input process. Update
feed
+     * queue. TODO : complete test case
      */
     @Test(enabled = true, timeOut = 1200000)
     public void updateFeedQueue_dependentMultipleProcess_oneProcessZeroInput() throws Exception
{
         //cluster1colo and cluster2colo are source. feed01 on cluster1colo target cluster2colo,
         // feed02 on cluster2colo target cluster1colo
+        bundles[0].setProcessWorkflow(workflowForNoIpOp);
         String cluster1Def = bundles[0].getClusters().get(0);
         String cluster2Def = bundles[1].getClusters().get(0);
 


Mime
View raw message