From 932215d6fac6519706d9542721d9f18913f9a80d Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Thu, 20 Oct 2011 16:17:38 +0200
Subject: [PATCH] rename check setting to check on startup

---
 .../index/shard/service/InternalIndexShard.java           | 8 ++++----
 .../test/stress/fullrestart/FullRestartStressTest.java    | 2 +-
 .../test/stress/manyindices/ManyIndicesStressTest.java    | 2 +-
 .../stress/rollingrestart/RollingRestartStressTest.java   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java
index c917c81df65..fd43e96e1dc 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/service/InternalIndexShard.java
@@ -120,7 +120,7 @@ public class InternalIndexShard extends AbstractIndexShardComponent implements I
     private final Object mutex = new Object();
 
 
-    private final boolean checkIndex;
+    private final boolean checkIndexOnStartup;
 
     private volatile IndexShardState state;
 
@@ -166,7 +166,7 @@ public class InternalIndexShard extends AbstractIndexShardComponent implements I
 
         logger.debug("state: [CREATED]");
 
-        this.checkIndex = indexSettings.getAsBoolean("index.shard.check_index", false);
+        this.checkIndexOnStartup = indexSettings.getAsBoolean("index.shard.check_on_startup", false);
     }
 
     public MergeSchedulerProvider mergeScheduler() {
@@ -261,7 +261,7 @@ public class InternalIndexShard extends AbstractIndexShardComponent implements I
             if (state == IndexShardState.RELOCATED) {
                 throw new IndexShardRelocatedException(shardId);
             }
-            if (checkIndex) {
+            if (checkIndexOnStartup) {
                 checkIndex(true);
             }
             engine.start();
@@ -512,7 +512,7 @@ public class InternalIndexShard extends AbstractIndexShardComponent implements I
             throw new IndexShardNotRecoveringException(shardId, state);
         }
         // also check here, before we apply the translog
-        if (checkIndex) {
+        if (checkIndexOnStartup) {
             checkIndex(true);
         }
         engine.start();
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java b/modules/test/integration/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java
index 41d1b9588fc..df91339c1c6 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java
@@ -217,7 +217,7 @@ public class FullRestartStressTest {
 
         int numberOfNodes = 2;
         Settings settings = ImmutableSettings.settingsBuilder()
-                .put("index.shard.check_index", true)
+                .put("index.shard.check_on_startup", true)
                 .put("gateway.type", "local")
                 .put("gateway.recover_after_nodes", numberOfNodes)
                 .put("index.number_of_shards", 1)
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java b/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java
index 2dc7c134145..e7e10290320 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/stress/manyindices/ManyIndicesStressTest.java
@@ -46,7 +46,7 @@ public class ManyIndicesStressTest {
         int numberOfDocs = 100;
 
         Settings settings = ImmutableSettings.settingsBuilder()
-                .put("index.shard.check_index", false)
+                .put("index.shard.check_on_startup", false)
                 .put("gateway.type", "fs")
                 .put("index.number_of_shards", 1)
                 .build();
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java b/modules/test/integration/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java
index 8e6fb3567a4..0b888accf3c 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/stress/rollingrestart/RollingRestartStressTest.java
@@ -339,7 +339,7 @@ public class RollingRestartStressTest {
         System.setProperty("es.logger.prefix", "");
 
         Settings settings = settingsBuilder()
-                .put("index.shard.check_index", true)
+                .put("index.shard.check_on_startup", true)
                 .put("gateway.type", "none")
                 .put("path.data", "data/data1,data/data2")
                 .build();