Merge pull request #2024 from gchq/2022-rename-instance-properties

Issue 2022 - Rename instance properties with prefix sleeper.table

example/full/instance.properties

@@ -113,21 +113,21 @@ sleeper.metadata.s3.dynamo.pointintimerecovery=false
 # the DynamoDB tables.
 sleeper.tables.index.dynamo.pointintimerecovery=false
 
-# The timeout in minutes for when the table properties provider cache should be cleared, forcing table
-# properties to be reloaded from S3.
-sleeper.table.properties.provider.timeout.minutes=60
-
 # This specifies whether queries and scans against the table index DynamoDB tables are strongly
 # consistent.
 sleeper.tables.index.dynamo.consistent.reads=true
 
+# The timeout in minutes for when the table properties provider cache should be cleared, forcing table
+# properties to be reloaded from S3.
+sleeper.cache.table.properties.provider.timeout.minutes=60
+
 # The amount of memory for lambdas that create batches of tables to run some operation against, eg.
 # create compaction jobs, run garbage collection, perform partition splitting.
-sleeper.table.batching.lambdas.memory=1024
+sleeper.batch.table.lambdas.memory=1024
 
 # The timeout in seconds for lambdas that create batches of tables to run some operation against, eg.
 # create compaction jobs, run garbage collection, perform partition splitting.
-sleeper.table.batching.lambdas.timeout.seconds=60
+sleeper.batch.table.lambdas.timeout.seconds=60
 
 
 ## The following properties relate to standard ingest.

java/configuration/src/main/java/sleeper/configuration/properties/instance/CommonProperty.java

@@ -201,29 +201,28 @@ public interface CommonProperty {
             .validationPredicate(Utils::isTrueOrFalse)
             .propertyGroup(InstancePropertyGroup.COMMON)
             .runCdkDeployWhenChanged(true).build();
-
-    UserDefinedInstanceProperty TABLE_PROPERTIES_PROVIDER_TIMEOUT_IN_MINS = Index.propertyBuilder("sleeper.table.properties.provider.timeout.minutes")
-            .description("The timeout in minutes for when the table properties provider cache should be cleared, " +
-                    "forcing table properties to be reloaded from S3.")
-            .defaultValue("60")
-            .validationPredicate(Utils::isPositiveInteger)
-            .propertyGroup(InstancePropertyGroup.COMMON)
-            .build();
     UserDefinedInstanceProperty TABLE_INDEX_DYNAMO_STRONGLY_CONSISTENT_READS = Index.propertyBuilder("sleeper.tables.index.dynamo.consistent.reads")
             .description("This specifies whether queries and scans against the table index DynamoDB tables " +
                     "are strongly consistent.")
             .defaultValue("true")
             .validationPredicate(Utils::isTrueOrFalse)
             .propertyGroup(InstancePropertyGroup.COMMON)
             .build();
-    UserDefinedInstanceProperty TABLE_BATCHING_LAMBDAS_MEMORY_IN_MB = Index.propertyBuilder("sleeper.table.batching.lambdas.memory")
+    UserDefinedInstanceProperty TABLE_PROPERTIES_PROVIDER_TIMEOUT_IN_MINS = Index.propertyBuilder("sleeper.cache.table.properties.provider.timeout.minutes")
+            .description("The timeout in minutes for when the table properties provider cache should be cleared, " +
+                    "forcing table properties to be reloaded from S3.")
+            .defaultValue("60")
+            .validationPredicate(Utils::isPositiveInteger)
+            .propertyGroup(InstancePropertyGroup.COMMON)
+            .build();
+    UserDefinedInstanceProperty TABLE_BATCHING_LAMBDAS_MEMORY_IN_MB = Index.propertyBuilder("sleeper.batch.table.lambdas.memory")
             .description("The amount of memory for lambdas that create batches of tables to run some operation against, " +
                     "eg. create compaction jobs, run garbage collection, perform partition splitting.")
             .defaultValue("1024")
             .validationPredicate(Utils::isPositiveInteger)
             .propertyGroup(InstancePropertyGroup.COMMON)
             .build();
-    UserDefinedInstanceProperty TABLE_BATCHING_LAMBDAS_TIMEOUT_IN_SECONDS = Index.propertyBuilder("sleeper.table.batching.lambdas.timeout.seconds")
+    UserDefinedInstanceProperty TABLE_BATCHING_LAMBDAS_TIMEOUT_IN_SECONDS = Index.propertyBuilder("sleeper.batch.table.lambdas.timeout.seconds")
             .description("The timeout in seconds for lambdas that create batches of tables to run some operation against, " +
                     "eg. create compaction jobs, run garbage collection, perform partition splitting.")
             .defaultValue("60")

scripts/templates/instanceproperties.template

@@ -154,21 +154,21 @@ sleeper.metadata.s3.dynamo.pointintimerecovery=false
 # the DynamoDB tables.
 sleeper.tables.index.dynamo.pointintimerecovery=false
 
-# The timeout in minutes for when the table properties provider cache should be cleared, forcing table
-# properties to be reloaded from S3.
-sleeper.table.properties.provider.timeout.minutes=60
-
 # This specifies whether queries and scans against the table index DynamoDB tables are strongly
 # consistent.
 sleeper.tables.index.dynamo.consistent.reads=true
 
+# The timeout in minutes for when the table properties provider cache should be cleared, forcing table
+# properties to be reloaded from S3.
+sleeper.cache.table.properties.provider.timeout.minutes=60
+
 # The amount of memory for lambdas that create batches of tables to run some operation against, eg.
 # create compaction jobs, run garbage collection, perform partition splitting.
-sleeper.table.batching.lambdas.memory=1024
+sleeper.batch.table.lambdas.memory=1024
 
 # The timeout in seconds for lambdas that create batches of tables to run some operation against, eg.
 # create compaction jobs, run garbage collection, perform partition splitting.
-sleeper.table.batching.lambdas.timeout.seconds=60
+sleeper.batch.table.lambdas.timeout.seconds=60
 
 
 ## The following properties relate to standard ingest.