From 43ed6768027b3d36b24a370c7c2a80a7334e0814 Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Mon, 30 Oct 2023 20:41:37 +1100 Subject: [PATCH] Logging index name on unfound mapping hash (#101499) Relates: #101331 --- .../org/elasticsearch/cluster/metadata/IndexMetadata.java | 4 +++- .../gateway/PersistedClusterStateServiceTests.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java index c19b6b801c3c5..742b52365c8d7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java @@ -2506,7 +2506,9 @@ public static IndexMetadata fromXContent(XContentParser parser, Map { assert mappingsByHash != null : "no deduplicated mappings given"; if (mappingsByHash.containsKey(parser.text()) == false) { - throw new IllegalArgumentException("mapping with hash [" + parser.text() + "] not found"); + throw new IllegalArgumentException( + "mapping of index [" + builder.index + "] with hash [" + parser.text() + "] not found" + ); } builder.putMapping(mappingsByHash.get(parser.text())); } diff --git a/server/src/test/java/org/elasticsearch/gateway/PersistedClusterStateServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/PersistedClusterStateServiceTests.java index 7373e62eba72f..bad6702e8ad83 100644 --- a/server/src/test/java/org/elasticsearch/gateway/PersistedClusterStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/PersistedClusterStateServiceTests.java @@ -1687,7 +1687,7 @@ public void testFailsIfMappingIsMissing() throws IOException { final String message = expectThrows(CorruptStateException.class, () -> persistedClusterStateService.loadBestOnDiskState()) .getCause() .getMessage(); - assertEquals("java.lang.IllegalArgumentException: mapping with hash [" + hash + "] not found", message); + assertEquals("java.lang.IllegalArgumentException: mapping of index [test-1] with hash [" + hash + "] not found", message); } }