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

CCR side #30244 

Relates #30244
This commit is contained in:
Nhat Nguyen 2018-05-01 21:08:24 -04:00
parent d52ca33bd9
commit eb4281edef
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
View File

@ -639,7 +639,7 @@ public abstract class EngineTestCase extends ESTestCase {
// intentional // intentional
assertThat(result.isCreated(), equalTo(firstOp)); assertThat(result.isCreated(), equalTo(firstOp));
assertThat(result.getVersion(), equalTo(op.version())); assertThat(result.getVersion(), equalTo(op.version()));
assertThat(result.hasFailure(), equalTo(false)); assertThat(result.getResultType(), equalTo(Engine.Result.Type.SUCCESS));
} else { } else {
Engine.DeleteResult result = replicaEngine.delete((Engine.Delete) op); Engine.DeleteResult result = replicaEngine.delete((Engine.Delete) op);
@ -650,7 +650,7 @@ public abstract class EngineTestCase extends ESTestCase {
// intentional // intentional
assertThat(result.isFound(), equalTo(firstOp == false)); assertThat(result.isFound(), equalTo(firstOp == false));
assertThat(result.getVersion(), equalTo(op.version())); assertThat(result.getVersion(), equalTo(op.version()));
assertThat(result.hasFailure(), equalTo(false)); assertThat(result.getResultType(), equalTo(Engine.Result.Type.SUCCESS));
} }
if (randomBoolean()) { if (randomBoolean()) {
replicaEngine.refresh("test"); replicaEngine.refresh("test");

8
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/TransportBulkShardOperationsAction.java
View File

@ -13,7 +13,6 @@ import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.index.mapper.MapperException;
import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.Translog;
import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.IndicesService;
@ -68,12 +67,9 @@ public class TransportBulkShardOperationsAction
final BulkShardOperationsRequest request, final IndexShard shard, final Engine.Operation.Origin origin) throws IOException { final BulkShardOperationsRequest request, final IndexShard shard, final Engine.Operation.Origin origin) throws IOException {
Translog.Location location = null; Translog.Location location = null;
for (final Translog.Operation operation : request.getOperations()) { for (final Translog.Operation operation : request.getOperations()) {
final Engine.Result result = shard.applyTranslogOperation(operation, origin, m -> { final Engine.Result result = shard.applyTranslogOperation(operation, origin);
// TODO: Figure out how to deal best with dynamic mapping updates from the leader side:
throw new MapperException("dynamic mapping updates are not allowed in follow shards [" + operation + "]");
});
assert result.getSeqNo() == operation.seqNo(); assert result.getSeqNo() == operation.seqNo();
assert result.hasFailure() == false; assert result.getResultType() == Engine.Result.Type.SUCCESS;
location = locationToSync(location, result.getTranslogLocation()); location = locationToSync(location, result.getTranslogLocation());
} }
assert request.getOperations().length == 0 || location != null; assert request.getOperations().length == 0 || location != null;