You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/11 18:51:36 UTC
incubator-usergrid git commit: add logic to continue alias buildout
despite issues removing
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-365 ee676e78a -> fa82c6dc0
add logic to continue alias buildout despite issues removing
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fa82c6dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fa82c6dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fa82c6dc
Branch: refs/heads/USERGRID-365
Commit: fa82c6dc00cbfa58d7f12e56bdc757bdc4ae4b0c
Parents: ee676e7
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Feb 11 10:51:29 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Feb 11 10:51:29 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManagerFactory.java | 2 +-
.../usergrid/persistence/index/impl/EsEntityIndexImpl.java | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fa82c6dc/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 66ee593..eec765f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -693,7 +693,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
//explicitly invoke create index, we don't know if it exists or not in ES during a rebuild.
em.createIndex();
em.reindex(po);
-
+
Application app = em.getApplication();
logger.info("\n\nRebuilt index for application {} id {}\n", app.getName(), appId );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fa82c6dc/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index af08f59..65e8d20 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -184,10 +184,14 @@ public class EsEntityIndexImpl implements AliasedEntityIndex {
String[] indexNames = getIndexes(AliasType.Write);
for (String currentIndex : indexNames){
- isAck = adminClient.indices().prepareAliases().removeAlias(currentIndex,
+ try {
+ isAck = adminClient.indices().prepareAliases().removeAlias(currentIndex,
alias.getWriteAlias()).execute().actionGet().isAcknowledged();
- logger.info("Removed Index Name [{}] from Alias=[{}] ACK=[{}]", currentIndex, alias, isAck);
+ logger.info("Removed Index Name [{}] from Alias=[{}] ACK=[{}]", currentIndex, alias, isAck);
+ }catch (Exception innere){
+ logger.warn("Alias removal failed",innere);
+ }
}
// add read alias