From afe99644e8d455f5b19589d1484495681e90aa09 Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Fri, 2 Feb 2018 16:59:25 +0100 Subject: [PATCH 1/2] Improve SR message --- .../main/java/org/elasticsearch/snapshots/RestoreService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java index 63b461afbd747..0aa664e3fbbe2 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java @@ -362,7 +362,8 @@ private void validateExistingIndex(IndexMetaData currentIndexMetaData, IndexMeta // Index exist - checking that it's closed if (currentIndexMetaData.getState() != IndexMetaData.State.CLOSE) { // TODO: Enable restore for open indices - throw new SnapshotRestoreException(snapshot, "cannot restore index [" + renamedIndex + "] because it's open"); + throw new SnapshotRestoreException(snapshot, "cannot restore index [" + renamedIndex + "] because an open index with same name already exists in the cluster. " + + "Either close or delete the existing index in the cluster or restore the index from the snapshot under a different name by providing a replacement name using a rename pattern"); } // Index exist - checking if it's partial restore if (partial) { From d6c3e8a2be8276a0c391cd6a04c1ae9a486e974e Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Tue, 6 Feb 2018 14:24:15 +0100 Subject: [PATCH 2/2] review comment --- .../main/java/org/elasticsearch/snapshots/RestoreService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java index 0aa664e3fbbe2..0a929cc8f0bc1 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java @@ -363,7 +363,7 @@ private void validateExistingIndex(IndexMetaData currentIndexMetaData, IndexMeta if (currentIndexMetaData.getState() != IndexMetaData.State.CLOSE) { // TODO: Enable restore for open indices throw new SnapshotRestoreException(snapshot, "cannot restore index [" + renamedIndex + "] because an open index with same name already exists in the cluster. " + - "Either close or delete the existing index in the cluster or restore the index from the snapshot under a different name by providing a replacement name using a rename pattern"); + "Either close or delete the existing index or restore the index under a different name by providing a rename pattern and replacement name"); } // Index exist - checking if it's partial restore if (partial) {