|
@@ -395,7 +395,7 @@ public final class SnapshotsService extends AbstractLifecycleComponent implement
|
|
|
@Override
|
|
|
public void onFailure(Exception e) {
|
|
|
initializingClones.remove(snapshot);
|
|
|
- logger.warn(() -> format("[%s][%s] failed to clone snapshot", repositoryName, snapshotName), e);
|
|
|
+ logSnapshotFailure("clone", snapshot, e);
|
|
|
listener.onFailure(e);
|
|
|
}
|
|
|
|
|
@@ -3845,28 +3845,33 @@ public final class SnapshotsService extends AbstractLifecycleComponent implement
|
|
|
|
|
|
@Override
|
|
|
public void onFailure(Exception e) {
|
|
|
- final var logLevel = snapshotFailureLogLevel(e);
|
|
|
- if (logLevel == Level.INFO && logger.isDebugEnabled() == false) {
|
|
|
- // suppress stack trace at INFO unless extra verbosity is configured
|
|
|
- logger.info(
|
|
|
- format(
|
|
|
- "[%s][%s] failed to create snapshot: %s",
|
|
|
- snapshot.getRepository(),
|
|
|
- snapshot.getSnapshotId().getName(),
|
|
|
- e.getMessage()
|
|
|
- )
|
|
|
- );
|
|
|
- } else {
|
|
|
- logger.log(
|
|
|
- logLevel,
|
|
|
- () -> format("[%s][%s] failed to create snapshot", snapshot.getRepository(), snapshot.getSnapshotId().getName()),
|
|
|
- e
|
|
|
- );
|
|
|
- }
|
|
|
+ logSnapshotFailure("create", snapshot, e);
|
|
|
listener.onFailure(e);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private static void logSnapshotFailure(String operation, Snapshot snapshot, Exception e) {
|
|
|
+ final var logLevel = snapshotFailureLogLevel(e);
|
|
|
+ if (logLevel == Level.INFO && logger.isDebugEnabled() == false) {
|
|
|
+ // suppress stack trace at INFO unless extra verbosity is configured
|
|
|
+ logger.info(
|
|
|
+ format(
|
|
|
+ "[%s][%s] failed to %s snapshot: %s",
|
|
|
+ snapshot.getRepository(),
|
|
|
+ snapshot.getSnapshotId().getName(),
|
|
|
+ operation,
|
|
|
+ e.getMessage()
|
|
|
+ )
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ logger.log(
|
|
|
+ logLevel,
|
|
|
+ () -> format("[%s][%s] failed to %s snapshot", snapshot.getRepository(), snapshot.getSnapshotId().getName(), operation),
|
|
|
+ e
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private static Level snapshotFailureLogLevel(Exception e) {
|
|
|
if (MasterService.isPublishFailureException(e)) {
|
|
|
// no action needed, the new master will take things from here
|