falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajayyad...@apache.org
Subject [1/2] falcon git commit: FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected results. Contributed by Ajay Yadava.
Date Tue, 18 Aug 2015 10:16:24 GMT
Repository: falcon
Updated Branches:
  refs/heads/master d8adca9d9 -> 1591e49e2


FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected
results. Contributed by Ajay Yadava.


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

Branch: refs/heads/master
Commit: 81c07f61b70c43fe9767b5522e2ef06160708a9f
Parents: d8adca9
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Tue Aug 18 14:46:33 2015 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Tue Aug 18 14:47:54 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 .../java/org/apache/falcon/resource/AbstractInstanceManager.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/81c07f61/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fda428e..554cfea 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
     (Suhas Vasu)
 
   BUG FIXES
+    FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces
unexpected results(Ajay Yadava)
+
     FALCON-1399 Property for default number of results is not loaded dynamically(Ajay Yadava)
 
     FALCON-1398 CrossEntityValidations contains incorrect validations(Pragya Mittal via Ajay
Yadava)

http://git-wip-us.apache.org/repos/asf/falcon/blob/81c07f61/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
index ab8a2fd..c1b4da6 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
@@ -647,7 +647,7 @@ public abstract class AbstractInstanceManager extends AbstractEntityManager
{
             Entity entity = EntityUtil.getEntity(type, entityName);
             TriageResult result = new TriageResult(APIResult.Status.SUCCEEDED, "Success");
             List<LineageGraphResult> triageGraphs = new LinkedList<>();
-            for (String clusterName : DeploymentUtil.getCurrentClusters()) {
+            for (String clusterName : EntityUtil.getClustersDefinedInColos(entity)) {
                 Cluster cluster = EntityUtil.getEntity(EntityType.CLUSTER, clusterName);
                 triageGraphs.add(triage(type, entity, instanceTime, cluster));
             }


Mime
View raw message