falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject git commit: FALCON-610 Refactoring and documentation updates. Contributed by Paul Isaychuk
Date Thu, 21 Aug 2014 03:27:46 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 12abb2688 -> 42de574a9


FALCON-610 Refactoring and documentation updates. 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/42de574a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/42de574a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/42de574a

Branch: refs/heads/master
Commit: 42de574a988684f41229e281c64fdba0b2dbfe24
Parents: 12abb26
Author: arpit <arpit@apache.org>
Authored: Wed Aug 20 20:27:30 2014 -0700
Committer: arpit <arpit@apache.org>
Committed: Wed Aug 20 20:27:30 2014 -0700

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                   |  4 +-
 .../falcon/regression/core/util/HadoopUtil.java | 10 +++
 .../falcon/regression/core/util/TimeUtil.java   | 15 +---
 .../regression/EmbeddedPigScriptTest.java       |  7 +-
 .../falcon/regression/FeedResumeTest.java       |  4 --
 .../regression/ProcessInstanceKillsTest.java    | 15 ++--
 .../regression/ProcessInstanceRerunTest.java    |  5 +-
 .../regression/ProcessInstanceResumeTest.java   | 28 +++++---
 .../regression/ProcessInstanceRunningTest.java  |  9 +--
 .../regression/ProcessInstanceStatusTest.java   |  7 +-
 .../regression/ProcessInstanceSuspendTest.java  |  9 ++-
 .../regression/hcat/HCatReplicationTest.java    |  5 +-
 .../prism/PrismConcurrentRequestTest.java       | 74 ++++++++++++--------
 .../falcon/regression/prism/RetentionTest.java  |  8 +++
 14 files changed, 116 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index be15010..d74c129 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -7,7 +7,9 @@ Trunk (Unreleased)
   NEW FEATURES
 
   IMPROVEMENTS
-   FALCON-581 merlin: Refactor code for cross product and make it a method 
+   FALCON-610 Refactoring and documentation updates (Paul Isaychuk via Arpit Gupta)
+
+   FALCON-581 Refactor code for cross product and make it a method 
    (Raghav Kumar Gautam via Arpit Gupta) 
    
    FALCON-597 String logged at the start and end of the merlin test are slightly 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
index c33700c..dc0a4d4 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java
@@ -395,6 +395,16 @@ public final class HadoopUtil {
             OSUtil.NORMAL_INPUT + "_SUCCESS", OSUtil.NORMAL_INPUT + "log_01.txt");
     }
 
