Repository: falcon
Updated Branches:
  refs/heads/master 8600e9465 -> cf492300e


FALCON-1484 Find Bundles fails in case of hadoop namenode moving to 
HA(Contributed by Sandeep Samudrala)


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

Branch: refs/heads/master
Commit: cf492300e77d627b3ecfa0f4b469e3f4ff78b146
Parents: 8600e94
Author: Pallavi Rao <[email protected]>
Authored: Wed Sep 23 17:06:13 2015 +0530
Committer: Pallavi Rao <[email protected]>
Committed: Wed Sep 23 17:06:13 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/falcon/blob/cf492300/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a7c46e..a54fbcf 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,6 +35,8 @@ Trunk (Unreleased)
     FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi 
Rao)
 
   BUG FIXES
+    FALCON-1484 Find Bundles fails in case of hadoop namenode moving to 
HA(Sandeep Samudrala via Pallavi Rao)
+
     FALCON-1343 Fix validation of read/write endpoints in 
ClusterEntityParser(Balu Vellanki via Ajay Yadava)
 
     FALCON-1373 HiveDR does not work when job is run on destination 
cluster(Balu Vellanki via Ajay Yadava)

http://git-wip-us.apache.org/repos/asf/falcon/blob/cf492300/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 0441f7c..6660af1 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
@@ -328,7 +328,9 @@ public class OozieWorkflowEngine extends 
AbstractWorkflowEngine {
                 + "=" + EntityUtil.getWorkflowName(entity) + ";", 0, 256);
             if (jobs != null) {
                 for (BundleJob job : jobs) {
-                    if (EntityUtil.isStagingPath(cluster, entity, new 
Path(job.getAppPath()))) {
+                    // Path is extracted twice as to handle changes in hadoop 
configurations for nameservices.
+                    if (EntityUtil.isStagingPath(cluster, entity,
+                            new Path((new 
Path(job.getAppPath())).toUri().getPath()))) {
                         //Load bundle as coord info is not returned in 
getBundleJobsInfo()
                         BundleJob bundle = getBundleInfo(clusterName, 
job.getId());
                         filteredJobs.add(bundle);

Reply via email to