FALCON-298. Feed update with replication delay creates holes

apache · Jul 25, 2016 · 9e68a57 · 9e68a57
1 parent 3ed804e
commit 9e68a57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/common/src/main/java/org/apache/falcon/entity/EntityUtil.java b/common/src/main/java/org/apache/falcon/entity/EntityUtil.java
@@ -462,6 +462,18 @@ public static Date getNextInstanceTime(Date instanceTime, Frequency frequency, T
         return insCal.getTime();
     }
 
+    public static Date getNextInstanceTimeWithDelay(Date instanceTime, Frequency delay, TimeZone tz) {
+        if (tz == null) {
+            tz = TimeZone.getTimeZone("UTC");
+        }
+        Calendar insCal = Calendar.getInstance(tz);
+        insCal.setTime(instanceTime);
+        final int delayAmount = delay.getFrequencyAsInt();
+        insCal.add(delay.getTimeUnit().getCalendarUnit(), delayAmount);
+
+        return insCal.getTime();
+    }
+
     public static String md5(Entity entity) throws FalconException {
         return new String(Hex.encodeHex(DigestUtils.md5(stringOf(entity))));
     }

diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
@@ -1393,7 +1393,7 @@ private void updateCoords(String cluster, BundleJob bundle,
 
             //calculate next start time based on delay.
             endTime = (delay == null) ? endTime
-                    : EntityUtil.getNextStartTime(coord.getStartTime(), delay, EntityUtil.getTimeZone(entity), endTime);
+                    : EntityUtil.getNextInstanceTimeWithDelay(endTime, delay, EntityUtil.getTimeZone(entity));
             LOG.debug("Updating endtime of coord {} to {} on cluster {}",
                     coord.getId(), SchemaHelper.formatDateUTC(endTime), cluster);