+    /**
+     * Removes general folder on file system. Creates folders according to passed folders
list
+     * and fills them with data if required.
+     *
+     * @param fileSystem destination file system
+     * @param prefix prefix of path where data should be placed
+     * @param folderList list of folders to be created and filled with data if required
+     * @param uploadData if folders should be filled with data
+     * @throws IOException
+     */
     public static void replenishData(FileSystem fileSystem, String prefix, List<String>
folderList,
         boolean uploadData) throws IOException {
         //purge data first

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java
index 15a876f..af74d30 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java
@@ -56,7 +56,6 @@ public final class TimeUtil {
     public static String get20roundedTime(String oozieBaseTime) {
         DateTime startTime =
             new DateTime(oozieDateToDate(oozieBaseTime), DateTimeZone.UTC);
-
         if (startTime.getMinuteOfHour() < 20) {
             startTime = startTime.minusMinutes(startTime.getMinuteOfHour());
         } else if (startTime.getMinuteOfHour() < 40) {
@@ -65,13 +64,11 @@ public final class TimeUtil {
             startTime = startTime.minusMinutes(startTime.getMinuteOfHour() + 40);
         }
         return dateToOozieDate(startTime.toDate());
-
     }
 
     public static List<String> getMinuteDatesOnEitherSide(int interval, int minuteSkip)
{
         DateTime today = new DateTime(DateTimeZone.UTC);
         LOGGER.info("today is: " + today.toString());
-
         return getMinuteDatesOnEitherSide(today.minusMinutes(interval),
             today.plusMinutes(interval), minuteSkip);
     }
@@ -80,7 +77,6 @@ public final class TimeUtil {
                                                           int minuteSkip) {
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy/MM/dd/HH/mm");
         formatter.withZoneUTC();
-
         return getMinuteDatesOnEitherSide(TimeUtil.oozieDateToDate(startOozieDate),
             TimeUtil.oozieDateToDate(endOozieDate), minuteSkip, formatter);
     }
@@ -89,7 +85,6 @@ public final class TimeUtil {
                                                           int minuteSkip) {
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy/MM/dd/HH/mm");
         formatter.withZoneUTC();
-
         return getMinuteDatesOnEitherSide(startDate, endDate, minuteSkip, formatter);
     }
 
@@ -104,12 +99,10 @@ public final class TimeUtil {
                                                           int minuteSkip,
                                                           DateTimeFormatter formatter) {
         LOGGER.info("generating data between " + formatter.print(startDate) + " and "
-                +
-            formatter.print(endDate));
+                + formatter.print(endDate));
         if (minuteSkip == 0) {
             minuteSkip = 1;
         }
-
         List<String> dates = new ArrayList<String>();
         while (!startDate.isAfter(endDate)) {
             dates.add(formatter.print(startDate));
@@ -168,7 +161,7 @@ public final class TimeUtil {
         for (int counter = 0; !startDate.isAfter(endDate) && counter < 1000; ++counter)
{
             startDate = feedType.addTime(startDate, skip);
             dates.add(startDate);
-        }//end of for
+        }
         return dates;
     }
 
@@ -180,7 +173,6 @@ public final class TimeUtil {
         } else {
             jodaTime = jodaTime.minusMinutes(-1 * minutes);
         }
-
         DateTimeFormatter fmt = OozieUtil.getOozieDateTimeFormatter();
         DateTimeZone tz = DateTimeZone.getDefault();
         return fmt.print(tz.convertLocalToUTC(jodaTime.getMillis(), false));
@@ -211,7 +203,6 @@ public final class TimeUtil {
     public static void sleepTill(String startTimeOfLateCoord) {
 
         DateTime finalDate = new DateTime(oozieDateToDate(startTimeOfLateCoord));
-
         while (true) {
             DateTime sysDate = oozieDateToDate(getTimeWrtSystemTime(0));
             sysDate.withZoneRetainFields(DateTimeZone.UTC);
@@ -219,10 +210,8 @@ public final class TimeUtil {
             if (sysDate.compareTo(finalDate) > 0) {
                 break;
             }
-
             TimeUtil.sleepSeconds(15);
         }
-
     }
 
     public static Date getMinutes(String expression, Calendar time) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
index bf0e8d3..1973bf8 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
@@ -68,6 +68,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
     String pigScriptLocation = pigScriptDir + "/id.pig";
     String inputPath = pigTestDir + "/input/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
     private static final Logger logger = Logger.getLogger(EmbeddedPigScriptTest.class);
+    private static final double TIMEOUT = 15;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -131,12 +132,12 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
         AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         prism.getProcessHelper().suspend(URLS.SUSPEND_URL, bundles[0].getProcessData());
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         ServiceResponse status =
             prism.getProcessHelper().getStatus(URLS.STATUS_URL, bundles[0].getProcessData());
         Assert.assertTrue(status.getMessage().contains("SUSPENDED"), "Process not suspended.");
         prism.getProcessHelper().resume(URLS.RESUME_URL, bundles[0].getProcessData());
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         InstancesResult r = prism.getProcessHelper()
@@ -148,7 +149,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
     @Test(groups = {"singleCluster"})
     public void getSuspendedProcessInstance() throws Exception {
         prism.getProcessHelper().suspend(URLS.SUSPEND_URL, bundles[0].getProcessData());
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.SUSPENDED);
         InstancesResult r = prism.getProcessHelper()

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
index 0af3a4e..937f0a7 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
@@ -52,10 +52,6 @@ public class FeedResumeTest extends BaseTestClass {
     private String aggregateWorkflowDir = baseHDFSDir + "/FeedResumeTest/aggregator";
     private static final Logger LOGGER = Logger.getLogger(FeedResumeTest.class);
 
-    public void uploadWorkflow() throws Exception {
-        uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
-    }
-
     @BeforeMethod(alwaysRun = true)
     public void setup(Method method) throws Exception {
         LOGGER.info("test name: " + method.getName());

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
index 515b18e..e7b2616 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
@@ -60,6 +60,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
     private String feedOutputPath =
         baseTestHDFSDir + "/output-data/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
     private static final Logger LOGGER = Logger.getLogger(ProcessInstanceKillsTest.class);
+    private static final double TIMEOUT = 15;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -112,7 +113,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(1);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z");
@@ -136,7 +137,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(10);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T00:03Z&end=2010-01-02T00:03Z");
@@ -159,7 +160,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T00:03Z&end=2010-01-02T00:30Z");
@@ -242,11 +243,11 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         prism.getProcessHelper()
             .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z&end=2010-01-02T01:15Z");
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
@@ -267,11 +268,11 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         prism.getProcessHelper()
             .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:20Z");
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
index 8b40cf1..119d871 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
@@ -62,6 +62,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
     private FileSystem clusterFS = serverFS.get(0);
     private OozieClient clusterOC = serverOC.get(0);
     private static final Logger LOGGER = Logger.getLogger(ProcessInstanceRerunTest.class);
+    private static final double TIMEOUT = 10;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -110,7 +111,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(5);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(10);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstanceUtil.waitTillInstancesAreCreated(cluster, bundles[0].getProcessData(), 0);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceKill(Util.readEntityName(bundles[0].getProcessData()),
@@ -175,7 +176,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
         prism.getProcessHelper()
             .getProcessInstanceRerun(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:11Z");
-        TimeUtil.sleepSeconds(5);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstanceUtil.areWorkflowsRunning(clusterOC, wfIDs, 6, 6, 0, 0);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
index 6bcb24a..246a41e 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
@@ -58,6 +58,8 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         baseTestHDFSDir + "/output-data/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
     private String aggregateWorkflowDir = baseTestHDFSDir + "/aggregator";
     private static final Logger LOGGER = Logger.getLogger(ProcessInstanceResumeTest.class);
+    private static final double SCHEDULED = 15;
+    private static final double AFFECTED = 10;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -105,11 +107,11 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setProcessPeriodicity(5, TimeUnit.minutes);
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceSuspend(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z&end=2010-01-02T01:21Z");
-        TimeUtil.sleepSeconds(10);
+        TimeUtil.sleepSeconds(AFFECTED);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:26Z");
@@ -134,11 +136,11 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceSuspend(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z&end=2010-01-02T01:21Z");
-        TimeUtil.sleepSeconds(10);
+        TimeUtil.sleepSeconds(AFFECTED);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:26Z");
@@ -166,10 +168,11 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceSuspend(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z&end=2010-01-02T01:21Z");
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(AFFECTED);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:26Z");
@@ -196,15 +199,15 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setProcessConcurrency(1);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(5);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceSuspend(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z");
-        TimeUtil.sleepSeconds(5);
+        TimeUtil.sleepSeconds(AFFECTED);
         prism.getProcessHelper()
             .getProcessInstanceResume(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z");
-        TimeUtil.sleepSeconds(5);
+        TimeUtil.sleepSeconds(AFFECTED);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z");
@@ -281,6 +284,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceResume(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z");
@@ -308,13 +312,16 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceSuspend(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:25Z");
+        TimeUtil.sleepSeconds(AFFECTED);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:26Z");
         InstanceUtil.validateResponse(result, 6, 5, 1, 0, 0);
+        TimeUtil.sleepSeconds(10);
         prism.getProcessHelper()
             .getProcessInstanceResume(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:25Z");
@@ -337,16 +344,15 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
         bundles[0].setOutputFeedPeriodicity(5, TimeUnit.minutes);
         bundles[0].setProcessConcurrency(6);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(SCHEDULED);
         prism.getProcessHelper()
             .getProcessInstanceSuspend(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z&end=2010-01-02T01:21Z");
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(AFFECTED);
         InstancesResult result = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:26Z");
         InstanceUtil.validateResponse(result, 6, 2, 4, 0, 0);
-
         prism.getProcessHelper()
             .getProcessInstanceResume(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:05Z&end=2010-01-02T01:21Z");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
index 559df48..7e39ea2 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
@@ -61,6 +61,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
     private String feedOutputPath =
         baseTestHDFSDir + "/output-data/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
     private static final Logger LOGGER = Logger.getLogger(ProcessInstanceRunningTest.class);
+    private static final double TIMEOUT = 15;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -111,13 +112,13 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
     public void getResumedProcessInstance() throws Exception {
         bundles[0].setProcessConcurrency(3);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL,
             bundles[0].getProcessData()));
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.assertSucceeded(prism.getProcessHelper().resume(URLS.RESUME_URL,
             bundles[0].getProcessData()));
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getRunningInstance(URLS.INSTANCE_RUNNING,
                 Util.readEntityName(bundles[0].getProcessData()));
@@ -136,7 +137,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
         bundles[0].submitFeedsScheduleProcess(prism);
         AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL,
             bundles[0].getProcessData()));
-        TimeUtil.sleepSeconds(5);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getRunningInstance(URLS.INSTANCE_RUNNING,
                 Util.readEntityName(bundles[0].getProcessData()));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
index 86f7a86..1c4f153 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
@@ -70,6 +70,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
     private String feedOutputTimedOutPath =
         baseTestHDFSDir + "/output-data/timedoutStatus/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
     private static final Logger LOGGER = Logger.getLogger(ProcessInstanceStatusTest.class);
+    private static final double TIMEOUT = 15;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -252,7 +253,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
         bundles[0].submitFeedsScheduleProcess(prism);
         AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL,
             bundles[0].getProcessData()));
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z");
@@ -319,7 +320,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.SUSPENDED);
         prism.getProcessHelper().resume(URLS.RESUME_URL, bundles[0].getProcessData());
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         InstancesResult r = prism.getProcessHelper()
@@ -387,7 +388,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
                 prism.getProcessHelper().suspend(URLS.SUSPEND_URL, bundles[0].getProcessData()));
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
                 Job.Status.SUSPENDED);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         InstancesResult r = prism.getProcessHelper()
             .getProcessInstanceStatus(Util.readEntityName(bundles[0].getProcessData()),
                 "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
index e77d534..cbf5ef9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
@@ -63,6 +63,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
     private ColoHelper cluster = servers.get(0);
     private FileSystem clusterFS = serverFS.get(0);
     private static final Logger LOGGER = Logger.getLogger(ProcessInstanceSuspendTest.class);
+    private static final double TIMEOUT = 15;
 
     @BeforeClass(alwaysRun = true)
     public void createTestData() throws Exception {
@@ -110,7 +111,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(5);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         InstancesResult result = prism.getProcessHelper()
@@ -162,7 +163,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(5);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         InstancesResult result = prism.getProcessHelper()
@@ -213,7 +214,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(3);
         bundles[0].submitFeedsScheduleProcess(prism);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         InstancesResult result = prism.getProcessHelper()
@@ -266,6 +267,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(3);
         bundles[0].submitFeedsScheduleProcess(prism);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         prism.getProcessHelper()
@@ -295,6 +297,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
         bundles[0].setOutputFeedLocationData(feedOutputPath);
         bundles[0].setProcessConcurrency(5);
         bundles[0].submitFeedsScheduleProcess(prism);
+        TimeUtil.sleepSeconds(TIMEOUT);
         AssertUtil.checkStatus(serverOC.get(0), EntityType.PROCESS, bundles[0].getProcessData(),
             Job.Status.RUNNING);
         InstancesResult result = prism.getProcessHelper()

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
index 860e680..5452f50 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
@@ -82,6 +82,7 @@ public class HCatReplicationTest extends BaseTestClass {
 
     final String dbName = "default";
     private static final String localHCatData = OSUtil.getPath(OSUtil.RESOURCES, "hcat",
"data");
+    private static final double TIMEOUT = 15;
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() throws IOException {
@@ -184,7 +185,7 @@ public class HCatReplicationTest extends BaseTestClass {
             prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
                 feed)
         );
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         //check if all coordinators exist
         Assert.assertEquals(InstanceUtil
             .checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feed),
@@ -279,7 +280,7 @@ public class HCatReplicationTest extends BaseTestClass {
             prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
                 feed)
         );
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(TIMEOUT);
         //check if all coordinators exist
         Assert.assertEquals(InstanceUtil
             .checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feed),

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
index d4ba5b0..1ef97ed 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
@@ -73,14 +73,16 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         removeBundles();
     }
 
+    /**
+     *  Submits the same feed concurrently in 10 threads. Checks that all attempts succeeded.
+     */
     @Test(groups = {"multiCluster"})
-    public void submitSameFeedParallel() throws Exception {
+    public void submitFeedParallel() throws Exception {
         prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
         for (int i = 1; i <= brothers.length; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "submit", EntityType.FEED, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.SUBMIT_URL);
+                    prism, URLS.SUBMIT_URL);
         }
         for (Brother brother : brothers) {
             brother.start();
@@ -95,16 +97,18 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         }
     }
 
+    /**
+     *  Submits the same process concurrently in 10 threads. Checks that all attempts succeeded.
+     */
     @Test(groups = {"multiCluster"})
-    public void submitSameProcessParallel() throws Exception {
+    public void submitProcessParallel() throws Exception {
         prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
         prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(0));
         prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(1));
         for (int i = 1; i <= brothers.length; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "submit", EntityType.PROCESS, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.SUBMIT_URL);
+                    prism, URLS.SUBMIT_URL);
         }
         for (Brother brother : brothers) {
             brother.start();
@@ -119,15 +123,16 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         }
     }
 
-
+    /**
+     *  Tries to delete same process concurrently in 10 threads. All attempts should succeed.
+     */
     @Test(groups = {"multiCluster"})
-    public void deleteSameProcessParallel() throws Exception {
+    public void deleteProcessParallel() throws Exception {
         bundles[0].submitBundle(prism);
         for (int i = 1; i <= brothers.length; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "delete", EntityType.PROCESS, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.DELETE_URL);
+                    prism, URLS.DELETE_URL);
         }
         for (Brother brother : brothers) {
             brother.start();
@@ -142,16 +147,17 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         }
     }
 
-
+    /**
+     *  Submits all required stuff. Tries to schedule the same process concurrently in 10
threads.
+     *  All attempts should succeed.
+     */
     @Test(groups = {"multiCluster"})
-    public void schedulePrismParallel() throws Exception {
+    public void scheduleProcessParallel() throws Exception {
         bundles[0].submitBundle(prism);
         for (int i = 1; i <= brothers.length; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "schedule", EntityType.PROCESS, brotherGrimm,
-                    bundles[0],
-                    prism,
-                    URLS.SCHEDULE_URL);
+                    bundles[0], prism, URLS.SCHEDULE_URL);
         }
         for (Brother brother : brothers) {
             brother.start();
@@ -166,9 +172,12 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         }
     }
 
-
+    /**
+     *  Schedules and suspends feed. Tries to resume it concurrently in 2 threads and then
+     *  suspend it again on other 2 threads. All actions should succeed.
+     */
     @Test(groups = {"multiCluster"})
-    public void resumeAnsSuspendParallel() throws Exception {
+    public void resumeAndSuspendFeedParallel() throws Exception {
         brothers = new Brother[4];
         prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
         prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
@@ -179,14 +188,12 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         for (int i = 1; i <= 2; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "resume", EntityType.FEED, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.RESUME_URL);
+                    prism, URLS.RESUME_URL);
         }
         for (int i = 3; i <= 4; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "suspend", EntityType.FEED, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.SUSPEND_URL);
+                    prism, URLS.SUSPEND_URL);
         }
         for (Brother brother : brothers) {
             brother.start();
@@ -201,24 +208,28 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         }
     }
 
+    /**
+     *  Schedules and suspends feed. Then tries to resume it concurrently in 10 threads.
All
+     *  attempts should succeed.
+     */
     @Test(groups = {"multiCluster"})
-    public void resumeParallel() throws Exception {
+    public void resumeFeedParallel() throws Exception {
+        final double delay = 15;
         prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
         prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
         AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(delay);
         AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
         prism.getFeedHelper().resume(URLS.RESUME_URL, feed);
-        TimeUtil.sleepSeconds(5);
+        TimeUtil.sleepSeconds(delay);
         AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
         prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
-        TimeUtil.sleepSeconds(15);
+        TimeUtil.sleepSeconds(delay);
         AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
         for (int i = 1; i <= brothers.length; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "resume", EntityType.FEED, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.RESUME_URL);
+                    prism, URLS.RESUME_URL);
         }
         for (Brother brother : brothers) {
             brother.start();
@@ -233,14 +244,15 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
         }
     }
 
-
+    /**
+     *  Tries to submit cluster concurrently in 10 threads. Checks that all attempts succeeded.
+     */
     @Test(groups = {"multiCluster"})
-    public void submitSameClusterParallel() throws Exception {
+    public void submitClusterParallel() throws Exception {
         for (int i = 1; i <= brothers.length; i++) {
             brothers[i - 1] =
                 new Brother("brother" + i, "submit", EntityType.CLUSTER, brotherGrimm, bundles[0],
-                    prism,
-                    URLS.SUBMIT_URL);
+                    prism, URLS.SUBMIT_URL);
         }
         for (Brother brother : brothers) {
             brother.start();

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42de574a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
index 4937361..85bd770 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
@@ -112,6 +112,14 @@ public class RetentionTest extends BaseTestClass {
         }
     }
 
+    /**
+     * Generates folders based on proposed periodicity and then fills them with data if required.
+     *
+     * @param feedType feed retention limit type
+     * @param gap defines what amount of units should be skipped
+     * @param withData should folders be filled with data or not
+     * @throws Exception
+     */
     private void replenishData(FeedType feedType, boolean gap, boolean withData) throws Exception
{
         int skip = 1;
         if (gap) {


Mime
View raw message