Skip to content

Commit efe4d42

Browse files
authored
Logging geoip download failures due to node shutdown at INFO level (#137772)
1 parent 3a7a5b2 commit efe4d42

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
package org.elasticsearch.ingest.geoip;
1111

12+
import org.apache.logging.log4j.Level;
1213
import org.apache.logging.log4j.LogManager;
1314
import org.apache.logging.log4j.Logger;
1415
import org.elasticsearch.action.ActionListener;
@@ -24,6 +25,7 @@
2425
import org.elasticsearch.common.settings.Setting;
2526
import org.elasticsearch.common.settings.Setting.Property;
2627
import org.elasticsearch.common.settings.Settings;
28+
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
2729
import org.elasticsearch.core.TimeValue;
2830
import org.elasticsearch.core.Tuple;
2931
import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -33,6 +35,7 @@
3335
import org.elasticsearch.index.reindex.DeleteByQueryRequest;
3436
import org.elasticsearch.ingest.geoip.GeoIpTaskState.Metadata;
3537
import org.elasticsearch.ingest.geoip.stats.GeoIpDownloaderStats;
38+
import org.elasticsearch.node.NodeClosedException;
3639
import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask;
3740
import org.elasticsearch.tasks.TaskId;
3841
import org.elasticsearch.threadpool.ThreadPool;
@@ -209,7 +212,13 @@ private void processDatabase(final String name, final String md5, final String u
209212
}
210213
} catch (Exception e) {
211214
stats = stats.failedDownload();
212-
logger.error(() -> "error downloading geoip database [" + name + "] for project [" + projectId + "]", e);
215+
boolean nodeShuttingDown = e instanceof NodeClosedException
216+
|| (e instanceof EsRejectedExecutionException rejected && rejected.isExecutorShutdown());
217+
logger.log(
218+
nodeShuttingDown ? Level.INFO : Level.ERROR,
219+
() -> "error downloading geoip database [" + name + "] for project [" + projectId + "]",
220+
e
221+
);
213222
}
214223
}
215224

0 commit comments

Comments
 (0)