fix(jobs): changed copy host job to use scroll API for host with large content volume #34044
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dsolistorres
force-pushed
the
issue-33661-optimize-copy-host-job
branch
from
c6ab7b3 to
ca53053
Compare
dsilvam
approved these changes
Dec 8, 2025
| } catch (final InterruptedException e) { | ||
| Logger.warn(this, "Batch pause was interrupted", e); | ||
| Thread.currentThread().interrupt(); | ||
| } |
Contributor
There was a problem hiding this comment.
I think it should always sleep. to avoid starvation. if the minimum is set to 0, we should default to something
| private static final String SELECT_SYSTEM_HOST = "SELECT id FROM identifier WHERE id = '"+ Host.SYSTEM_HOST+"' "; | ||
|
|
||
| private static final String FROM_JOINED_TABLES = "INNER JOIN identifier i " + | ||
| "ON c.identifier = i.id AND i.asset_subtype = '" + Host.HOST_VELOCITY_VAR_NAME + "' " + |
Contributor
There was a problem hiding this comment.
Why is this getting removed?
Is it good enough to filter by the structure inode?
Gain in performance?
Contributor
There was a problem hiding this comment.
very nice set of improvements !
| sourceContentlets.size(), batchSize, relationshipBatchSize, batchPauseMs)); | ||
|
|
||
| // Strategy: Process simple content immediately, collect HTML pages for later processing | ||
| final List<String> htmlPageInodes = new ArrayList<>(); |
Contributor
There was a problem hiding this comment.
perhaps a LinkedList is best suited here. or an initialization using the size of the dbResults
jcastro-dotcms
approved these changes
Dec 8, 2025
freddyDOTCMS
approved these changes
Dec 8, 2025
dsolistorres
force-pushed
the
issue-33661-optimize-copy-host-job
branch
from
640ce0b to
9ef0091
Compare
…e content volume (#33661)
dsolistorres
force-pushed
the
issue-33661-optimize-copy-host-job
branch
from
9ef0091 to
163e018
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #33661
This PR addresses performance issues and pagination errors in the site copy job by implementing ElasticSearch Scroll API for a large result set.
Proposed Changes
indexSearchScrollmethod from theESContentFactoryImpclass to expose the ES scroll API in a new wrapper interfaceESContentletScroll. ThePaginatedContentletsclass uses this new interface to iterate on results using the ES scroll API.HostFactoryImplwere optimized to usestructure_inodefield fromcontentlettable to filter hosts, and also to use the ILIKE clause in SQL conditions to match case insensitive values.Checklist