From 6943d9aa0a916da4a9a47bc6d9a501663876dcbb Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Fri, 7 Nov 2025 15:19:48 -0600 Subject: [PATCH] Logging geoip download failures due to node shutdown at INFO level --- .../elasticsearch/ingest/geoip/GeoIpDownloader.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java index 6e673eddfda2b..29b0d59ee9733 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java @@ -9,6 +9,7 @@ package org.elasticsearch.ingest.geoip; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; @@ -24,6 +25,7 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.core.TimeValue; import org.elasticsearch.core.Tuple; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -33,6 +35,7 @@ import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.ingest.geoip.GeoIpTaskState.Metadata; import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStats; +import org.elasticsearch.node.NodeClosedException; import org.elasticsearch.persistent.AllocatedPersistentTask; import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask; import org.elasticsearch.tasks.TaskId; @@ -216,7 +219,13 @@ private void processDatabase(final String name, final String md5, final String u } } catch (Exception e) { stats = stats.failedDownload(); - logger.error(() -> "error downloading geoip database [" + name + "] for project [" + projectId + "]", e); + boolean nodeShuttingDown = e instanceof NodeClosedException + || (e instanceof EsRejectedExecutionException rejected && rejected.isExecutorShutdown()); + logger.log( + nodeShuttingDown ? Level.INFO : Level.ERROR, + () -> "error downloading geoip database [" + name + "] for project [" + projectId + "]", + e + ); } }