diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java index 66e4ce0d223f2..cfc653ddd2b82 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java @@ -189,7 +189,7 @@ public interface NonRestorableCustom extends Custom { private final String[] allClosedIndices; private final String[] visibleClosedIndices; - private volatile SortedMap indicesLookup; + private SortedMap indicesLookup; Metadata(String clusterUUID, boolean clusterUUIDCommitted, long version, CoordinationMetadata coordinationMetadata, Settings transientSettings, Settings persistentSettings, DiffableStringMap hashesOfConsistentSettings, @@ -306,12 +306,11 @@ public boolean equalsAliases(Metadata other) { public SortedMap getIndicesLookup() { if (indicesLookup != null) { return indicesLookup; - } - synchronized (this) { + } else { DataStreamMetadata dataStreamMetadata = custom(DataStreamMetadata.TYPE); indicesLookup = Collections.unmodifiableSortedMap(Builder.buildIndicesLookup(dataStreamMetadata, indices)); + return indicesLookup; } - return indicesLookup; } /**