Skip to content

Commit ed44d0d

Browse files
committed
PR feedback: Fix log line
1 parent 98cabbd commit ed44d0d

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,11 +497,18 @@ private void createIndex(SystemIndexMigrationInfo migrationInfo, ActionListener<
497497
}
498498

499499
private void createIndexRetryOnFailure(SystemIndexMigrationInfo migrationInfo, ActionListener<ShardsAcknowledgedResponse> listener) {
500-
createIndex(migrationInfo, ActionListener.wrap(listener::onResponse, e -> {
500+
createIndex(migrationInfo, listener.delegateResponse((l, e) -> {
501501
logger.warn("createIndex failed, retrying after removing index [{}] from previous attempt", migrationInfo.getNextIndexName());
502-
deleteIndex(migrationInfo, ActionListener.wrap(cleanupResponse -> createIndex(migrationInfo, listener), e2 -> {
503-
logger.warn("createIndex failed after retrying, aborting", e2);
504-
listener.onFailure(e2);
502+
deleteIndex(migrationInfo, ActionListener.wrap(cleanupResponse -> createIndex(migrationInfo, l.delegateResponse((l3, e3) -> {
503+
logger.error(
504+
"createIndex failed after retrying, aborting; index [{}] will be left in an inconsistent state",
505+
migrationInfo.getNextIndexName(),
506+
e3
507+
);
508+
l.onFailure(e3);
509+
})), e2 -> {
510+
logger.error("deleteIndex failed after retrying, aborting", e2);
511+
l.onFailure(e2);
505512
}));
506513
}));
507514
}

0 commit comments

Comments
 (0)