From 73c75bef216ee2d0658c7029c7c97e587983caad Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Tue, 11 Sep 2018 08:40:22 -0400
Subject: [PATCH] Preserve cluster settings on full restart tests (#33590)

Today the full cluster restart tests do not preserve cluster settings on
restart. This is a mistake because it is not an accurate reflection of
reality, we do not expect users to clear cluster settings when they
perform a full cluster restart. This commit makes it so that all full
cluster restart tests preserve settings on upgrade.
---
 .../upgrades/AbstractFullClusterRestartTestCase.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java b/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java
index 62c8e2f00ff..7e73e795b8a 100644
--- a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java
@@ -57,4 +57,9 @@ public abstract class AbstractFullClusterRestartTestCase extends ESRestTestCase
         return true;
     }
 
+    @Override
+    protected boolean preserveClusterSettings() {
+        return true;
+    }
+
 }