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

Jump to bottom

Handle no such remote cluster exception in ccr #53415

Merged
merged 3 commits into from
Mar 13, 2020
Merged

Handle no such remote cluster exception in ccr #53415

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa4b8b6
Handle no such remote cluster exception in ccr
dnhatn Mar 11, 2020
13c493c
log when failed to renew leases
dnhatn Mar 13, 2020
e35e78c
Merge branch 'master' into fix-ccr-remote-client
dnhatn Mar 13, 2020
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
Next Next commit
Handle no such remote cluster exception in ccr
  • Loading branch information
@dnhatn
dnhatn committed Mar 11, 2020
commit fa4b8b6f59db2ef72ae2ca8ec263e0e5ec1f027c
45 changes: 23 additions & 22 deletions ...plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowTasksExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,7 @@ protected void innerUpdateMapping(long minRequiredMappingVersion, LongConsumer h
final Index followerIndex = params.getFollowShardId().getIndex();
final Index leaderIndex = params.getLeaderShardId().getIndex();
final Supplier<TimeValue> timeout = () -> isStopped() ? TimeValue.MINUS_ONE : waitForMetadataTimeOut;

final Client remoteClient;
try {
remoteClient = remoteClient(params);
} catch (NoSuchRemoteClusterException e) {
errorHandler.accept(e);
return;
}

CcrRequests.getIndexMetadata(remoteClient, leaderIndex, minRequiredMappingVersion, 0L, timeout, ActionListener.wrap(
final ActionListener<IndexMetaData> listener = ActionListener.wrap(
indexMetaData -> {
if (indexMetaData.mapping() == null) {
assert indexMetaData.getMappingVersion() == 1;
Expand All @@ -155,7 +146,12 @@ protected void innerUpdateMapping(long minRequiredMappingVersion, LongConsumer h
errorHandler));
},
errorHandler
));
);
try {
CcrRequests.getIndexMetadata(remoteClient(params), leaderIndex, minRequiredMappingVersion, 0L, timeout, listener);
} catch (NoSuchRemoteClusterException e) {
errorHandler.accept(e);
}
}

@Override
Expand Down Expand Up @@ -424,21 +420,26 @@ protected Scheduler.Cancellable scheduleBackgroundRetentionLeaseRenewal(final Lo
"{} background adding retention lease [{}] while following",
params.getFollowShardId(),
retentionLeaseId);
CcrRetentionLeases.asyncAddRetentionLease(
try {
final ActionListener<RetentionLeaseActions.Response> wrappedListener = ActionListener.wrap(
r -> {},
inner -> {
/*
* If this fails that the retention lease already exists, something highly unusual is
* going on. Log it, and renew again after another renew interval has passed.
*/
final Throwable innerCause = ExceptionsHelper.unwrapCause(inner);
logRetentionLeaseFailure(retentionLeaseId, innerCause);
});
CcrRetentionLeases.asyncAddRetentionLease(
params.getLeaderShardId(),
retentionLeaseId,
followerGlobalCheckpoint.getAsLong(),
remoteClient(params),
ActionListener.wrap(
r -> {},
inner -> {
/*
* If this fails that the retention lease already exists, something highly unusual is
* going on. Log it, and renew again after another renew interval has passed.
*/
final Throwable innerCause = ExceptionsHelper.unwrapCause(inner);
logRetentionLeaseFailure(retentionLeaseId, innerCause);
}));
wrappedListener);
} catch (NoSuchRemoteClusterException ignored) {
// we will attempt to renew again after another renew interval has passed
dnhatn marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
// if something else happened, we will attempt to renew again after another renew interval has passed
}
Expand Down