[skip ci] Only retain config that do not use defaults

Author: Alexander Patrikalakis

README.md

@@ -366,8 +366,8 @@ executor / thread-pool configuration.
 
 | Name            | Description | Datatype | Default Value | Mutability |
 |-----------------|-------------|----------|---------------|------------|
-| `s.d.c.e.core-pool-size` |  The core number of threads for the DynamoDB async client. | Integer | `Runtime.getRuntime(). availableProcessors() * 2` | LOCAL |
-| `s.d.c.e.max-pool-size` | The maximum allowed number of threads for the DynamoDB async client. | Integer | `Runtime.getRuntime(). availableProcessors() * 4` | LOCAL |
+| `s.d.c.e.core-pool-size` |  The core number of threads for the DynamoDB async client. | Integer | 25| LOCAL |
+| `s.d.c.e.max-pool-size` | The maximum allowed number of threads for the DynamoDB async client. | Integer | 50 | LOCAL |
 | `s.d.c.e.keep-alive` | The time limit for which threads may remain idle before being terminated for the DynamoDB async client.  | Integer | | LOCAL |
 | `s.d.c.e.max-queue-length` | The maximum size of the executor queue before requests start getting run in the caller.  | Integer | 1024 | LOCAL |
 | `s.d.c.e.max-concurrent-operations` | The expected number of threads expected to be using a single JanusGraph instance. Used to allocate threads to batch operations. | Integer | 1 | LOCAL |

src/main/java/com/amazon/janusgraph/diskstorage/dynamodb/Constants.java

