You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sa...@apache.org on 2014/08/07 07:29:21 UTC
[5/6] git commit: FALCON 568 contributed by Paul Isaychuk
FALCON 568 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/b79e10af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/b79e10af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/b79e10af
Branch: refs/heads/master
Commit: b79e10afacd727b19ac8146735020dfcc093a7f0
Parents: 9094742
Author: Samarth Gupta <sa...@inmobi.com>
Authored: Thu Aug 7 10:56:49 2014 +0530
Committer: Samarth Gupta <sa...@inmobi.com>
Committed: Thu Aug 7 10:56:49 2014 +0530
----------------------------------------------------------------------
.../falcon/regression/prism/RescheduleKilledProcessTest.java | 7 -------
.../regression/prism/RescheduleProcessInFinalStatesTest.java | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b79e10af/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
index 0e2d8eb..2ba441c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
@@ -23,7 +23,6 @@ import org.apache.falcon.regression.core.bundle.Bundle;
import org.apache.falcon.regression.core.helpers.ColoHelper;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.HadoopUtil;
import org.apache.falcon.regression.core.util.InstanceUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
@@ -31,7 +30,6 @@ import org.apache.falcon.regression.core.util.Util;
import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
@@ -47,7 +45,6 @@ import java.util.Random;
public class RescheduleKilledProcessTest extends BaseTestClass {
ColoHelper cluster = servers.get(0);
- FileSystem clusterFS = serverFS.get(0);
String aggregateWorkflowDir = baseHDFSDir + "/RescheduleKilledProcessTest/aggregator";
private static final Logger logger = Logger.getLogger(RescheduleKilledProcessTest.class);
@@ -117,10 +114,6 @@ public class RescheduleKilledProcessTest extends BaseTestClass {
bundles[0].setInputFeedDataPath(
baseHDFSDir + "/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
- String prefix = InstanceUtil.getFeedPrefix(bundles[0].getInputFeedFromBundle());
- HadoopUtil.deleteDirIfExists(prefix.substring(1), clusterFS);
- HadoopUtil.lateDataReplenish(clusterFS, 40, 1, prefix, null);
-
logger.info("process: " + Util.prettyPrintXml(bundles[0].getProcessData()));
bundles[0].submitFeedsScheduleProcess(prism);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b79e10af/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
index 1e37011..a81475d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
@@ -68,8 +68,8 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
b = new Bundle(b, cluster);
b.setProcessWorkflow(aggregateWorkflowDir);
- String startDate = "2010-01-01T20:00Z";
- String endDate = "2010-01-03T01:04Z";
+ String startDate = "2010-01-02T00:40Z";
+ String endDate = "2010-01-02T01:20Z";
b.setInputFeedDataPath(inputPath);
String prefix = b.getFeedDataPathPrefix();