Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-501 c18ba594d -> 3a3183662
add comments for interfaces Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3a318366 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3a318366 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3a318366 Branch: refs/heads/USERGRID-501 Commit: 3a31836627b55aef920e32c8e125d31d70a9dedf Parents: c18ba59 Author: Shawn Feldman <[email protected]> Authored: Mon Mar 30 10:14:35 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Mon Mar 30 10:14:35 2015 -0600 ---------------------------------------------------------------------- .../core/metrics/MetricsFactory.java | 2 +- .../index/ApplicationEntityIndex.java | 2 +- .../persistence/index/IndexBufferConsumer.java | 2 +- .../persistence/index/IndexBufferProducer.java | 2 +- .../usergrid/persistence/index/SearchType.java | 2 +- .../migration/EsIndexDataMigrationImpl.java | 40 +++++++++++--------- 6 files changed, 28 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3a318366/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactory.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactory.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactory.java index 62a5cb9..b79f33d 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactory.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactory.java @@ -19,7 +19,7 @@ package org.apache.usergrid.persistence.core.metrics; import com.codahale.metrics.*; /** - * Classy class class. + * Get metrics . */ public interface MetricsFactory { MetricRegistry getRegistry(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3a318366/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java index 59a19eb..cb1b6f0 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/ApplicationEntityIndex.java @@ -24,7 +24,7 @@ import org.apache.usergrid.persistence.index.query.Query; import rx.Observable; /** - * Classy class class. + * Entity Index for an Application. */ public interface ApplicationEntityIndex { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3a318366/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferConsumer.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferConsumer.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferConsumer.java index 40c7852..e0fb8b3 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferConsumer.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferConsumer.java @@ -20,7 +20,7 @@ package org.apache.usergrid.persistence.index; /** - * Classy class class. + * Buffer index requests */ public interface IndexBufferConsumer { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3a318366/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferProducer.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferProducer.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferProducer.java index 7c8b7e6..a9e6d6f 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferProducer.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexBufferProducer.java @@ -28,7 +28,7 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; /** - * Classy class class. + * Produce to index buffer consumer */ public interface IndexBufferProducer { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3a318366/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/SearchType.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/SearchType.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/SearchType.java index c039360..786219a 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/SearchType.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/SearchType.java @@ -24,7 +24,7 @@ import org.apache.usergrid.persistence.index.impl.IndexingUtils; import org.apache.usergrid.persistence.model.entity.Id; /** - * Classy class class. + * Get search type */ public class SearchType{ private final String type; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3a318366/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexDataMigrationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexDataMigrationImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexDataMigrationImpl.java index ebb79dc..123527a 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexDataMigrationImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexDataMigrationImpl.java @@ -29,6 +29,7 @@ import org.apache.usergrid.persistence.index.IndexCache; import org.apache.usergrid.persistence.index.impl.EsProvider; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder; import org.elasticsearch.client.AdminClient; +import org.elasticsearch.indices.InvalidAliasNameException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; @@ -62,24 +63,29 @@ public class EsIndexDataMigrationImpl implements DataMigration<ApplicationScope> final int latestVersion = dataVersion.getImplementationVersion(); observer.start(); - migrationDataProvider.getData().flatMap(applicationScope -> { - LegacyIndexIdentifier legacyIndexIdentifier = new LegacyIndexIdentifier(indexFig, applicationScope); - String[] indexes = indexCache.getIndexes(legacyIndexIdentifier.getAlias(), AliasedEntityIndex.AliasType.Read); - return Observable.from(indexes); - }) - .doOnNext(index -> { - IndicesAliasesRequestBuilder aliasesRequestBuilder = adminClient.indices().prepareAliases(); - aliasesRequestBuilder = adminClient.indices().prepareAliases(); - // add read alias - aliasesRequestBuilder.addAlias(index, indexIdentifier.getAlias().getReadAlias()); - observer.update(latestVersion,"EsIndexDataMigrationImpl: fixed index: " + index ); + try { + migrationDataProvider.getData().flatMap(applicationScope -> { + LegacyIndexIdentifier legacyIndexIdentifier = new LegacyIndexIdentifier(indexFig, applicationScope); + String[] indexes = indexCache.getIndexes(legacyIndexIdentifier.getAlias(), AliasedEntityIndex.AliasType.Read); + return Observable.from(indexes); }) - .doOnError(error -> { - log.error("failed to migrate index", error); - observer.failed(latestVersion,"EsIndexDataMigrationImpl: failed to migrate",error); - }) - .doOnCompleted(() -> observer.complete()) - .toBlocking().lastOrDefault(null); + .doOnNext(index -> { + IndicesAliasesRequestBuilder aliasesRequestBuilder = adminClient.indices().prepareAliases(); + aliasesRequestBuilder = adminClient.indices().prepareAliases(); + // add read alias + try { + aliasesRequestBuilder.addAlias(index, indexIdentifier.getAlias().getReadAlias()); + } catch (InvalidAliasNameException e) { + log.debug("Failed to add alias due to name conflict",e); + } + observer.update(latestVersion, "EsIndexDataMigrationImpl: fixed index: " + index); + }) + .doOnCompleted(() -> observer.complete()) + .toBlocking().lastOrDefault(null); + }catch (Exception e){ + log.error("Failed to migrate index", e); + throw e; + } return latestVersion; }
