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/03/31 23:01:25 UTC
[47/50] incubator-usergrid git commit: separate calls
separate calls
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bec7f44e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bec7f44e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bec7f44e
Branch: refs/heads/USERGRID-473
Commit: bec7f44e79851b443b1bb3c547f21705b540f6f6
Parents: 217e7dc
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Mar 30 15:48:41 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Mar 30 15:48:41 2015 -0600
----------------------------------------------------------------------
.../index/impl/EsEntityIndexImpl.java | 43 ++++++++++++--------
1 file changed, 27 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bec7f44e/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 6b3a11d..993b529 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
@@ -50,6 +50,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.indices.IndexAlreadyExistsException;
import org.elasticsearch.indices.IndexMissingException;
+import org.elasticsearch.indices.InvalidAliasNameException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -207,36 +208,46 @@ public class EsEntityIndexImpl implements AliasedEntityIndex,VersionedData {
int count = 0;
IndicesAliasesRequestBuilder aliasesRequestBuilder = adminClient.indices().prepareAliases();
- for ( String currentIndex : indexNames ) {
- aliasesRequestBuilder.removeAlias( currentIndex, alias.getWriteAlias() );
+ for (String currentIndex : indexNames) {
+ aliasesRequestBuilder.removeAlias(currentIndex, alias.getWriteAlias());
count++;
}
- if(count>0) {
+ if (count > 0) {
isAck = aliasesRequestBuilder.execute().actionGet().isAcknowledged();
logger.info("Removed Index Name from Alias=[{}] ACK=[{}]", alias, isAck);
}
- aliasesRequestBuilder = adminClient.indices().prepareAliases();
+ String[] reads = getIndexes(AliasedEntityIndex.AliasType.Read);
+ String[] writes = getIndexes(AliasedEntityIndex.AliasType.Write);
- //Added For Graphite Metrics
- // add read alias
- aliasesRequestBuilder.addAlias(
- indexName, alias.getReadAlias());
+ try {
+ aliasesRequestBuilder = adminClient.indices().prepareAliases();
+ //Added For Graphite Metrics
+ // add read alias
+ aliasesRequestBuilder.addAlias(indexName, alias.getReadAlias());
+ isAck = aliasesRequestBuilder.execute().actionGet().isAcknowledged();
+ logger.info("Created new read aliases ACK=[{}]", isAck);
+ } catch (InvalidAliasNameException ie) {
+ logger.debug("error creating read", ie);
+ }
+ try {
+ aliasesRequestBuilder = adminClient.indices().prepareAliases();
- //Added For Graphite Metrics
- //add write alias
- aliasesRequestBuilder.addAlias(
- indexName, alias.getWriteAlias());
+ //Added For Graphite Metrics
+ //add write alias
+ aliasesRequestBuilder.addAlias(indexName, alias.getWriteAlias());
+ isAck = aliasesRequestBuilder.execute().actionGet().isAcknowledged();
+ logger.info("Created new write aliases ACK=[{}]", isAck);
- isAck = aliasesRequestBuilder.execute().actionGet().isAcknowledged();
+ } catch (InvalidAliasNameException ie) {
+ logger.debug("error creating write", ie);
+ }
- logger.info("Created new aliases ACK=[{}]", isAck);
aliasCache.invalidate(alias);
} catch (Exception e) {
logger.warn("Failed to create alias ", e);
- }
- finally {
+ } finally {
timer.stop();
}
}