falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suh...@apache.org
Subject falcon git commit: FALCON-1042 Misleading mesage received while performing touch operation on scheduled entity. Contributed by Suhas Vasu
Date Wed, 18 Mar 2015 07:28:34 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 89d9d265c -> 04ef0fdb4


FALCON-1042 Misleading mesage received while performing touch operation on scheduled entity.
Contributed by Suhas Vasu


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/04ef0fdb
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/04ef0fdb
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/04ef0fdb

Branch: refs/heads/master
Commit: 04ef0fdb446a5d5904a7c82e78234c322ce31027
Parents: 89d9d26
Author: Suhas Vasu <suhas.v@inmobi.com>
Authored: Mon Mar 16 17:53:55 2015 +0530
Committer: Suhas Vasu <suhas.v@inmobi.com>
Committed: Mon Mar 16 17:53:55 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                     | 3 +++
 .../org/apache/falcon/workflow/engine/OozieWorkflowEngine.java  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/04ef0fdb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 56db195..9be6461 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,9 @@ Trunk (Unreleased)
    FALCON-822 Add reverse look up API (Ajay Yadava via Suhas Vasu)
 
   IMPROVEMENTS
+   FALCON-1042 Misleading mesage received while performing touch operation
+   on scheduled entity (Suhas Vasu)
+
    FALCON-1074 EntityUtil getInstanceSequence is buggy (Ajay Yadava via Suhas vasu)
 
    FALCON-1024 Updating tags and pipeline elements of the feed/process definition

http://git-wip-us.apache.org/repos/asf/falcon/blob/04ef0fdb/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
----------------------------------------------------------------------
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
index 62c04ea..2c399da 100644
--- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
+++ b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
@@ -1092,7 +1092,10 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
     private String getUpdateString(Entity entity, Date date, BundleJob oldBundle, BundleJob
newBundle) {
         StringBuilder builder = new StringBuilder();
         builder.append(entity.toShortString()).append("/Effective Time: ").append(SchemaHelper.formatDateUTC(date));
-        builder.append(". Old bundle id: ");
+        if (StringUtils.isNotEmpty(oldBundle.getId())) {
+            builder.append(". Old bundle id: " + oldBundle.getId());
+        }
+        builder.append(". Old coordinator id: ");
         List<String> coords = new ArrayList<String>();
         for (CoordinatorJob coord : oldBundle.getCoordinators()) {
             coords.add(coord.getId());


Mime
View raw message