From e0e83bd40d370b8eb58e0fc987928a5ee567a947 Mon Sep 17 00:00:00 2001 From: Will Ezell Date: Wed, 9 Oct 2024 09:30:23 -0400 Subject: [PATCH 01/11] bug(apps) fixing link to dotAI portlet (#29556) ref: #29555 Changing link from `/c/dotAI` to `/c/dotai` --- dotCMS/src/main/resources/apps/dotAI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotCMS/src/main/resources/apps/dotAI.yml b/dotCMS/src/main/resources/apps/dotAI.yml index 425c9b42b058..f096428dbf8a 100644 --- a/dotCMS/src/main/resources/apps/dotAI.yml +++ b/dotCMS/src/main/resources/apps/dotAI.yml @@ -3,7 +3,7 @@ iconUrl: "https://static.dotcms.com/assets/icons/apps/chatgpt_logo.svg" allowExtraParameters: true description: | Credentials and options for using OpenAI/ChatGPT with dotCMS. There are a number of config - properties that can be set in the extra parameter fields. Please see the "config" tab of the [dotAI tool](#/c/dotAI) to see what can be configured. We recommend you have a single config for all your sites, + properties that can be set in the extra parameter fields. Please see the "config" tab of the [dotAI tool](#/c/dotai) to see what can be configured. We recommend you have a single config for all your sites, by placing all config on the SYSTEM_HOST or provide a configuration PER site. params: From 19952159baee66780fa396b813cf1420e47643fe Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Mon, 28 Oct 2024 11:41:47 -0600 Subject: [PATCH 02/11] #30468 Remove ESReadOnly Job used --- .../elasticsearch/business/ContentletIndexAPIImpl.java | 4 ---- .../elasticsearch/business/ESContentletAPIImpl.java | 7 ------- .../com/dotmarketing/common/reindex/ReindexThread.java | 3 +-- .../main/java/com/dotmarketing/init/DotInitScheduler.java | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java index c541f932361b..ded190219e10 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java @@ -553,10 +553,6 @@ public void addContentToIndex(final Contentlet parentContenlet, .build() : List.of(parentContenlet); - if (ElasticReadOnlyCommand.getInstance().isIndexOrClusterReadOnly()) { - ElasticReadOnlyCommand.getInstance().sendReadOnlyMessage(); - } - if (parentContenlet.getIndexPolicy() == IndexPolicy.DEFER) { queueApi.addContentletsReindex(contentToIndex); } else if (!DbConnectionFactory.inTransaction()) { diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java index 8253b98a295e..5ebc60e482f3 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java @@ -5287,13 +5287,6 @@ private Contentlet internalCheckin(Contentlet contentlet, if (!isCheckInSafe(contentRelationships)) { - if (contentlet.getBoolProperty(Contentlet.IS_TEST_MODE)) { - this.elasticReadOnlyCommand.executeCheck(); - } else { - DotConcurrentFactory.getInstance().getSingleSubmitter() - .submit(() -> this.elasticReadOnlyCommand.executeCheck()); - } - final String contentletIdentifier = null != contentlet && null != contentlet.getIdentifier() ? contentlet.getIdentifier() : StringPool.NULL; diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java index c5992c26fe98..677e83d669f6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java @@ -213,8 +213,7 @@ private void runReindexLoop() { bulkProcessor = finalizeReIndex(bulkProcessor); } - if (!workingRecords.isEmpty() && !ElasticReadOnlyCommand.getInstance() - .isIndexOrClusterReadOnly()) { + if (!workingRecords.isEmpty()) { Logger.debug(this, "Found " + workingRecords + " index items to process"); diff --git a/dotCMS/src/main/java/com/dotmarketing/init/DotInitScheduler.java b/dotCMS/src/main/java/com/dotmarketing/init/DotInitScheduler.java index df6b1d9e8426..5b6ca319aecd 100644 --- a/dotCMS/src/main/java/com/dotmarketing/init/DotInitScheduler.java +++ b/dotCMS/src/main/java/com/dotmarketing/init/DotInitScheduler.java @@ -406,7 +406,7 @@ private static void addElasticReadyOnlyMonitor (final Scheduler scheduler) { final String triggerName = "trigger29"; final String triggerGroup = "group98"; - if (Config.getBooleanProperty( "ENABLE_ELASTIC_READ_ONLY_MONITOR", true)) { + if (Config.getBooleanProperty( "ENABLE_ELASTIC_READ_ONLY_MONITOR", false)) { final JobBuilder elasticReadOnlyMonitorJob = new JobBuilder().setJobClass(EsReadOnlyMonitorJob.class) .setJobName(jobName) From 1a7224165441af438d509d26175648236dc14684 Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Mon, 28 Oct 2024 11:44:35 -0600 Subject: [PATCH 03/11] Removing changes --- dotCMS/src/main/resources/apps/dotAI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotCMS/src/main/resources/apps/dotAI.yml b/dotCMS/src/main/resources/apps/dotAI.yml index f096428dbf8a..425c9b42b058 100644 --- a/dotCMS/src/main/resources/apps/dotAI.yml +++ b/dotCMS/src/main/resources/apps/dotAI.yml @@ -3,7 +3,7 @@ iconUrl: "https://static.dotcms.com/assets/icons/apps/chatgpt_logo.svg" allowExtraParameters: true description: | Credentials and options for using OpenAI/ChatGPT with dotCMS. There are a number of config - properties that can be set in the extra parameter fields. Please see the "config" tab of the [dotAI tool](#/c/dotai) to see what can be configured. We recommend you have a single config for all your sites, + properties that can be set in the extra parameter fields. Please see the "config" tab of the [dotAI tool](#/c/dotAI) to see what can be configured. We recommend you have a single config for all your sites, by placing all config on the SYSTEM_HOST or provide a configuration PER site. params: From 25ebbde3eacf1ce9de6973fa090785fb0b1ef45f Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Mon, 28 Oct 2024 12:17:10 -0600 Subject: [PATCH 04/11] #30468 Making Sonnar happy --- .../common/reindex/ReindexThread.java | 76 +++++++++++-------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java index 677e83d669f6..66a4a04616a5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java @@ -202,51 +202,61 @@ private BulkProcessor finalizeReIndex(BulkProcessor bulkProcessor) * possible. */ private void runReindexLoop() { - BulkProcessor bulkProcessor = null; - BulkProcessorListener bulkProcessorListener = null; + while (state.get() != ThreadState.STOPPED) { try { - - final Map workingRecords = queueApi.findContentToReindex(); - - if (workingRecords.isEmpty()) { - bulkProcessor = finalizeReIndex(bulkProcessor); - } - - if (!workingRecords.isEmpty()) { - Logger.debug(this, - "Found " + workingRecords + " index items to process"); - - if (bulkProcessor == null || rebuildBulkIndexer.get()) { - closeBulkProcessor(bulkProcessor); - bulkProcessorListener = new BulkProcessorListener(); - bulkProcessor = indexAPI.createBulkProcessor(bulkProcessorListener); - } - bulkProcessorListener.workingRecords.putAll(workingRecords); - indexAPI.appendToBulkProcessor(bulkProcessor, workingRecords.values()); - contentletsIndexed += bulkProcessorListener.getContentletsIndexed(); - // otherwise, reindex normally - - } + reindex(); } catch (Throwable ex) { Logger.error(this, "ReindexThread Exception", ex); ThreadUtils.sleep(SLEEP_ON_ERROR); } finally { DbConnectionFactory.closeSilently(); } - while (state.get() == ThreadState.PAUSED) { - ThreadUtils.sleep(SLEEP); - //Logs every 60 minutes - Logger.infoEvery(ReindexThread.class, "--- ReindexThread Paused", - Config.getIntProperty("REINDEX_THREAD_PAUSE_IN_MINUTES", 60) * 60000); - Long restartTime = (Long) cache.get().get(REINDEX_THREAD_PAUSED); - if (restartTime == null || restartTime < System.currentTimeMillis()) { - state.set(ThreadState.RUNNING); - } + + paused(); + } + } + + private void paused() { + while (state.get() == ThreadState.PAUSED) { + ThreadUtils.sleep(SLEEP); + //Logs every 60 minutes + Logger.infoEvery(ReindexThread.class, "--- ReindexThread Paused", + Config.getIntProperty("REINDEX_THREAD_PAUSE_IN_MINUTES", 60) * 60000); + Long restartTime = (Long) cache.get().get(REINDEX_THREAD_PAUSED); + if (restartTime == null || restartTime < System.currentTimeMillis()) { + state.set(ThreadState.RUNNING); } } } + private void reindex() throws DotDataException, LanguageException, SQLException, InterruptedException { + BulkProcessor bulkProcessor = null; + BulkProcessorListener bulkProcessorListener = null; + + final Map workingRecords = queueApi.findContentToReindex(); + + if (workingRecords.isEmpty()) { + bulkProcessor = finalizeReIndex(bulkProcessor); + } + + if (!workingRecords.isEmpty()) { + Logger.debug(this, + "Found " + workingRecords + " index items to process"); + + if (bulkProcessor == null || rebuildBulkIndexer.get()) { + closeBulkProcessor(bulkProcessor); + bulkProcessorListener = new BulkProcessorListener(); + bulkProcessor = indexAPI.createBulkProcessor(bulkProcessorListener); + } + bulkProcessorListener.workingRecords.putAll(workingRecords); + indexAPI.appendToBulkProcessor(bulkProcessor, workingRecords.values()); + contentletsIndexed += bulkProcessorListener.getContentletsIndexed(); + // otherwise, reindex normally + + } + } + private boolean switchOverIfNeeded() throws LanguageException, DotDataException, SQLException, InterruptedException { From da4146e6fda83fc817b8e03c597d53595194cbf7 Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Tue, 29 Oct 2024 09:26:07 -0600 Subject: [PATCH 05/11] Making sonnar happy --- .../java/com/dotmarketing/common/reindex/ReindexThread.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java index 66a4a04616a5..7aeb11f63c3d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java @@ -5,7 +5,6 @@ import com.dotcms.concurrent.DotConcurrentFactory; import com.dotcms.concurrent.DotSubmitter; import com.dotcms.content.elasticsearch.business.ContentletIndexAPI; -import com.dotcms.content.elasticsearch.business.ElasticReadOnlyCommand; import com.dotcms.content.elasticsearch.util.ESReindexationProcessStatus; import com.dotcms.notifications.bean.NotificationLevel; import com.dotcms.notifications.bean.NotificationType; @@ -206,7 +205,7 @@ private void runReindexLoop() { while (state.get() != ThreadState.STOPPED) { try { reindex(); - } catch (Throwable ex) { + } catch (Exception ex) { Logger.error(this, "ReindexThread Exception", ex); ThreadUtils.sleep(SLEEP_ON_ERROR); } finally { From ced177e7112f2ffddc3c178f96c7b1f33df0258f Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Tue, 29 Oct 2024 17:05:49 -0600 Subject: [PATCH 06/11] shooting arrows --- .../content/elasticsearch/business/ContentletIndexAPIImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java index ded190219e10..6370c26c5b33 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java @@ -553,6 +553,7 @@ public void addContentToIndex(final Contentlet parentContenlet, .build() : List.of(parentContenlet); + if (parentContenlet.getIndexPolicy() == IndexPolicy.DEFER) { queueApi.addContentletsReindex(contentToIndex); } else if (!DbConnectionFactory.inTransaction()) { From 8353aaa212e235a2f83ae7c0fef25dc5934b75c9 Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Wed, 30 Oct 2024 12:12:32 -0600 Subject: [PATCH 07/11] shooting arraows --- .../elasticsearch/business/ContentletIndexAPIImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java index 6370c26c5b33..c541f932361b 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java @@ -553,7 +553,10 @@ public void addContentToIndex(final Contentlet parentContenlet, .build() : List.of(parentContenlet); - + if (ElasticReadOnlyCommand.getInstance().isIndexOrClusterReadOnly()) { + ElasticReadOnlyCommand.getInstance().sendReadOnlyMessage(); + } + if (parentContenlet.getIndexPolicy() == IndexPolicy.DEFER) { queueApi.addContentletsReindex(contentToIndex); } else if (!DbConnectionFactory.inTransaction()) { From 2baf8dd27de720b35297901e9f2b37e34146b2dd Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Wed, 30 Oct 2024 12:39:03 -0600 Subject: [PATCH 08/11] shooting arraows --- .../elasticsearch/business/ESContentletAPIImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java index 5ebc60e482f3..8253b98a295e 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java @@ -5287,6 +5287,13 @@ private Contentlet internalCheckin(Contentlet contentlet, if (!isCheckInSafe(contentRelationships)) { + if (contentlet.getBoolProperty(Contentlet.IS_TEST_MODE)) { + this.elasticReadOnlyCommand.executeCheck(); + } else { + DotConcurrentFactory.getInstance().getSingleSubmitter() + .submit(() -> this.elasticReadOnlyCommand.executeCheck()); + } + final String contentletIdentifier = null != contentlet && null != contentlet.getIdentifier() ? contentlet.getIdentifier() : StringPool.NULL; From 5c27b51eedc3be06eb2424bd69e1c2dc3ee21042 Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Wed, 30 Oct 2024 13:10:27 -0600 Subject: [PATCH 09/11] shooting arraows --- .../common/reindex/ReindexThread.java | 80 +++++++++---------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java index 7aeb11f63c3d..c5992c26fe98 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java @@ -5,6 +5,7 @@ import com.dotcms.concurrent.DotConcurrentFactory; import com.dotcms.concurrent.DotSubmitter; import com.dotcms.content.elasticsearch.business.ContentletIndexAPI; +import com.dotcms.content.elasticsearch.business.ElasticReadOnlyCommand; import com.dotcms.content.elasticsearch.util.ESReindexationProcessStatus; import com.dotcms.notifications.bean.NotificationLevel; import com.dotcms.notifications.bean.NotificationType; @@ -201,58 +202,49 @@ private BulkProcessor finalizeReIndex(BulkProcessor bulkProcessor) * possible. */ private void runReindexLoop() { - + BulkProcessor bulkProcessor = null; + BulkProcessorListener bulkProcessorListener = null; while (state.get() != ThreadState.STOPPED) { try { - reindex(); - } catch (Exception ex) { + + final Map workingRecords = queueApi.findContentToReindex(); + + if (workingRecords.isEmpty()) { + bulkProcessor = finalizeReIndex(bulkProcessor); + } + + if (!workingRecords.isEmpty() && !ElasticReadOnlyCommand.getInstance() + .isIndexOrClusterReadOnly()) { + Logger.debug(this, + "Found " + workingRecords + " index items to process"); + + if (bulkProcessor == null || rebuildBulkIndexer.get()) { + closeBulkProcessor(bulkProcessor); + bulkProcessorListener = new BulkProcessorListener(); + bulkProcessor = indexAPI.createBulkProcessor(bulkProcessorListener); + } + bulkProcessorListener.workingRecords.putAll(workingRecords); + indexAPI.appendToBulkProcessor(bulkProcessor, workingRecords.values()); + contentletsIndexed += bulkProcessorListener.getContentletsIndexed(); + // otherwise, reindex normally + + } + } catch (Throwable ex) { Logger.error(this, "ReindexThread Exception", ex); ThreadUtils.sleep(SLEEP_ON_ERROR); } finally { DbConnectionFactory.closeSilently(); } - - paused(); - } - } - - private void paused() { - while (state.get() == ThreadState.PAUSED) { - ThreadUtils.sleep(SLEEP); - //Logs every 60 minutes - Logger.infoEvery(ReindexThread.class, "--- ReindexThread Paused", - Config.getIntProperty("REINDEX_THREAD_PAUSE_IN_MINUTES", 60) * 60000); - Long restartTime = (Long) cache.get().get(REINDEX_THREAD_PAUSED); - if (restartTime == null || restartTime < System.currentTimeMillis()) { - state.set(ThreadState.RUNNING); - } - } - } - - private void reindex() throws DotDataException, LanguageException, SQLException, InterruptedException { - BulkProcessor bulkProcessor = null; - BulkProcessorListener bulkProcessorListener = null; - - final Map workingRecords = queueApi.findContentToReindex(); - - if (workingRecords.isEmpty()) { - bulkProcessor = finalizeReIndex(bulkProcessor); - } - - if (!workingRecords.isEmpty()) { - Logger.debug(this, - "Found " + workingRecords + " index items to process"); - - if (bulkProcessor == null || rebuildBulkIndexer.get()) { - closeBulkProcessor(bulkProcessor); - bulkProcessorListener = new BulkProcessorListener(); - bulkProcessor = indexAPI.createBulkProcessor(bulkProcessorListener); + while (state.get() == ThreadState.PAUSED) { + ThreadUtils.sleep(SLEEP); + //Logs every 60 minutes + Logger.infoEvery(ReindexThread.class, "--- ReindexThread Paused", + Config.getIntProperty("REINDEX_THREAD_PAUSE_IN_MINUTES", 60) * 60000); + Long restartTime = (Long) cache.get().get(REINDEX_THREAD_PAUSED); + if (restartTime == null || restartTime < System.currentTimeMillis()) { + state.set(ThreadState.RUNNING); + } } - bulkProcessorListener.workingRecords.putAll(workingRecords); - indexAPI.appendToBulkProcessor(bulkProcessor, workingRecords.values()); - contentletsIndexed += bulkProcessorListener.getContentletsIndexed(); - // otherwise, reindex normally - } } From 4833dc0686b840ca4e7176e506d16c34877d04ec Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Wed, 30 Oct 2024 14:24:02 -0600 Subject: [PATCH 10/11] shooting arraows --- .../elasticsearch/business/ContentletIndexAPIImpl.java | 3 --- .../elasticsearch/business/ESContentletAPIImpl.java | 7 ------- 2 files changed, 10 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java index c541f932361b..79d520ef4e11 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPIImpl.java @@ -553,9 +553,6 @@ public void addContentToIndex(final Contentlet parentContenlet, .build() : List.of(parentContenlet); - if (ElasticReadOnlyCommand.getInstance().isIndexOrClusterReadOnly()) { - ElasticReadOnlyCommand.getInstance().sendReadOnlyMessage(); - } if (parentContenlet.getIndexPolicy() == IndexPolicy.DEFER) { queueApi.addContentletsReindex(contentToIndex); diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java index 8253b98a295e..5ebc60e482f3 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java @@ -5287,13 +5287,6 @@ private Contentlet internalCheckin(Contentlet contentlet, if (!isCheckInSafe(contentRelationships)) { - if (contentlet.getBoolProperty(Contentlet.IS_TEST_MODE)) { - this.elasticReadOnlyCommand.executeCheck(); - } else { - DotConcurrentFactory.getInstance().getSingleSubmitter() - .submit(() -> this.elasticReadOnlyCommand.executeCheck()); - } - final String contentletIdentifier = null != contentlet && null != contentlet.getIdentifier() ? contentlet.getIdentifier() : StringPool.NULL; From 5ae8b26bce35ba2322192ff39e31da08a2d25196 Mon Sep 17 00:00:00 2001 From: freddyDOTCMS Date: Wed, 30 Oct 2024 15:16:54 -0600 Subject: [PATCH 11/11] shooting arraows --- .../java/com/dotmarketing/common/reindex/ReindexThread.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java index c5992c26fe98..677e83d669f6 100644 --- a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java +++ b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java @@ -213,8 +213,7 @@ private void runReindexLoop() { bulkProcessor = finalizeReIndex(bulkProcessor); } - if (!workingRecords.isEmpty() && !ElasticReadOnlyCommand.getInstance() - .isIndexOrClusterReadOnly()) { + if (!workingRecords.isEmpty()) { Logger.debug(this, "Found " + workingRecords + " index items to process");