honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-03 09:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ENGINE] Force optimize was not passed to shard request

Browse Source 
The force flag to trigger optimiz calls of a single segment for upgrading
etc. was never passed on to the shard request.

Closes #7404
This commit is contained in:
Simon Willnauer 2014-08-22 15:29:26 +02:00
parent e78694ae82
commit fdf1998f39
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
View File

@ -48,6 +48,7 @@ class ShardOptimizeRequest extends BroadcastShardOperationRequest {
maxNumSegments = request.maxNumSegments();
onlyExpungeDeletes = request.onlyExpungeDeletes();
flush = request.flush();
force = request.force();
}
boolean waitForMerge() {

41
src/test/java/org/elasticsearch/index/engine/internal/InternalEngineIntegrationTest.java
View File

@ -26,6 +26,7 @@ import org.elasticsearch.action.admin.indices.segments.IndexShardSegments;
import org.elasticsearch.action.admin.indices.segments.IndicesSegmentResponse;
import org.elasticsearch.action.admin.indices.segments.ShardSegments;
import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.util.BloomFilter;
import org.elasticsearch.index.codec.CodecService;
@ -35,6 +36,9 @@ import org.hamcrest.Matchers;
import org.junit.Test;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutionException;
public class InternalEngineIntegrationTest extends ElasticsearchIntegrationTest {
@ -130,6 +134,33 @@ public class InternalEngineIntegrationTest extends ElasticsearchIntegrationTest
assertTotalCompoundSegments(2, 3, "test");
}
public void testForceOptimize() throws ExecutionException, InterruptedException {
client().admin().indices().prepareCreate("test").setSettings(ImmutableSettings.builder().put("number_of_replicas", 0).put("number_of_shards", 1)).get();
final int numDocs = randomIntBetween(10, 100);
IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs];
for (int i = 0; i < builders.length; i++) {
builders[i] = client().prepareIndex("test", "type").setSource("field", "value");
}
indexRandom(true, builders);
ensureGreen();
flushAndRefresh();
client().admin().indices().prepareOptimize("test").setMaxNumSegments(1).setWaitForMerge(true).get();
IndexSegments firstSegments = client().admin().indices().prepareSegments("test").get().getIndices().get("test");
client().admin().indices().prepareOptimize("test").setMaxNumSegments(1).setWaitForMerge(true).get();
IndexSegments secondsSegments = client().admin().indices().prepareSegments("test").get().getIndices().get("test");
assertThat(segments(firstSegments), Matchers.containsInAnyOrder(segments(secondsSegments).toArray()));
assertThat(segments(firstSegments).size(), Matchers.equalTo(1));
assertThat(segments(secondsSegments), Matchers.containsInAnyOrder(segments(firstSegments).toArray()));
assertThat(segments(secondsSegments).size(), Matchers.equalTo(1));
client().admin().indices().prepareOptimize("test").setMaxNumSegments(1).setWaitForMerge(true).setForce(true).get();
IndexSegments thirdSegments = client().admin().indices().prepareSegments("test").get().getIndices().get("test");
assertThat(segments(firstSegments).size(), Matchers.equalTo(1));
assertThat(segments(thirdSegments).size(), Matchers.equalTo(1));
assertThat(segments(firstSegments), Matchers.not(Matchers.containsInAnyOrder(segments(thirdSegments).toArray())));
assertThat(segments(thirdSegments), Matchers.not(Matchers.containsInAnyOrder(segments(firstSegments).toArray())));
}
private void assertTotalCompoundSegments(int i, int t, String index) {
IndicesSegmentResponse indicesSegmentResponse = client().admin().indices().prepareSegments(index).get();
IndexSegments indexSegments = indicesSegmentResponse.getIndices().get(index);
@ -150,7 +181,15 @@ public class InternalEngineIntegrationTest extends ElasticsearchIntegrationTest
}
assertThat(compounds, Matchers.equalTo(i));
assertThat(total, Matchers.equalTo(t));
}
private Set<Segment> segments(IndexSegments segments) {
Set<Segment> segmentSet = new HashSet<>();
for (IndexShardSegments s : segments) {
for (ShardSegments shardSegments : s) {
segmentSet.addAll(shardSegments.getSegments());
}
}
return segmentSet;
}
}