honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unmuted test now that #37239 has been merged and backported. 

Relates to #37231
This commit is contained in:
Martijn van Groningen 2019-01-11 09:02:46 +01:00
parent 80084138dd
commit 37493c204d
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/CCRIT.java
View File

@ -8,7 +8,6 @@ package org.elasticsearch.upgrades;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.client.Request; import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
@ -22,7 +21,6 @@ import java.util.Map;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/37231")
public class CCRIT extends AbstractUpgradeTestCase { public class CCRIT extends AbstractUpgradeTestCase {
private static final Logger LOGGER = LogManager.getLogger(CCRIT.class); private static final Logger LOGGER = LogManager.getLogger(CCRIT.class);
@ -38,8 +36,8 @@ public class CCRIT extends AbstractUpgradeTestCase {
} }
public void testIndexFollowing() throws Exception { public void testIndexFollowing() throws Exception {
assumeTrue("CCR became available in 6.5 and test relies on a fix that was shipped with 6.5.4", assumeTrue("CCR became available in 6.5, but test relies on a fix that was shipped with 6.6.0",
UPGRADE_FROM_VERSION.onOrAfter(Version.V_6_5_4)); UPGRADE_FROM_VERSION.onOrAfter(Version.V_6_6_0));
setupRemoteCluster(); setupRemoteCluster();
final String leaderIndex = "my-leader-index"; final String leaderIndex = "my-leader-index";
@ -92,8 +90,8 @@ public class CCRIT extends AbstractUpgradeTestCase {
} }
public void testAutoFollowing() throws Exception { public void testAutoFollowing() throws Exception {
assumeTrue("CCR became available in 6.5 and test relies on a fix that was shipped with 6.5.4", assumeTrue("CCR became available in 6.5, but test relies on a fix that was shipped with 6.6.0",
UPGRADE_FROM_VERSION.onOrAfter(Version.V_6_5_4)); UPGRADE_FROM_VERSION.onOrAfter(Version.V_6_6_0));
setupRemoteCluster(); setupRemoteCluster();
final Settings indexSettings = Settings.builder() final Settings indexSettings = Settings.builder()
@ -268,6 +266,8 @@ public class CCRIT extends AbstractUpgradeTestCase {
private void assertFollowerGlobalCheckpoint(String followerIndex, int expectedFollowerCheckpoint) throws IOException { private void assertFollowerGlobalCheckpoint(String followerIndex, int expectedFollowerCheckpoint) throws IOException {
Request statsRequest = new Request("GET", "/" + followerIndex + "/_stats"); Request statsRequest = new Request("GET", "/" + followerIndex + "/_stats");
statsRequest.addParameter("level", "shards"); statsRequest.addParameter("level", "shards");
// Just docs metric is sufficient here:
statsRequest.addParameter("metric", "docs");
Map<?, ?> response = toMap(client().performRequest(statsRequest)); Map<?, ?> response = toMap(client().performRequest(statsRequest));
LOGGER.info("INDEX STATS={}", response); LOGGER.info("INDEX STATS={}", response);
assertThat(((Map) response.get("indices")).size(), equalTo(1)); assertThat(((Map) response.get("indices")).size(), equalTo(1));