Separate the generic Akka config props from the ones specifically for Unique Values
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/841409ff Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/841409ff Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/841409ff Branch: refs/heads/release-2.1.1 Commit: 841409ff06540f469396224ca06c009bc07ce772 Parents: e50f5c6 Author: Dave Johnson <[email protected]> Authored: Thu Jun 23 17:26:51 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Jun 23 17:26:51 2016 -0400 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 45 +++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/841409ff/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 bc5d8c9..fcfe14d 100644 --- a/stack/config/src/main/resources/usergrid-default.properties +++ b/stack/config/src/main/resources/usergrid-default.properties @@ -410,6 +410,35 @@ usergrid.queue.lock.timeout=5 #usergrid.queue.publish.queuesize=850000 +######################### Akka Actor System Configiuration ################### +# +# Usergrid includes Akka, an Actor-based system that allows for the +# distribution of work across multiple Usergrid instances and multiple regions. +# +# All properties are required. If Akka is enabled then all properties in this +# section MUST be specified. +# +# For more information: https://issues.apache.org/jira/browse/USERGRID-1268 +# + +# Currently, Akka is disable and not required for Usergrid +collection.akka.enabled=false + +# host name of this machine +collection.akka.hostname=localhost + +# The region of this Usergrid installation +# Region MUST be in the region list specified in the 'usergrid.queue.regionList' property +collection.akka.region= + +# Comma-separated lists of Akka seeds each with format {region}:{hostname}:{port}. +# All regions MUST be listed in the 'usergrid.queue.regionList' +collection.akka.region.seeds= + +# The default authoritative region for when is not specified elsewhere +# Region MUST be in the region list specified in the 'usergrid.queue.regionList' property +collection.akka.authoritative.region= + ######################### Usergrid Unique Values Validation ################## # @@ -424,19 +453,6 @@ usergrid.queue.lock.timeout=5 # For more information: https://issues.apache.org/jira/browse/USERGRID-1268 # -# by default Akka0-based unique values validation is disable, akka is not started -collection.akka.enabled=false - -# host name of this machine -collection.akka.hostname=localhost - -# the region MUST be in the region list specified in the 'usergrid.queue.regionList' property -#collection.akka.region=us-east-1 - -# Comma-separated lists of seeds each with format {region}:{hostname}:{port}. -# Regions MUST be listed in the 'usergrid.queue.regionList' -#collection.akka.region.seeds= - # The number of unique value actors to start on each Usergrid instance. collection.akka.uniquevalue.actors=300 @@ -446,9 +462,6 @@ collection.akka.uniquevalue.cache.ttl=10 # TTL of a unique value reservation when written to Cassandra collection.akka.uniquevalue.reservation.ttl=10 -# If no region specified for type, use the authoritative region -#collection.akka.uniquevalue.authoritative.region= - ############################## Usergrid Scheduler ########################### #
