You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/01/05 18:58:00 UTC
falcon git commit: FALCON-978 Refactoring FeedLateRerunTest to be
parametrized test. Contributed by Paul Isaychuk
Repository: falcon
Updated Branches:
refs/heads/master 16f9c6ecb -> b17baec7d
FALCON-978 Refactoring FeedLateRerunTest to be parametrized test. Contributed by Paul Isaychuk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/b17baec7
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/b17baec7
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/b17baec7
Branch: refs/heads/master
Commit: b17baec7da4665848799f666c8b57e1b526031ef
Parents: 16f9c6e
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Mon Jan 5 19:56:26 2015 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Mon Jan 5 19:56:26 2015 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 +
.../falcon/regression/FeedLateRerunTest.java | 94 +++-----------------
2 files changed, 16 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/b17baec7/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 12b9d14..725b1cb 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -36,6 +36,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-978 Refactoring FeedLateRerunTest to be parametrized test (Paul Isaychuk via Ruslan Ostafiychuk)
+
FALCON-979 Fix checkstyle issues introduced by falcon-976 (Raghav Kumar Gautam via Ruslan Ostafiychuk)
FALCON-976 EntityDryRunTest failing in falcon trunk (Pragya M via Samarth Gupta)
http://git-wip-us.apache.org/repos/asf/falcon/blob/b17baec7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
index 8de35d7..569f380 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
@@ -34,6 +34,7 @@ import org.apache.oozie.client.*;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import javax.xml.bind.JAXBException;
@@ -77,10 +78,10 @@ public class FeedLateRerunTest extends BaseTestClass {
removeBundles();
}
- @Test(enabled = true)
- public void feedLateRerunTestWithEmptyFolders()
- throws AuthenticationException, IOException, URISyntaxException, JAXBException,
- OozieClientException, InterruptedException {
+ @Test(dataProvider = "dataFlagProvider")
+ public void testLateRerun(boolean dataFlag)
+ throws URISyntaxException, AuthenticationException, InterruptedException, IOException,
+ OozieClientException, JAXBException {
Bundle.submitCluster(bundles[0], bundles[1]);
String startTime = TimeUtil.getTimeWrtSystemTime(0);
String endTime = TimeUtil.addMinsToTime(startTime, 30);
@@ -121,7 +122,7 @@ public class FeedLateRerunTest extends BaseTestClass {
//Finding and creating missing dependencies
List<String> missingDependencies = getAndCreateDependencies(
- cluster1, cluster1FS, cluster2, cluster2OC, bundleId, false, entityName);
+ cluster1, cluster1FS, cluster2, cluster2OC, bundleId, dataFlag, entityName);
int count = 1;
for (String location : missingDependencies) {
if (count==1) {
@@ -151,81 +152,6 @@ public class FeedLateRerunTest extends BaseTestClass {
AssertUtil.checkForListSizes(cluster1ReplicatedData, cluster2ReplicatedData);
}
- @Test(enabled = true)
- public void feedLateRerunTestWithData()
- throws AuthenticationException, IOException, URISyntaxException, JAXBException,
- OozieClientException, InterruptedException {
- Bundle.submitCluster(bundles[0], bundles[1]);
- String startTime = TimeUtil.getTimeWrtSystemTime(0);
- String endTime = TimeUtil.addMinsToTime(startTime, 30);
- LOGGER.info("Time range between : " + startTime + " and " + endTime);
-
- //configure feed
- String feed = bundles[0].getDataSets().get(0);
- feed = InstanceUtil.setFeedFilePath(feed, feedDataLocation);
- //erase all clusters from feed definition
- feed = FeedMerlin.fromString(feed).clearFeedClusters().toString();
- //set cluster1 as source
- feed = FeedMerlin.fromString(feed).addFeedCluster(
- new FeedMerlin.FeedClusterBuilder(Util.readEntityName(bundles[0].getClusters().get(0)))
- .withRetention("days(1000000)", ActionType.DELETE)
- .withValidity(startTime, endTime)
- .withClusterType(ClusterType.SOURCE)
- .build()).toString();
- //set cluster2 as target
- feed = FeedMerlin.fromString(feed).addFeedCluster(
- new FeedMerlin.FeedClusterBuilder(Util.readEntityName(bundles[1].getClusters().get(0)))
- .withRetention("days(1000000)", ActionType.DELETE)
- .withValidity(startTime, endTime)
- .withClusterType(ClusterType.TARGET)
- .withDataLocation(targetDataLocation)
- .build()).toString();
- String entityName = Util.readEntityName(feed);
-
- //submit and schedule feed
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
-
- //check if coordinator exists
- InstanceUtil.waitTillInstancesAreCreated(cluster2, feed, 0);
- Assert.assertEquals(InstanceUtil
- .checkIfFeedCoordExist(cluster2.getFeedHelper(), entityName, "REPLICATION"), 1);
-
- //Finding bundleId of replicated instance on target
- String bundleId = InstanceUtil.getLatestBundleID(cluster2, entityName, EntityType.FEED);
-
- //Finding and creating missing dependencies
- List<String> missingDependencies = getAndCreateDependencies(
- cluster1, cluster1FS, cluster2, cluster2OC, bundleId, true, entityName);
- int count = 1;
- for (String location : missingDependencies) {
- if (count==1) {
- source = location;
- count++;
- }
- }
- LOGGER.info("source : " + source);
- source=splitPathFromIp(source, "8020");
- LOGGER.info("source : " + source);
- target = source.replace("source", "target");
- LOGGER.info("target : " + target);
- /* Sleep for some time ( as is defined in runtime property of server ).
- Let the instance rerun and then it should succeed.*/
- int sleepMins = 8;
- for(int i=0; i < sleepMins; i++) {
- LOGGER.info("Waiting...");
- TimeUtil.sleepSeconds(60);
- }
- String bundleID = InstanceUtil.getLatestBundleID(cluster2, entityName, EntityType.FEED);
- OozieUtil.validateRetryAttempts(cluster2, bundleID, EntityType.FEED, 1);
-
- //check if data has been replicated correctly
- List<Path> cluster1ReplicatedData = HadoopUtil
- .getAllFilesRecursivelyHDFS(cluster1FS, new Path(HadoopUtil.cutProtocol(source)));
- List<Path> cluster2ReplicatedData = HadoopUtil
- .getAllFilesRecursivelyHDFS(cluster2FS, new Path(HadoopUtil.cutProtocol(target)));
- AssertUtil.checkForListSizes(cluster1ReplicatedData, cluster2ReplicatedData);
- }
-
private String splitPathFromIp(String src, String port) {
String reqSrc, tempSrc = "";
if (src.contains(":")) {
@@ -288,4 +214,12 @@ public class FeedLateRerunTest extends BaseTestClass {
}
return missingDependencies;
}
+
+ @DataProvider(name = "dataFlagProvider")
+ private Object[][] dataFlagProvider() {
+ return new Object[][] {
+ new Object[] {true, },
+ new Object[] {false, },
+ };
+ }
}