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

Fixes Tests so build passes

This commit is contained in:
Colin Goodheart-Smithe 2018-01-03 12:01:12 +00:00
parent a37df9092e
commit 043c8db84d
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/indexlifecycle/ForceMergeAction.java
View File

@ -180,7 +180,13 @@ public class ForceMergeAction implements LifecycleAction {
r2 -> forceMerge(index, client, listener, r2 -> forceMerge(index, client, listener,
// after a successful force-merge, return the index to read-write // after a successful force-merge, return the index to read-write
r3 -> updateBlockWriteSettingToReadWrite(index, client, listener))), r3 -> updateBlockWriteSettingToReadWrite(index, client, listener))),
r4 -> { if (isReadOnly) updateBlockWriteSettingToReadWrite(index, client, listener); }); r4 -> {
if (isReadOnly) {
updateBlockWriteSettingToReadWrite(index, client, listener);
} else {
listener.onSuccess(true);
}
});
} }
} }

2
x-pack/plugin/src/test/java/org/elasticsearch/xpack/indexlifecycle/ForceMergeActionTests.java
View File

@ -296,7 +296,7 @@ public class ForceMergeActionTests extends AbstractSerializingTestCase<ForceMerg
} }
}); });
assertEquals(null, actionCompleted.get()); assertEquals(true, actionCompleted.get());
InOrder inOrder = Mockito.inOrder(clusterService, client, adminClient, indicesClient); InOrder inOrder = Mockito.inOrder(clusterService, client, adminClient, indicesClient);
inOrder.verify(clusterService).state(); inOrder.verify(clusterService).state();

8
x-pack/plugin/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationIT.java
View File

@ -91,8 +91,7 @@ public class IndexLifecycleInitialisationIT extends ESIntegTestCase {
.put(SETTING_NUMBER_OF_REPLICAS, 0).put("index.lifecycle.name", "test").build(); .put(SETTING_NUMBER_OF_REPLICAS, 0).put("index.lifecycle.name", "test").build();
Map<String, Phase> phases = new HashMap<>(); Map<String, Phase> phases = new HashMap<>();
Map<String, LifecycleAction> warmPhaseActions = Collections.singletonMap(ForceMergeAction.NAME, Map<String, LifecycleAction> warmPhaseActions = Collections.singletonMap(ForceMergeAction.NAME, new ForceMergeAction(10000));
new ForceMergeAction(-1));
phases.put("warm", new Phase("warm", TimeValue.timeValueSeconds(2), warmPhaseActions)); phases.put("warm", new Phase("warm", TimeValue.timeValueSeconds(2), warmPhaseActions));
Map<String, LifecycleAction> deletePhaseActions = Collections.singletonMap(DeleteAction.NAME, new DeleteAction()); Map<String, LifecycleAction> deletePhaseActions = Collections.singletonMap(DeleteAction.NAME, new DeleteAction());
@ -124,8 +123,7 @@ public class IndexLifecycleInitialisationIT extends ESIntegTestCase {
public void testMasterDedicatedDataDedicated() throws Exception { public void testMasterDedicatedDataDedicated() throws Exception {
// start master node // start master node
logger.info("Starting sever1"); logger.info("Starting sever1");
final String server_1 = internalCluster().startMasterOnlyNode(); internalCluster().startMasterOnlyNode();
final String node1 = getLocalNodeId(server_1);
// start data node // start data node
logger.info("Starting sever1"); logger.info("Starting sever1");
final String server_2 = internalCluster().startDataOnlyNode(); final String server_2 = internalCluster().startDataOnlyNode();
@ -171,7 +169,7 @@ public class IndexLifecycleInitialisationIT extends ESIntegTestCase {
logger.info("Starting server2"); logger.info("Starting server2");
// start another server // start another server
String server_2 = internalCluster().startNode(); internalCluster().startNode();
// first wait for 2 nodes in the cluster // first wait for 2 nodes in the cluster
logger.info("Waiting for replicas to be assigned"); logger.info("Waiting for replicas to be assigned");

2
x-pack/plugin/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleServiceTests.java
View File

@ -223,7 +223,7 @@ public class IndexLifecycleServiceTests extends ESTestCase {
when(clusterService.state()).thenReturn(currentState); when(clusterService.state()).thenReturn(currentState);
doAnswer(invocationOnMock -> { doAnswer(invocationOnMock -> {
ActionListener<UpdateSettingsResponse> listener = (ActionListener) invocationOnMock.getArguments()[1]; ActionListener<UpdateSettingsResponse> listener = (ActionListener<UpdateSettingsResponse>) invocationOnMock.getArguments()[1];
listener.onResponse(UpdateSettingsTestHelper.createMockResponse(true)); listener.onResponse(UpdateSettingsTestHelper.createMockResponse(true));
return null; return null;

4
x-pack/plugin/src/test/resources/rest-api-spec/test/index_lifecycle/10_basic.yml
View File

@ -18,7 +18,9 @@ setup:
"warm": { "warm": {
"after": "10s", "after": "10s",
"actions": { "actions": {
"forcemerge": {} "forcemerge": {
"max_num_segments": 10000
}
} }
}, },
"delete": { "delete": {