@@ -219,11 +219,11 @@ public class Constants {
     public static final ConfigOption<Integer> DYNAMODB_CLIENT_EXECUTOR_CORE_POOL_SIZE =
         new ConfigOption<>(DYNAMODB_CLIENT_EXECUTOR_NAMESPACE, "core-pool-size",
         "The core number of threads for the DynamoDB async client.",
-        LOCAL, Runtime.getRuntime().availableProcessors() * 2);
+        LOCAL, 25);
     public static final ConfigOption<Integer> DYNAMODB_CLIENT_EXECUTOR_MAX_POOL_SIZE =
         new ConfigOption<>(DYNAMODB_CLIENT_EXECUTOR_NAMESPACE, "max-pool-size",
         "The maximum allowed number of threads for the DynamoDB async client.",
-        LOCAL, Runtime.getRuntime().availableProcessors() * 4);
+        LOCAL, 50);
     public static final ConfigOption<Long> DYNAMODB_CLIENT_EXECUTOR_KEEP_ALIVE =
         new ConfigOption<>(DYNAMODB_CLIENT_EXECUTOR_NAMESPACE, "keep-alive",
         "The time limit for which threads may remain idle before being terminated for the DynamoDB async client.",

src/test/resources/dynamodb-local-docker.properties

@@ -13,91 +13,18 @@
 # permissions and limitations under the License.
 #
 
-#general Titan configuration
 gremlin.graph=org.janusgraph.core.JanusGraphFactory
-storage.setup-wait=60000
-#adjust the buffer size based on the number of columns (multiple item data model) or the number of vertices (single item data model)
-storage.buffer-size=1024
-# Metrics configuration - http://docs.janusgraph.org/0.1.0/config-ref.html#_metrics
 #metrics.enabled=true
 #metrics.prefix=j
-# Required; specify logging interval in milliseconds
 #metrics.csv.interval=1000
 #metrics.csv.directory=metrics
+
 # Turn off JanusGraph retries as we batch and have our own exponential backoff strategy.
 storage.write-time=1 ms
 storage.read-time=1 ms
-storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
 
-#Amazon DynamoDB Storage Backend for JanusGraph configuration
-storage.dynamodb.force-consistent-read=true
-storage.dynamodb.prefix=jg
-storage.dynamodb.use-titan-ids=true
-storage.dynamodb.metrics-prefix=d
-storage.dynamodb.enable-parallel-scans=false
-storage.dynamodb.max-self-throttled-retries=60
-storage.dynamodb.control-plane-rate=10
-
-# DynamoDB client configuration: credentials
+storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
 storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.BasicAWSCredentials
 storage.dynamodb.client.credentials.constructor-args=access,secret
-
-# DynamoDB client configuration: specify the region
 storage.dynamodb.client.signing-region=us-east-1
-# DynamoDB client configuration: endpoint (Below, set to DynamoDB Local as invoked by mvn test -Pstart-dynamodb-local).
 storage.dynamodb.client.endpoint=http://dynamodb-local:8000
-
-# max http connections - not recommended to use more than 250 connections in DynamoDB Local
-storage.dynamodb.client.connection-max=250
-# turn off sdk retries
-storage.dynamodb.client.retry-error-max=0
-
-# DynamoDB client configuration: thread pool
-storage.dynamodb.client.executor.core-pool-size=25
-# Do not need more threads in thread pool than the number of http connections
-storage.dynamodb.client.executor.max-pool-size=250
-storage.dynamodb.client.executor.keep-alive=60000
-storage.dynamodb.client.executor.max-concurrent-operations=1
-# should be at least as large as the storage.buffer-size
-storage.dynamodb.client.executor.max-queue-length=1024
-
-# 750 r/w CU result in provisioning the maximum equal numbers read and write Capacity Units that can
-# be set on one table before it is split into two or more partitions for IOPS. If you will have more than one Rexster server
-# accessing the same graph, you should set the read-rate and write-rate properties to values commensurately lower than the
-# read and write capacity of the backend tables.
-
-storage.dynamodb.stores.edgestore.initial-capacity-read=100
-storage.dynamodb.stores.edgestore.initial-capacity-write=100
-storage.dynamodb.stores.edgestore.read-rate=100
-storage.dynamodb.stores.edgestore.write-rate=100
-storage.dynamodb.stores.edgestore.scan-limit=10000
-
-storage.dynamodb.stores.graphindex.initial-capacity-read=100
-storage.dynamodb.stores.graphindex.initial-capacity-write=100
-storage.dynamodb.stores.graphindex.read-rate=100
-storage.dynamodb.stores.graphindex.write-rate=100
-storage.dynamodb.stores.graphindex.scan-limit=10000
-
-storage.dynamodb.stores.systemlog.initial-capacity-read=10
-storage.dynamodb.stores.systemlog.initial-capacity-write=10
-storage.dynamodb.stores.systemlog.read-rate=10
-storage.dynamodb.stores.systemlog.write-rate=10
-storage.dynamodb.stores.systemlog.scan-limit=10000
-
-storage.dynamodb.stores.janusgraph_ids.initial-capacity-read=10
-storage.dynamodb.stores.janusgraph_ids.initial-capacity-write=10
-storage.dynamodb.stores.janusgraph_ids.read-rate=10
-storage.dynamodb.stores.janusgraph_ids.write-rate=10
-storage.dynamodb.stores.janusgraph_ids.scan-limit=10000
-
-storage.dynamodb.stores.system_properties.initial-capacity-read=10
-storage.dynamodb.stores.system_properties.initial-capacity-write=10
-storage.dynamodb.stores.system_properties.read-rate=10
-storage.dynamodb.stores.system_properties.write-rate=10
-storage.dynamodb.stores.system_properties.scan-limit=10000
-
-storage.dynamodb.stores.txlog.initial-capacity-read=10
-storage.dynamodb.stores.txlog.initial-capacity-write=10
-storage.dynamodb.stores.txlog.read-rate=10
-storage.dynamodb.stores.txlog.write-rate=10
-storage.dynamodb.stores.txlog.scan-limit=10000

src/test/resources/dynamodb-local.properties

@@ -13,91 +13,18 @@
 # permissions and limitations under the License.
 #
 
-#general Titan configuration
 gremlin.graph=org.janusgraph.core.JanusGraphFactory
-storage.setup-wait=60000
-#adjust the buffer size based on the number of columns (multiple item data model) or the number of vertices (single item data model)
-storage.buffer-size=1024
-# Metrics configuration - http://docs.janusgraph.org/0.1.0/config-ref.html#_metrics
 #metrics.enabled=true
 #metrics.prefix=j
-# Required; specify logging interval in milliseconds
 #metrics.csv.interval=1000
 #metrics.csv.directory=metrics
+
 # Turn off JanusGraph retries as we batch and have our own exponential backoff strategy.
 storage.write-time=1 ms
 storage.read-time=1 ms
-storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
 
-#Amazon DynamoDB Storage Backend for JanusGraph configuration
-storage.dynamodb.force-consistent-read=true
-storage.dynamodb.prefix=jg
-storage.dynamodb.use-titan-ids=true
-storage.dynamodb.metrics-prefix=d
-storage.dynamodb.enable-parallel-scans=false
-storage.dynamodb.max-self-throttled-retries=60
-storage.dynamodb.control-plane-rate=10
-
-# DynamoDB client configuration: credentials
+storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
 storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.BasicAWSCredentials
 storage.dynamodb.client.credentials.constructor-args=access,secret
-
-# DynamoDB client configuration: specify the region
 storage.dynamodb.client.signing-region=us-east-1
-# DynamoDB client configuration: endpoint (Below, set to DynamoDB Local as invoked by mvn test -Pstart-dynamodb-local).
 storage.dynamodb.client.endpoint=http://localhost:4567
-
-# max http connections - not recommended to use more than 250 connections in DynamoDB Local
-storage.dynamodb.client.connection-max=250
-# turn off sdk retries
-storage.dynamodb.client.retry-error-max=0
-
-# DynamoDB client configuration: thread pool
-storage.dynamodb.client.executor.core-pool-size=25
-# Do not need more threads in thread pool than the number of http connections
-storage.dynamodb.client.executor.max-pool-size=250
-storage.dynamodb.client.executor.keep-alive=60000
-storage.dynamodb.client.executor.max-concurrent-operations=1
-# should be at least as large as the storage.buffer-size
-storage.dynamodb.client.executor.max-queue-length=1024
-
-# 750 r/w CU result in provisioning the maximum equal numbers read and write Capacity Units that can
-# be set on one table before it is split into two or more partitions for IOPS. If you will have more than one Rexster server
-# accessing the same graph, you should set the read-rate and write-rate properties to values commensurately lower than the
-# read and write capacity of the backend tables.
-
-storage.dynamodb.stores.edgestore.initial-capacity-read=100
-storage.dynamodb.stores.edgestore.initial-capacity-write=100
-storage.dynamodb.stores.edgestore.read-rate=100
-storage.dynamodb.stores.edgestore.write-rate=100
-storage.dynamodb.stores.edgestore.scan-limit=10000
-
-storage.dynamodb.stores.graphindex.initial-capacity-read=100
-storage.dynamodb.stores.graphindex.initial-capacity-write=100
-storage.dynamodb.stores.graphindex.read-rate=100
-storage.dynamodb.stores.graphindex.write-rate=100
-storage.dynamodb.stores.graphindex.scan-limit=10000
-
-storage.dynamodb.stores.systemlog.initial-capacity-read=10
-storage.dynamodb.stores.systemlog.initial-capacity-write=10
-storage.dynamodb.stores.systemlog.read-rate=10
-storage.dynamodb.stores.systemlog.write-rate=10
-storage.dynamodb.stores.systemlog.scan-limit=10000
-
-storage.dynamodb.stores.janusgraph_ids.initial-capacity-read=10
-storage.dynamodb.stores.janusgraph_ids.initial-capacity-write=10
-storage.dynamodb.stores.janusgraph_ids.read-rate=10
-storage.dynamodb.stores.janusgraph_ids.write-rate=10
-storage.dynamodb.stores.janusgraph_ids.scan-limit=10000
-
-storage.dynamodb.stores.system_properties.initial-capacity-read=10
-storage.dynamodb.stores.system_properties.initial-capacity-write=10
-storage.dynamodb.stores.system_properties.read-rate=10
-storage.dynamodb.stores.system_properties.write-rate=10
-storage.dynamodb.stores.system_properties.scan-limit=10000
-
-storage.dynamodb.stores.txlog.initial-capacity-read=10
-storage.dynamodb.stores.txlog.initial-capacity-write=10
-storage.dynamodb.stores.txlog.read-rate=10
-storage.dynamodb.stores.txlog.write-rate=10
-storage.dynamodb.stores.txlog.scan-limit=10000

src/test/resources/dynamodb.properties

@@ -13,97 +13,46 @@
 # permissions and limitations under the License.
 #
 
-#general Titan configuration
 gremlin.graph=org.janusgraph.core.JanusGraphFactory
-#adjust block size based on number of columns in average transaction
-ids.block-size=100000
-storage.setup-wait=60000
-#adjust the buffer size based on the number of columns (multiple item data model) or the number of vertices (single item data model)
-storage.buffer-size=1024
-# Metrics configuration - http://docs.janusgraph.org/0.1.0/config-ref.html#_metrics
 #metrics.enabled=true
 #metrics.prefix=j
-# Required; specify logging interval in milliseconds
 #metrics.csv.interval=1000
 #metrics.csv.directory=metrics
+
 # Turn off JanusGraph retries as we batch and have our own exponential backoff strategy.
 storage.write-time=1 ms
 storage.read-time=1 ms
-storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
-
-#Amazon DynamoDB Storage Backend for JanusGraph configuration
-storage.dynamodb.force-consistent-read=true
-storage.dynamodb.prefix=jg
-storage.dynamodb.use-titan-ids=false
-storage.dynamodb.metrics-prefix=d
-storage.dynamodb.enable-parallel-scans=true
-storage.dynamodb.max-self-throttled-retries=60
-storage.dynamodb.control-plane-rate=10
 
-# DynamoDB client configuration: credentials
+storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
 storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.DefaultAWSCredentialsProviderChain
 storage.dynamodb.client.credentials.constructor-args=
-
-# DynamoDB client configuration: specify the region and the plugin will automatically use the correct
-# HTTPS DynamoDB endpoint for that region.
 storage.dynamodb.client.signing-region=us-west-2
-
-# Tune max HTTP connections based on a worse-case estimate of small write latency of 20s for <1KB items
-# Writes are at a total of 25 wps so we need 1 HTTP connections to support the load. Remember, reads and writes
-# both use these connections, so since the rps are also at 25 rps, lets use 2 HTTP connections. In practice,
-# the latency of reads during full graph scans will be larger than that of small writes (because Scan API can
-# pull down up to 1MB of data at a time), so you will need to estimate the GetItem/Query/Scan content of your
-# read workload and adjust HTTP connections appropriately.
-storage.dynamodb.client.connection-max=2
-# turn off sdk retries
-storage.dynamodb.client.retry-error-max=0
-
-# DynamoDB client configuration: thread pool should start with at least as many HTTP connections as threads.
-storage.dynamodb.client.executor.core-pool-size=2
-# Do not need more threads in thread pool than the number of http connections
-storage.dynamodb.client.executor.max-pool-size=250
-storage.dynamodb.client.executor.keep-alive=60000
-storage.dynamodb.client.executor.max-concurrent-operations=1
-# should be at least as large as the storage.buffer-size
-storage.dynamodb.client.executor.max-queue-length=1024
-
-# 750 r/w CU result in provisioning the maximum equal numbers read and write Capacity Units that can
-# be set on one table before it is split into two or more partitions for IOPS. If you will have more than one Rexster server
-# accessing the same graph, you should set the read-rate and write-rate properties to values commensurately lower than the
-# read and write capacity of the backend tables.
-
 storage.dynamodb.stores.edgestore.initial-capacity-read=12
 storage.dynamodb.stores.edgestore.initial-capacity-write=12
 storage.dynamodb.stores.edgestore.read-rate=12
 storage.dynamodb.stores.edgestore.write-rate=12
-storage.dynamodb.stores.edgestore.scan-limit=10000
 
 storage.dynamodb.stores.graphindex.initial-capacity-read=9
 storage.dynamodb.stores.graphindex.initial-capacity-write=9
 storage.dynamodb.stores.graphindex.read-rate=9
 storage.dynamodb.stores.graphindex.write-rate=9
-storage.dynamodb.stores.graphindex.scan-limit=10000
 
 storage.dynamodb.stores.systemlog.initial-capacity-read=1
 storage.dynamodb.stores.systemlog.initial-capacity-write=1
 storage.dynamodb.stores.systemlog.read-rate=1
 storage.dynamodb.stores.systemlog.write-rate=1
-storage.dynamodb.stores.systemlog.scan-limit=10000
 
 storage.dynamodb.stores.janusgraph_ids.initial-capacity-read=1
 storage.dynamodb.stores.janusgraph_ids.initial-capacity-write=1
 storage.dynamodb.stores.janusgraph_ids.read-rate=1
 storage.dynamodb.stores.janusgraph_ids.write-rate=1
-storage.dynamodb.stores.janusgraph_ids.scan-limit=10000
 
 storage.dynamodb.stores.system_properties.initial-capacity-read=1
 storage.dynamodb.stores.system_properties.initial-capacity-write=1
 storage.dynamodb.stores.system_properties.read-rate=1
 storage.dynamodb.stores.system_properties.write-rate=1
-storage.dynamodb.stores.system_properties.scan-limit=10000
 
 storage.dynamodb.stores.txlog.initial-capacity-read=1
 storage.dynamodb.stores.txlog.initial-capacity-write=1
 storage.dynamodb.stores.txlog.read-rate=1
 storage.dynamodb.stores.txlog.write-rate=1
-storage.dynamodb.stores.txlog.scan-limit=10000

src/test/resources/titan-upgrade.properties

@@ -13,57 +13,12 @@
 # permissions and limitations under the License.
 #
 gremlin.graph=org.janusgraph.core.JanusGraphFactory
-ids.block-size=100000
-storage.setup-wait=60000
-storage.buffer-size=1024
 storage.write-time=1 ms
 storage.read-time=1 ms
 storage.backend=com.amazon.janusgraph.diskstorage.dynamodb.DynamoDBStoreManager
-storage.dynamodb.force-consistent-read=true
 storage.dynamodb.prefix=v100
-storage.dynamodb.use-titan-ids=true
-storage.dynamodb.metrics-prefix=d
-storage.dynamodb.enable-parallel-scans=false
-storage.dynamodb.max-self-throttled-retries=60
-storage.dynamodb.control-plane-rate=10
+ids.store-name=titan_ids
 storage.dynamodb.client.credentials.class-name=com.amazonaws.auth.DefaultAWSCredentialsProviderChain
 storage.dynamodb.client.credentials.constructor-args=
 storage.dynamodb.client.endpoint=https://dynamodb.us-east-1.amazonaws.com
 storage.dynamodb.client.signing-region=us-east-1
-storage.dynamodb.client.connection-max=250
-storage.dynamodb.client.retry-error-max=0
-storage.dynamodb.client.executor.core-pool-size=25
-storage.dynamodb.client.executor.max-pool-size=250
-storage.dynamodb.client.executor.keep-alive=60000
-storage.dynamodb.client.executor.max-concurrent-operations=1
-storage.dynamodb.client.executor.max-queue-length=1024
-storage.dynamodb.stores.edgestore.capacity-read=100
-storage.dynamodb.stores.edgestore.capacity-write=100
-storage.dynamodb.stores.edgestore.read-rate=100
-storage.dynamodb.stores.edgestore.write-rate=100
-storage.dynamodb.stores.edgestore.scan-limit=10000
-storage.dynamodb.stores.graphindex.capacity-read=100
-storage.dynamodb.stores.graphindex.capacity-write=100
-storage.dynamodb.stores.graphindex.read-rate=100
-storage.dynamodb.stores.graphindex.write-rate=100
-storage.dynamodb.stores.graphindex.scan-limit=10000
-storage.dynamodb.stores.systemlog.capacity-read=10
-storage.dynamodb.stores.systemlog.capacity-write=10
-storage.dynamodb.stores.systemlog.read-rate=10
-storage.dynamodb.stores.systemlog.write-rate=10
-storage.dynamodb.stores.systemlog.scan-limit=10000
-storage.dynamodb.stores.janusgraph_ids.capacity-read=10
-storage.dynamodb.stores.janusgraph_ids.capacity-write=10
-storage.dynamodb.stores.janusgraph_ids.read-rate=10
-storage.dynamodb.stores.janusgraph_ids.write-rate=10
-storage.dynamodb.stores.janusgraph_ids.scan-limit=10000
-storage.dynamodb.stores.system_properties.capacity-read=10
-storage.dynamodb.stores.system_properties.capacity-write=10
-storage.dynamodb.stores.system_properties.read-rate=10
-storage.dynamodb.stores.system_properties.write-rate=10
-storage.dynamodb.stores.system_properties.scan-limit=10000
-storage.dynamodb.stores.txlog.capacity-read=10
-storage.dynamodb.stores.txlog.capacity-write=10
-storage.dynamodb.stores.txlog.read-rate=10
-storage.dynamodb.stores.txlog.write-rate=10
-storage.dynamodb.stores.txlog.scan-limit=10000