From 9352e290534a9321636ae367aaefcbef2f819896 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Mon, 30 Jan 2023 17:40:02 -0600 Subject: [PATCH 1/3] Avoiding race conditions in GeoIpDownloaderIT --- .../org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java index f3f37f50147fb..4677c8c0881cf 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java @@ -254,6 +254,7 @@ public void testGeoIpDatabasesDownload() throws Exception { assertBusy(() -> { GeoIpTaskState state = getGeoIpTaskState(); assertEquals(Set.of("GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb"), state.getDatabases().keySet()); + putGeoIpPipeline(); // This is to work around the race condition described in #92888 }, 2, TimeUnit.MINUTES); for (String id : List.of("GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb")) { @@ -309,7 +310,10 @@ public void testGeoIpDatabasesDownloadNoGeoipProcessors() throws Exception { .setPersistentSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), true)) .get(); assertTrue(settingsResponse.isAcknowledged()); - assertBusy(() -> { assertNull(getTask().getState()); }); + assertBusy(() -> { + assertNull(getTask().getState()); + putGeoIpPipeline(); // This is to work around the race condition described in #92888 + }); putNonGeoipPipeline(pipelineId); assertBusy(() -> { assertNull(getTask().getState()); }); putNonGeoipPipeline(pipelineId); From f93be7073da1bed1f8f7f0356468b579c50fb15a Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Mon, 30 Jan 2023 18:05:35 -0600 Subject: [PATCH 2/3] adding another assertion --- .../java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java index 4677c8c0881cf..14e98a01342a8 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java @@ -311,6 +311,7 @@ public void testGeoIpDatabasesDownloadNoGeoipProcessors() throws Exception { .get(); assertTrue(settingsResponse.isAcknowledged()); assertBusy(() -> { + assertNull(getTask()); assertNull(getTask().getState()); putGeoIpPipeline(); // This is to work around the race condition described in #92888 }); From dfd49db6fde130223dd2534adc08a9e0a2a25a23 Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Mon, 30 Jan 2023 18:10:37 -0600 Subject: [PATCH 3/3] fixing typo --- .../java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java index 14e98a01342a8..5d02fde827160 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java @@ -311,7 +311,7 @@ public void testGeoIpDatabasesDownloadNoGeoipProcessors() throws Exception { .get(); assertTrue(settingsResponse.isAcknowledged()); assertBusy(() -> { - assertNull(getTask()); + assertNotNull(getTask()); assertNull(getTask().getState()); putGeoIpPipeline(); // This is to work around the race condition described in #92888 });