honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Execute SnapshotsService Error Callback on Generic Thread (#46277) (#46480)

Browse Source 
I couldn't find a test for this, as it seems we only get
into this error handler on a bug. Regardless, we are
executing the snapshot finalization on the master update
thread here which shouldn't happen and will make
debugging a production issue resulting from this
trickier than it has to be (because we probably also
get a cluster state apply is slow warning in addition
to the original bug).
Used the generic pool here instead of the snapshot pool
because we're resolving the user callback here as
well and the generic pool seemed like the safer bet for
that.
This commit is contained in:
Armin Braun 2019-09-09 14:38:11 +02:00 committed by GitHub
parent 31bee53fdd
commit ee3396735c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
View File

@ -545,27 +545,28 @@ public class SnapshotsService extends AbstractLifecycleComponent implements Clus
}
private void cleanupAfterError(Exception exception) {
if(snapshotCreated) {
try {
repositoriesService.repository(snapshot.snapshot().getRepository())
.finalizeSnapshot(snapshot.snapshot().getSnapshotId(),
snapshot.indices(),
snapshot.startTime(),
ExceptionsHelper.detailedMessage(exception),
0,
Collections.emptyList(),
snapshot.getRepositoryStateId(),
snapshot.includeGlobalState(),
snapshot.userMetadata());
} catch (Exception inner) {
inner.addSuppressed(exception);
logger.warn(() -> new ParameterizedMessage("[{}] failed to close snapshot in repository",
snapshot.snapshot()), inner);
threadPool.generic().execute(() -> {
if (snapshotCreated) {
try {
repositoriesService.repository(snapshot.snapshot().getRepository())
.finalizeSnapshot(snapshot.snapshot().getSnapshotId(),
snapshot.indices(),
snapshot.startTime(),
ExceptionsHelper.detailedMessage(exception),
0,
Collections.emptyList(),
snapshot.getRepositoryStateId(),
snapshot.includeGlobalState(),
snapshot.userMetadata());
} catch (Exception inner) {
inner.addSuppressed(exception);
logger.warn(() -> new ParameterizedMessage("[{}] failed to close snapshot in repository",
snapshot.snapshot()), inner);
}
}
}
userCreateSnapshotListener.onFailure(e);
userCreateSnapshotListener.onFailure(e);
});
}
}
private static SnapshotInfo inProgressSnapshot(SnapshotsInProgress.Entry entry) {