Repository: usergrid Updated Branches: refs/heads/master edbda938c -> 6e5978bb6
Set the default elasticsearch cluster name via fig only. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6e5978bb Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6e5978bb Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6e5978bb Branch: refs/heads/master Commit: 6e5978bb6881b797f1caecb2ebf393282f883974 Parents: edbda93 Author: Michael Russo <[email protected]> Authored: Tue Nov 15 23:12:41 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Tue Nov 15 23:12:41 2016 -0800 ---------------------------------------------------------------------- .../src/main/resources/usergrid-default.properties | 6 +----- stack/config/src/test/resources/usergrid-test.properties | 1 - .../org/apache/usergrid/persistence/index/IndexFig.java | 11 +---------- .../src/test/resources/dynamic-test.properties | 1 - .../src/test/resources/usergrid-UNIT.properties | 1 - .../src/test/resources/usergrid-custom-test.properties | 1 - .../src/test/resources/usergrid-custom-test.properties | 1 - 7 files changed, 2 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties index 5c7fca2..349a3cc 100644 --- a/stack/config/src/main/resources/usergrid-default.properties +++ b/stack/config/src/main/resources/usergrid-default.properties @@ -220,17 +220,13 @@ cassandra.lock.writecl=LOCAL_QUORUM # Set the Elasticsearch cluster name # -elasticsearch.cluster_name=elasticsearch +#elasticsearch.cluster_name=elasticsearch # Set the Elasticsearch client node name # #elasticsearch.node_name=default -# Set how Elasticsearch should be started. Valid values: embedded, forked or remote -# -#elasticsearch.startup=remote - # Set the number of primary shards to use for an index in Elasticsearch. Typically 2x or 3x the ES nodes. # http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/config/src/test/resources/usergrid-test.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/test/resources/usergrid-test.properties b/stack/config/src/test/resources/usergrid-test.properties index 085a11d..007119d 100644 --- a/stack/config/src/test/resources/usergrid-test.properties +++ b/stack/config/src/test/resources/usergrid-test.properties @@ -65,7 +65,6 @@ cassandra.writecl=QUORUM #Keyspace to use for locking cassandra.lock.keyspace=Locks -elasticsearch.startup=external elasticsearch.cluster_name=elasticsearch #Not a good number for real systems. Write shards should be 2x cluster size from our tests http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java index 125bd7a..c4596a2 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java @@ -40,8 +40,6 @@ public interface IndexFig extends GuicyFig { String ELASTICSEARCH_ALIAS_POSTFIX = "elasticsearch.alias_postfix"; - String ELASTICSEARCH_STARTUP = "elasticsearch.startup"; - String ELASTICSEARCH_NUMBER_OF_SHARDS = "elasticsearch.number_shards"; String ELASTICSEARCH_NUMBER_OF_REPLICAS = "elasticsearch.number_replicas"; @@ -83,7 +81,7 @@ public interface IndexFig extends GuicyFig { /** * The Elasticsearch cluster name. */ - @Default( "usergrid" ) + @Default( "elasticsearch" ) @Key( ELASTICSEARCH_CLUSTER_NAME ) String getClusterName(); @@ -102,13 +100,6 @@ public interface IndexFig extends GuicyFig { int getQueryCursorTimeout(); /** - * How Elasticsearch should be started. Valid values: embedded, forked, or remote - */ - @Default( "remote" ) - @Key( ELASTICSEARCH_STARTUP ) - String getStartUp(); - - /** * Force an index refresh after every write. Should only be TRUE for testing purposes. */ @Default( "false" ) http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties index 73c0b68..2589a7f 100644 --- a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties +++ b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties @@ -9,7 +9,6 @@ collections.keyspace=Usergrid_Collections index.query.limit.default=10 elasticsearch.indexname=QueryIndexTests -elasticsearch.startup=external elasticsearch.force-refresh=false http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties index 18757a4..67a9ab1 100644 --- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties @@ -12,7 +12,6 @@ collections.keyspace.strategy.options=replication_factor:1 collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy collection.stage.transient.timeout=6 -elasticsearch.startup=external elasticsearch.cluster_name=elasticsearch elasticsearch.hosts=127.0.0.1 elasticsearch.port=9300 http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/rest/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties index 59d117d..91fbf96 100644 --- a/stack/rest/src/test/resources/usergrid-custom-test.properties +++ b/stack/rest/src/test/resources/usergrid-custom-test.properties @@ -19,7 +19,6 @@ cassandra.startup=external #cassandra.connections=30 cassandra.timeout.pool=20000 -elasticsearch.startup=external hystrix.threadpool.graph_user.coreSize=1200 hystrix.threadpool.graph_async.coreSize=1200 http://git-wip-us.apache.org/repos/asf/usergrid/blob/6e5978bb/stack/services/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/services/src/test/resources/usergrid-custom-test.properties b/stack/services/src/test/resources/usergrid-custom-test.properties index f5fcb93..c19da59 100644 --- a/stack/services/src/test/resources/usergrid-custom-test.properties +++ b/stack/services/src/test/resources/usergrid-custom-test.properties @@ -15,7 +15,6 @@ # these settings allow tests to run and consistently pass on 16GB MacBook Pro # with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml) cassandra.startup=external -elasticsearch.startup=external #cassandra.connections=30 cassandra.timeout.pool=20000
