From 91707f947df25a30716c77dcf2b707cf5981ea4e Mon Sep 17 00:00:00 2001 From: elia Date: Thu, 30 Jul 2020 14:17:06 +0200 Subject: [PATCH 1/2] [SEARCH-2330] changed log messages at tracking enabling and disabling --- .../solr/tracker/ActivatableTracker.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java index f2659e5fa..7ae9af9be 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java @@ -72,20 +72,13 @@ public abstract class ActivatableTracker extends AbstractTracker public final void disable() { clearScheduledMaintenanceWork(); - - if (isEnabled.compareAndSet(true, false)) - { + if (isEnabled.compareAndSet(true, false)){ if (state != null && state.isRunning()) { - LOGGER.info("[{} / {} / {}] {} Tracker has been disabled (the change will be effective at the next tracking cycle) and set in rollback mode because it is running.", coreName, trackerId, state, type); setRollback(true, null); } - LOGGER.info("[{} / {} / {}] {} Tracker has been disabled. The change will be effective at the next tracking cycle.", coreName, trackerId, state, type); - } - else - { - LOGGER.warn("[{} / {} / {}] {} Tracker cannot be disabled because it is already in that state.", coreName, trackerId, state, type); } + LOGGER.info("[{} / {} / {}] {} Tracker has been disabled.", coreName, trackerId, state, type); } /** @@ -93,14 +86,8 @@ public abstract class ActivatableTracker extends AbstractTracker */ public final void enable() { - if (isEnabled.compareAndSet(false, true)) - { - LOGGER.info("[{} / {} / {}] {} Tracker has been enabled. The change will be effective at the next tracking cycle.", coreName, trackerId, state, type); - } - else - { - LOGGER.warn("[{} / {} / {}] {} Tracker cannot be enabled because it is already in that state.", coreName, trackerId, state, type); - } + isEnabled.set(true); + LOGGER.info("[{} / {} / {}] {} Tracker has been enabled", coreName, trackerId, state, type); } @Override From 5882bbb773ddd523c7aafd868a94c55874e1218b Mon Sep 17 00:00:00 2001 From: elia Date: Thu, 30 Jul 2020 15:38:34 +0200 Subject: [PATCH 2/2] [SEARCH-2330] fix formatting --- .../java/org/alfresco/solr/tracker/ActivatableTracker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java index 7ae9af9be..cd6e3d3d8 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ActivatableTracker.java @@ -72,7 +72,8 @@ public abstract class ActivatableTracker extends AbstractTracker public final void disable() { clearScheduledMaintenanceWork(); - if (isEnabled.compareAndSet(true, false)){ + if (isEnabled.compareAndSet(true, false)) + { if (state != null && state.isRunning()) { setRollback(true, null);