From 727def37cbf42139feaacc86c7f60edd08e87ab7 Mon Sep 17 00:00:00 2001 From: Jason Han Date: Tue, 14 Dec 2021 13:01:36 -0800 Subject: [PATCH 1/4] Remove all log4j references --- build.gradle | 5 +++++ .../openmbee/mms/elastic/services/ElasticSearchService.java | 6 +++--- .../org/openmbee/mms/twc/config/TwcAuthSecurityConfig.java | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 6f274e1d9..2886725f8 100644 --- a/build.gradle +++ b/build.gradle @@ -146,6 +146,11 @@ subprojects { } } } + + configurations.all { + exclude group: "org.slf4j", module: "slf4j-log4j12" + exclude group: "log4j", module: "log4j" + } } signing { diff --git a/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java b/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java index 3e9e1b1d3..a6367a6b7 100644 --- a/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java +++ b/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java @@ -1,7 +1,7 @@ package org.openmbee.mms.elastic.services; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.elasticsearch.action.fieldcaps.FieldCapabilities; import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest; import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse; @@ -37,7 +37,7 @@ @Service public class ElasticSearchService implements SearchService { - private final Logger logger = LogManager.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); @Value("${elasticsearch.limit.result}") protected int resultLimit; diff --git a/twc/src/main/java/org/openmbee/mms/twc/config/TwcAuthSecurityConfig.java b/twc/src/main/java/org/openmbee/mms/twc/config/TwcAuthSecurityConfig.java index 95e041c0b..29c6f7e72 100644 --- a/twc/src/main/java/org/openmbee/mms/twc/config/TwcAuthSecurityConfig.java +++ b/twc/src/main/java/org/openmbee/mms/twc/config/TwcAuthSecurityConfig.java @@ -1,7 +1,7 @@ package org.openmbee.mms.twc.config; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.openmbee.mms.twc.security.TwcAuthenticationFilter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,7 +16,7 @@ @EnableWebSecurity @EnableTransactionManagement public class TwcAuthSecurityConfig { - private static Logger logger = LogManager.getLogger(TwcAuthSecurityConfig.class); + private static Logger logger = LoggerFactory.getLogger(TwcAuthSecurityConfig.class); public void setAuthConfig(HttpSecurity http) throws Exception { http.addFilterBefore(twcAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class); From bf40c47d4d54ac464058396e33de9fefe376543a Mon Sep 17 00:00:00 2001 From: Jason Han Date: Tue, 14 Dec 2021 15:27:57 -0800 Subject: [PATCH 2/4] Add explicit scroll clearing --- .../services/ElasticSearchService.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java b/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java index a6367a6b7..207b2395d 100644 --- a/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java +++ b/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java @@ -1,5 +1,8 @@ package org.openmbee.mms.elastic.services; +import org.elasticsearch.action.ActionListener; +import org.elasticsearch.action.search.ClearScrollRequest; +import org.elasticsearch.action.search.ClearScrollResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.elasticsearch.action.fieldcaps.FieldCapabilities; @@ -46,6 +49,19 @@ public class ElasticSearchService implements SearchService { protected RestHighLevelClient client; protected NodeDAO nodeRepository; + protected ActionListener listener = new ActionListener<>() { + @Override + public void onResponse(ClearScrollResponse clearScrollResponse) { + logger.debug("Cleared: " + clearScrollResponse.getNumFreed()); + } + + @Override + public void onFailure(Exception e) { + logger.error("Scroll clear failure: "); + logger.error(e.getMessage()); + } + }; + @Autowired public void setRestHighLevelClient(@Qualifier("clientElastic") RestHighLevelClient client) { this.client = client; @@ -193,6 +209,9 @@ private List performElasticQuery(Set allNodeDocIds, SearchR if (scrollId != null) { SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT); + ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); + clearScrollRequest.addScrollId(scrollId); + client.clearScrollAsync(clearScrollRequest, RequestOptions.DEFAULT, listener); } } while (scrollId != null && searchResponse.getHits().getHits() != null && searchResponse.getHits().getHits().length != 0); From c566a19a38b54be6120163adc56a0645fb520543 Mon Sep 17 00:00:00 2001 From: Jason Han Date: Tue, 14 Dec 2021 16:39:50 -0800 Subject: [PATCH 3/4] Move scroll clear outside loop --- .../mms/elastic/services/ElasticSearchService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java b/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java index 207b2395d..632eb23d4 100644 --- a/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java +++ b/elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java @@ -209,13 +209,16 @@ private List performElasticQuery(Set allNodeDocIds, SearchR if (scrollId != null) { SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT); - ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); - clearScrollRequest.addScrollId(scrollId); - client.clearScrollAsync(clearScrollRequest, RequestOptions.DEFAULT, listener); } } while (scrollId != null && searchResponse.getHits().getHits() != null && searchResponse.getHits().getHits().length != 0); + if (scrollId != null) { + ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); + clearScrollRequest.addScrollId(scrollId); + client.clearScrollAsync(clearScrollRequest, RequestOptions.DEFAULT, listener); + } + return result; } From 04a7392516f576b5c0501bfba19db1332f8052aa Mon Sep 17 00:00:00 2001 From: Jason Han Date: Tue, 11 Jan 2022 09:47:13 -0800 Subject: [PATCH 4/4] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 21320ea0e..a642f3e58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=4.0.5 +version=4.0.6 group=org.openmbee.mms springBootVersion=2.2.6.RELEASE