From 5f4b7bad0bf0ddc1aa1143f3ae592093a1291897 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 6 Oct 2020 14:23:30 -0600 Subject: [PATCH 1/5] Replace refresh() method with more general refreshAllIndices() --- .../upgrades/FullClusterRestartIT.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index 26005d6921661..384463685f6af 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -143,7 +143,7 @@ public void testSearch() throws Exception { .field("binary", Base64.getEncoder().encodeToString(randomByteArray)) .endObject() ); - refresh(); + refreshAllIndices(); } else { count = countOfIndexedRandomDocuments(); } @@ -708,7 +708,7 @@ public void testRecovery() throws Exception { // Count the documents in the index to make sure we have as many as we put there Request countRequest = new Request("GET", "/" + index + "/_search"); countRequest.addParameter("size", "0"); - refresh(); + refreshAllIndices(); Map countResponse = entityAsMap(client().performRequest(countRequest)); assertTotalHits(count, countResponse); @@ -795,7 +795,7 @@ public void testSnapshotRestore() throws IOException { } // Refresh the index so the count doesn't fail - refresh(); + refreshAllIndices(); // Count the documents in the index to make sure we have as many as we put there Request countRequest = new Request("GET", "/" + index + "/_search"); @@ -935,7 +935,7 @@ public void testSoftDeletes() throws Exception { Request request = new Request("POST", "/" + index + "/_doc/" + i); request.setJsonEntity(doc); client().performRequest(request); - refresh(); + refreshAllIndices(); } client().performRequest(new Request("POST", "/" + index + "/_flush")); int liveDocs = numDocs; @@ -951,7 +951,7 @@ public void testSoftDeletes() throws Exception { liveDocs--; } } - refresh(); + refreshAllIndices(); assertTotalHits(liveDocs, entityAsMap(client().performRequest(new Request("GET", "/" + index + "/_search")))); saveInfoDocument(index + "_doc_count", Integer.toString(liveDocs)); } else { @@ -979,10 +979,10 @@ public void testClosedIndices() throws Exception { request.setJsonEntity(Strings.toString(JsonXContent.contentBuilder().startObject().field("field", "v1").endObject())); assertOK(client().performRequest(request)); if (rarely()) { - refresh(); + refreshAllIndices(); } } - refresh(); + refreshAllIndices(); } assertTotalHits(numDocs, entityAsMap(client().performRequest(new Request("GET", "/" + index + "/_search")))); @@ -1163,7 +1163,7 @@ private void indexRandomDocuments( createDocument.setJsonEntity(Strings.toString(docSupplier.apply(i))); client().performRequest(createDocument); if (rarely()) { - refresh(); + refreshAllIndices(); } if (flushAllowed && rarely()) { logger.debug("Flushing [{}]", index); @@ -1205,11 +1205,6 @@ private String loadInfoDocument(String id) throws IOException { return m.group(1); } - private void refresh() throws IOException { - logger.debug("Refreshing [{}]", index); - client().performRequest(new Request("POST", "/" + index + "/_refresh")); - } - private List dataNodes(String index, RestClient client) throws IOException { Request request = new Request("GET", index + "/_stats"); request.addParameter("level", "shards"); From 4491859a9912444141ab2d64e8880396ebaf0873 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 6 Oct 2020 14:23:55 -0600 Subject: [PATCH 2/5] Handle deprecation warning for old cluster in system index upgrade test --- .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java | 4 ++++ .../org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index 384463685f6af..911ab7a58df99 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -1422,6 +1422,10 @@ public void testSystemIndexMetadataIsUpgraded() throws Exception { // make sure .tasks index exists Request getTasksIndex = new Request("GET", "/.tasks"); + getTasksIndex.setOptions(expectVersionSpecificWarnings(v -> { + v.current(systemIndexWarning); + v.compatible(systemIndexWarning); + })); getTasksIndex.addParameter("allow_no_indices", "false"); getTasksIndex.setOptions(expectVersionSpecificWarnings(v -> { diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java index 65f9c66bff549..f6cbbac3f07b7 100644 --- a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java +++ b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java @@ -71,6 +71,10 @@ public void testSystemIndicesUpgrades() throws Exception { // make sure .tasks index exists Request getTasksIndex = new Request("GET", "/.tasks"); + getTasksIndex.setOptions(expectVersionSpecificWarnings(v -> { + v.current(systemIndexWarning); + v.compatible(systemIndexWarning); + })); getTasksIndex.addParameter("allow_no_indices", "false"); getTasksIndex.setOptions(expectVersionSpecificWarnings(v -> { From 2c51216d6e728bb5726defd8f9f788b7f1d27d90 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 6 Oct 2020 14:25:52 -0600 Subject: [PATCH 3/5] Revert "Disable BWC tests due to #63358 (#63360)" This reverts commit 490501d4bc5f0583ba378db1ef65331c76d21676. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f4197dff5f312..089bf2874d615 100644 --- a/build.gradle +++ b/build.gradle @@ -174,8 +174,8 @@ tasks.register("verifyVersions") { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false -final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/issues/63358" +boolean bwc_tests_enabled = true +final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false") From ecca0bd69d3299ed984cc7330b7ba5b2ef382a4d Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 6 Oct 2020 14:30:43 -0600 Subject: [PATCH 4/5] Handle another deprecation warning for old cluster in system index upgrade test --- .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index 911ab7a58df99..f513c468ec845 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -1451,6 +1451,10 @@ public void testSystemIndexMetadataIsUpgraded() throws Exception { " {\"add\": {\"index\": \"test_index_reindex\", \"alias\": \"test-system-alias\"}}\n" + " ]\n" + "}"); + putAliasRequest.setOptions(expectVersionSpecificWarnings(v -> { + v.current(systemIndexWarning); + v.compatible(systemIndexWarning); + })); assertThat(client().performRequest(putAliasRequest).getStatusLine().getStatusCode(), is(200)); } } else { From 84769ba51443f1bce3b11ef8b585ebf79b411b4f Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 6 Oct 2020 14:52:10 -0600 Subject: [PATCH 5/5] Handle yet another deprecation warning for old cluster in system index upgrade test --- .../org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java index f6cbbac3f07b7..6e2e58b731465 100644 --- a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java +++ b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SystemIndicesUpgradeIT.java @@ -100,6 +100,10 @@ public void testSystemIndicesUpgrades() throws Exception { " {\"add\": {\"index\": \"test_index_reindex\", \"alias\": \"test-system-alias\"}}\n" + " ]\n" + "}"); + putAliasRequest.setOptions(expectVersionSpecificWarnings(v -> { + v.current(systemIndexWarning); + v.compatible(systemIndexWarning); + })); assertThat(client().performRequest(putAliasRequest).getStatusLine().getStatusCode(), is(200)); } } else if (CLUSTER_TYPE == ClusterType.UPGRADED) {