Move nodeFeature checks to beforeUpgrade

Author: jordan-powers

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java

@@ -54,6 +54,8 @@ public static Iterable<Object[]> parameters() {
 
     protected abstract ElasticsearchCluster getUpgradeCluster();
 
+    protected void beforeUpgrade() {}
+
     @Before
     public void upgradeNode() throws Exception {
         // extract old cluster features
@@ -96,6 +98,8 @@ public void upgradeNode() throws Exception {
         // Skip remaining tests if upgrade failed
         assumeFalse("Cluster upgrade failed", upgradeFailed);
 
+        beforeUpgrade();
+
         // finally, upgrade node
         if (upgradedNodes.size() < requestedUpgradedNodes) {
             closeClients();

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsUsageRollingUpgradeIT.java

@@ -13,7 +13,6 @@
 
 import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
-import org.junit.Before;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -31,8 +30,8 @@ public LogsUsageRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
         super(upgradedNodes);
     }
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java

@@ -21,7 +21,6 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.elasticsearch.xcontent.XContentType;
-import org.junit.Before;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -76,8 +75,8 @@ public LogsdbIndexingRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes)
         super(upgradedNodes);
     }
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java

@@ -22,7 +22,6 @@
 import org.elasticsearch.index.mapper.MapperFeatures;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.elasticsearch.xcontent.XContentType;
-import org.junit.Before;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -92,8 +91,8 @@ public MatchOnlyTextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
         super(upgradedNodes);
     }
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/NoLogsUsageRollingUpgradeIT.java

@@ -12,7 +12,6 @@
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
 import org.elasticsearch.Build;
-import org.junit.Before;
 
 import java.time.Instant;
 import java.util.Map;
@@ -29,8 +28,8 @@ public NoLogsUsageRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
         super(upgradedNodes);
     }
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/StandardToLogsDbIndexModeRollingUpgradeIT.java

@@ -25,7 +25,6 @@
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
-import org.junit.Before;
 import org.junit.ClassRule;
 
 import java.io.IOException;
@@ -116,8 +115,8 @@ protected Settings restClientSettings() {
           }
         }""";
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/SyntheticSourceRollingUpgradeIT.java

@@ -15,7 +15,6 @@
 import org.elasticsearch.client.Request;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.hamcrest.Matchers;
-import org.junit.Before;
 
 import java.time.Instant;
 import java.util.Arrays;
@@ -72,8 +71,8 @@ public SyntheticSourceRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes)
         super(upgradedNodes);
     }
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TextRollingUpgradeIT.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.elasticsearch.xcontent.XContentType;
-import org.junit.Before;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -89,8 +88,8 @@ public TextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
         super(upgradedNodes);
     }
 
-    @Before
-    public void checkFeatures() {
+    @Override
+    protected void beforeUpgrade() {
         if (Build.current().isSnapshot()) {
             assumeTrue("rename of pattern_text mapper", oldClusterHasFeature("mapper.pattern_text_rename"));
         }