falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pall...@apache.org
Subject falcon git commit: FALCON-1749 Instance status does not show instances if entity is dele…
Date Thu, 14 Jul 2016 09:41:51 GMT
Repository: falcon
Updated Branches:
  refs/heads/master afb07cc2c -> 37848ed65


FALCON-1749 Instance status does not show instances if entity is dele…

…ted from one of the colos

Author: Praveen Adlakha <adlakha.praveen@gmail.com>

Reviewers: @bvellanki, @pallavi-rao

Closes #222 from PraveenAdlakha/1749_V2 and squashes the following commits:

e476a85 [Praveen Adlakha] Pallavi's comment addressed
84e389f [Praveen Adlakha] Comments added for future reference
dbc7e1c [Praveen Adlakha] FALCON-1749 Instance status does not show instances if entity is
deleted from one of the colos


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

Branch: refs/heads/master
Commit: 37848ed653dbebcee5cbaec546ccc7a9d1fdb4fe
Parents: afb07cc
Author: Praveen Adlakha <adlakha.praveen@gmail.com>
Authored: Thu Jul 14 15:11:44 2016 +0530
Committer: Pallavi Rao <pallavi.rao@inmobi.com>
Committed: Thu Jul 14 15:11:44 2016 +0530

----------------------------------------------------------------------
 .../apache/falcon/resource/AbstractEntityManager.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/37848ed6/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
index 9169c18..8856d80 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
@@ -169,13 +169,18 @@ public abstract class AbstractEntityManager extends AbstractMetadataResource
{
 
             Set<String> clusters = EntityUtil.getClustersDefined(entity);
             Set<String> colos = new HashSet<String>();
-            for (String cluster : clusters) {
-                try{
+            try{
+                // Fix for Falcon-1749
+                EntityType entitytype =  EntityType.getEnum(type);
+                if (entitytype == EntityType.PROCESS || entitytype == EntityType.FEED){
+                    EntityUtil.getEntity(entitytype, entity.getName());
+                }
+                for (String cluster : clusters) {
                     Cluster clusterEntity = EntityUtil.getEntity(EntityType.CLUSTER, cluster);
                     colos.add(clusterEntity.getColo());
-                } catch (EntityNotRegisteredException e){
-                    LOG.warn(e.getMessage(), e);
                 }
+            }catch (EntityNotRegisteredException e){
+                LOG.warn(e.getMessage(), e);
             }
             if (colos.isEmpty()) {
                 throw new EntityNotRegisteredException(entity.getName()  + " (" + type +
") not found");


Mime
View raw message