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

incorporate feedback

This commit is contained in:
Areek Zillur 2016-10-31 20:44:11 -04:00
parent eafd3dfc55
commit 02ecff13e4
8 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
View File

@ -134,7 +134,7 @@ public class TransportShardBulkAction extends TransportWriteAction<BulkShardRequ
// execute item request
final Engine.Result operationResult;
final DocWriteResponse response;
BulkItemRequest replicaRequest = request.items()[requestIndex];
final BulkItemRequest replicaRequest;
switch (itemRequest.opType()) {
case CREATE:
case INDEX:
@ -144,6 +144,7 @@ public class TransportShardBulkAction extends TransportWriteAction<BulkShardRequ
response = indexResult.hasFailure() ? null
: new IndexResponse(primary.shardId(), indexRequest.type(), indexRequest.id(),
indexResult.getVersion(), indexResult.isCreated());
replicaRequest = request.items()[requestIndex];
break;
case UPDATE:
UpdateResultHolder updateResultHolder = executeUpdateRequest(((UpdateRequest) itemRequest),
@ -159,6 +160,7 @@ public class TransportShardBulkAction extends TransportWriteAction<BulkShardRequ
response = deleteResult.hasFailure() ? null :
new DeleteResponse(request.shardId(), deleteRequest.type(), deleteRequest.id(),
deleteResult.getVersion(), deleteResult.isFound());
replicaRequest = request.items()[requestIndex];
break;
default: throw new IllegalStateException("unexpected opType [" + itemRequest.opType() + "] found");
}

2
core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
View File

@ -166,7 +166,7 @@ public class TransportIndexAction extends TransportWriteAction<IndexRequest, Ind
final Engine.Index operation;
try {
operation = replica.prepareIndexOnReplica(sourceToParse, request.version(), request.versionType(), request.getAutoGeneratedTimestamp(), request.isRetry());
} catch (MapperParsingException | IllegalArgumentException e) {
} catch (MapperParsingException e) {
return new Engine.IndexResult(e, request.version());
}
Mapping update = operation.parsedDoc().dynamicMappingsUpdate();

4
core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
View File

@ -378,7 +378,9 @@ public abstract class TransportReplicationAction<
* expects <code>finalResponseIfSuccessful</code> or <code>finalFailure</code> to be not-null
*/
public PrimaryResult(ReplicaRequest replicaRequest, Response finalResponseIfSuccessful, Exception finalFailure) {
assert finalFailure != null ^ finalResponseIfSuccessful != null : "either a response or a failure has to be not null";
assert finalFailure != null ^ finalResponseIfSuccessful != null
: "either a response or a failure has to be not null, " +
"found [" + finalFailure + "] failure and ["+ finalResponseIfSuccessful + "] response";
this.replicaRequest = replicaRequest;
this.finalResponseIfSuccessful = finalResponseIfSuccessful;
this.finalFailure = finalFailure;

3
core/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java
View File

@ -89,6 +89,9 @@ public abstract class TransportWriteAction<
@Nullable Location location, @Nullable Exception operationFailure,
IndexShard primary) {
super(request, finalResponse, operationFailure);
if (location != null) {
assert operationFailure == null : "expected no failures when translog location is not null";
}
if (operationFailure != null) {
this.finishedAsyncActions = true;
} else {

10
core/src/main/java/org/elasticsearch/index/engine/Engine.java
View File

@ -334,17 +334,9 @@ public abstract class Engine implements Closeable {
return operationType;
}
/** get size of the translog operation if translog location has been set */
public int getSizeInBytes() {
if (translogLocation != null) {
return translogLocation.size;
} else {
throw new IllegalStateException("result has null location, use Operation#estimatedSizeInBytes instead");
}
}
void setTranslogLocation(Translog.Location translogLocation) {
if (freeze == false) {
assert failure == null : "failure has to be null to set translog location";
this.translogLocation = translogLocation;
} else {
throw new IllegalStateException("result is already frozen");

18
core/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java
View File

@ -38,12 +38,17 @@ public interface IndexingOperationListener {
}
/**
* Called after the indexing operation occurred.
* Called after the indexing operation occurred. Implementations should
* check {@link Engine.IndexResult#hasFailure()} for operation failures
* and delegate to {@link #postIndex(Engine.Index, Exception)} with
* {@link Engine.IndexResult#getFailure()} if appropriate
*/
default void postIndex(Engine.Index index, Engine.IndexResult result) {}
/**
* Called after the indexing operation occurred with exception.
* Called after the indexing operation occurred with exception that
* is not specific to the {@link Engine.Index} i.e. persistent engine
* failures etc.
*/
default void postIndex(Engine.Index index, Exception ex) {}
@ -56,12 +61,17 @@ public interface IndexingOperationListener {
/**
* Called after the delete operation occurred.
* Called after the delete operation occurred. Implementations should
* check {@link Engine.DeleteResult#hasFailure()} for operation failures
* and delegate to {@link #postDelete(Engine.Delete, Exception)} with
* {@link Engine.DeleteResult#getFailure()} if appropriate
*/
default void postDelete(Engine.Delete delete, Engine.DeleteResult result) {}
/**
* Called after the delete operation occurred with exception.
* Called after the delete operation occurred with exception that
* is not specific to the {@link Engine.Delete} i.e. persistent engine
* failures etc.
*/
default void postDelete(Engine.Delete delete, Exception ex) {}

10
core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java
View File

@ -209,16 +209,10 @@ public class IndexingMemoryController extends AbstractComponent implements Index
recordOperationBytes(delete, result);
}
/** called by IndexShard to record that this many bytes were written to translog */
/** called by IndexShard to record estimated bytes written to translog for the operation */
private void recordOperationBytes(Engine.Operation operation, Engine.Result result) {
if (result.hasFailure() == false) {
final int sizeInBytes;
if (result.getTranslogLocation() != null) {
sizeInBytes = result.getSizeInBytes();
} else {
sizeInBytes = operation.estimatedSizeInBytes();
}
statusChecker.bytesWritten(sizeInBytes);
statusChecker.bytesWritten(operation.estimatedSizeInBytes());
}
}

26
core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java
View File

@ -30,6 +30,7 @@ import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.translog.Translog;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportResponse;
import org.elasticsearch.transport.TransportService;
import org.junit.Before;
import org.mockito.ArgumentCaptor;
@ -131,22 +132,23 @@ public class TransportWriteActionTests extends ESTestCase {
}
public void testDocumentFailureInShardOperationOnPrimary() throws Exception {
handleDocumentFailure(new TestAction(true, true), TestAction::shardOperationOnPrimary, TestAction.WritePrimaryResult::respond);
TestRequest request = new TestRequest();
TestAction testAction = new TestAction(true, true);
TransportWriteAction<TestRequest, TestRequest, TestResponse>.WritePrimaryResult writePrimaryResult =
testAction.shardOperationOnPrimary(request, indexShard);
CapturingActionListener<TestResponse> listener = new CapturingActionListener<>();
writePrimaryResult.respond(listener);
assertNull(listener.response);
assertNotNull(listener.failure);
}
public void testDocumentFailureInShardOperationOnReplica() throws Exception {
handleDocumentFailure(new TestAction(randomBoolean(), true), TestAction::shardOperationOnReplica,
TestAction.WriteReplicaResult::respond);
}
private <Result, Response> void handleDocumentFailure(TestAction testAction,
ThrowingTriFunction<TestAction, TestRequest, IndexShard, Result> action,
BiConsumer<Result, CapturingActionListener<Response>> responder)
throws Exception {
TestRequest request = new TestRequest();
Result result = action.apply(testAction, request, indexShard);
CapturingActionListener<Response> listener = new CapturingActionListener<>();
responder.accept(result, listener);
TestAction testAction = new TestAction(randomBoolean(), true);
TransportWriteAction<TestRequest, TestRequest, TestResponse>.WriteReplicaResult writeReplicaResult =
testAction.shardOperationOnReplica(request, indexShard);
CapturingActionListener<TransportResponse.Empty> listener = new CapturingActionListener<>();
writeReplicaResult.respond(listener);
assertNull(listener.response);
assertNotNull(listener.failure);
}