Reduce global checkpoint sync interval in disruption tests

This should remove flakiness of the cluster disruption integration tests. See elastic/elasticsearch#38931 and elastic/elasticsearch@d49d9b5
crate · Aug 29, 2019 · d88092e · d88092e
1 parent 77f45c2
commit d88092e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/es/es-server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java b/es/es-server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java
@@ -330,7 +330,7 @@ private StartRecoveryRequest getStartRecoveryRequest(final RecoveryTarget recove
             logger.trace("{} preparing for file-based recovery from [{}]", recoveryTarget.shardId(), recoveryTarget.sourceNode());
         } else {
             logger.trace(
-                "{} preparing for sequence-number-based recovery starting at local checkpoint [{}] from [{}]",
+                "{} preparing for sequence-number-based recovery starting at sequence number [{}] from [{}]",
                 recoveryTarget.shardId(),
                 startingSeqNo,
                 recoveryTarget.sourceNode());

diff --git a/sql/src/main/java/io/crate/analyze/TableParameters.java b/sql/src/main/java/io/crate/analyze/TableParameters.java
@@ -36,6 +36,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.engine.EngineConfig;
 import org.elasticsearch.index.mapper.MapperService;
@@ -96,7 +97,10 @@ public class TableParameters {
             IndexMetaData.INDEX_ROUTING_REQUIRE_GROUP_SETTING,
             IndexMetaData.INDEX_ROUTING_INCLUDE_GROUP_SETTING,
             IndexMetaData.INDEX_ROUTING_EXCLUDE_GROUP_SETTING,
-            EngineConfig.INDEX_CODEC_SETTING
+            EngineConfig.INDEX_CODEC_SETTING,
+
+            // do NOT expose this setting, it is only needed for tests, see ClusterDisruptionIT.
+            IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING
         );
 
     /**

diff --git a/sql/src/test/java/io/crate/analyze/MetaDataToASTNodeResolverTest.java b/sql/src/test/java/io/crate/analyze/MetaDataToASTNodeResolverTest.java
@@ -93,6 +93,7 @@ public void testBuildCreateTableColumns() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +
@@ -139,6 +140,7 @@ public void testBuildCreateTablePrimaryKey() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +
@@ -187,6 +189,7 @@ public void testBuildCreateTableNotNull() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +
@@ -235,6 +238,7 @@ public void testBuildCreateTableClusteredByPartitionedBy() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +
@@ -308,6 +312,7 @@ public void testBuildCreateTableIndexes() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +
@@ -352,6 +357,7 @@ public void testBuildCreateTableStorageDefinitions() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +
@@ -395,6 +401,7 @@ public void testBuildCreateTableColumnDefaultClause() throws Exception {
                      "   \"blocks.write\" = false,\n" +
                      "   codec = 'default',\n" +
                      "   column_policy = 'strict',\n" +
+                     "   \"global_checkpoint_sync.interval\" = 30000,\n" +
                      "   \"mapping.total_fields.limit\" = 1000,\n" +
                      "   max_ngram_diff = 1,\n" +
                      "   max_shingle_diff = 3,\n" +

diff --git a/sql/src/test/java/io/crate/integrationtests/SQLTransportIntegrationTest.java b/sql/src/test/java/io/crate/integrationtests/SQLTransportIntegrationTest.java
@@ -100,6 +100,7 @@
 import org.elasticsearch.plugin.repository.url.URLRepositoryPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
+import org.elasticsearch.test.InternalSettingsPlugin;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
@@ -189,7 +190,8 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
             CrateCommonPlugin.class,
             HttpTransportPlugin.class,
             CommonAnalysisPlugin.class,
-            URLRepositoryPlugin.class
+            URLRepositoryPlugin.class,
+            InternalSettingsPlugin.class
         );
     }
 

diff --git a/sql/src/test/java/io/crate/integrationtests/disruption/discovery/ClusterDisruptionIT.java b/sql/src/test/java/io/crate/integrationtests/disruption/discovery/ClusterDisruptionIT.java
@@ -97,7 +97,7 @@ public void testAckedIndexing() throws Exception {
 
         logger.info("creating table t clustered into {} shards with {} replicas", numberOfShards, replicas);
         execute("create table t (id int primary key, x string) clustered into " + numberOfShards + " shards " +
-                "with (number_of_replicas = " + replicas + ", \"write.wait_for_active_shards\" = 1)");
+                "with (number_of_replicas = " + replicas + ", \"write.wait_for_active_shards\" = 1, \"global_checkpoint_sync.interval\"='1s')");
         ensureGreen();
 
         ServiceDisruptionScheme disruptionScheme = addRandomDisruptionScheme();