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

[CCR] Remove ccr related metadata between tests for single node tests too

This commit is contained in:
Martijn van Groningen 2018-10-22 09:15:22 +02:00
parent b6750cf6c2
commit 92e34732f5
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRIntegTestCase.java
View File

@ -105,30 +105,7 @@ public abstract class CCRIntegTestCase extends ESTestCase {
public void afterTest() throws Exception {
String masterNode = clusterGroup.followerCluster.getMasterName();
ClusterService clusterService = clusterGroup.followerCluster.getInstance(ClusterService.class, masterNode);
CountDownLatch latch = new CountDownLatch(1);
clusterService.submitStateUpdateTask("purge-cluster-state", new ClusterStateUpdateTask() {
@Override
public ClusterState execute(ClusterState currentState) throws Exception {
ClusterState.Builder newState = ClusterState.builder(currentState);
newState.metaData(MetaData.builder(currentState.getMetaData())
.removeCustom(AutoFollowMetadata.TYPE)
.removeCustom(PersistentTasksCustomMetaData.TYPE)
.build());
return newState.build();
}
@Override
public void onFailure(String source, Exception e) {
latch.countDown();
}
@Override
public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {
latch.countDown();
}
});
latch.await();
removeCCRRelatedMetadataFromClusterState(clusterService);
try {
clusterGroup.leaderCluster.beforeIndexDeletion();
@ -286,6 +263,32 @@ public abstract class CCRIntegTestCase extends ESTestCase {
return actionGet;
}
static void removeCCRRelatedMetadataFromClusterState(ClusterService clusterService) throws Exception {
CountDownLatch latch = new CountDownLatch(1);
clusterService.submitStateUpdateTask("remove-ccr-related-metadata", new ClusterStateUpdateTask() {
@Override
public ClusterState execute(ClusterState currentState) throws Exception {
ClusterState.Builder newState = ClusterState.builder(currentState);
newState.metaData(MetaData.builder(currentState.getMetaData())
.removeCustom(AutoFollowMetadata.TYPE)
.removeCustom(PersistentTasksCustomMetaData.TYPE)
.build());
return newState.build();
}
@Override
public void onFailure(String source, Exception e) {
latch.countDown();
}
@Override
public void clusterStateProcessed(String source, ClusterState oldState, ClusterState newState) {
latch.countDown();
}
});
latch.await();
}
static class ClusterGroup implements Closeable {
final InternalTestCluster leaderCluster;

7
x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CCRSingleNodeTestCase.java
View File

@ -7,6 +7,7 @@
package org.elasticsearch.xpack;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.license.LicenseService;
@ -23,6 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.xpack.CCRIntegTestCase.removeCCRRelatedMetadataFromClusterState;
public abstract class CCRSingleNodeTestCase extends ESSingleNodeTestCase {
@ -52,7 +54,10 @@ public abstract class CCRSingleNodeTestCase extends ESSingleNodeTestCase {
}
@After
public void remoteLocalRemote() {
public void remoteLocalRemote() throws Exception {
ClusterService clusterService = getInstanceFromNode(ClusterService.class);
removeCCRRelatedMetadataFromClusterState(clusterService);
ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
updateSettingsRequest.transientSettings(Settings.builder().put("cluster.remote.local.seeds", (String) null));
assertAcked(client().admin().cluster().updateSettings(updateSettingsRequest).actionGet());