Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inline TransportReplAct#createReplicatedOperation #41197

Merged
merged 5 commits into from
Apr 16, 2019
Merged

Inline TransportReplAct#createReplicatedOperation #41197

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
667cfd8
Inline TransportReplAct#createReplicatedOperation
DaveCTurner Apr 15, 2019
fb1f7eb
fail in try block
DaveCTurner Apr 15, 2019
1350c0f
No need to wrap the listener
DaveCTurner Apr 15, 2019
a26a986
Less usage of primaryShardReference
DaveCTurner Apr 15, 2019
c5dc9f9
Revert "Less usage of primaryShardReference"
DaveCTurner Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...rc/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,10 @@ public void handleException(TransportException exp) {
onCompletionListener.onResponse(response);
}, e -> handleException(primaryShardReference, e));

final IndexShard shard = primaryShardReference.indexShard;

final ActionListener<Response> globalCheckpointSyncingListener = ActionListener.wrap(response -> {
if (syncGlobalCheckpointAfterOperation) {
final IndexShard shard = primaryShardReference.indexShard;
try {
shard.maybeSyncGlobalCheckpoint("post-operation");
} catch (final Exception e) {
Expand All @@ -376,7 +377,8 @@ public void handleException(TransportException exp) {
// intentionally swallow, a missed global checkpoint sync should not fail this operation
logger.info(
new ParameterizedMessage(
"{} failed to execute post-operation global checkpoint sync", shard.shardId()), e);
"{} failed to execute post-operation global checkpoint sync",
primaryShardReference.routingEntry().shardId()), e);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I follow this change, I cannot figure out how this makes a difference. I think using just shard.shardId() is simpler unless there is a reason for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More foreshadowing of changes to come, but I can defer this until later.

}
}
}
Expand Down