Reset datasource metadata when failed to update it in postIndex and postDelete to force refresh it from the primary index shard.#761
Merged
heemin32 merged 3 commits intoopensearch-project:mainfrom Jun 17, 2025
Conversation
Signed-off-by: Bo Zhang <bzhangam@amazon.com>
bzhangam
requested review from
VijayanB,
heemin32,
jmazanec15,
junqiu-lei,
martin-gaievski,
naveentatikonda,
navneet1v and
vamshin
as code owners
bzhangam
force-pushed
the
main
branch
2 times, most recently
from
47af1df to
14c7059
Compare
heemin32
reviewed
Jun 17, 2025
src/main/java/org/opensearch/geospatial/ip2geo/dao/Ip2GeoCachedDao.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opensearch/geospatial/ip2geo/dao/Ip2GeoCachedDao.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opensearch/geospatial/ip2geo/processor/Ip2GeoProcessor.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opensearch/geospatial/ip2geo/dao/Ip2GeoCachedDao.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opensearch/geospatial/ip2geo/dao/Ip2GeoCachedDao.java
Outdated
Show resolved
Hide resolved
heemin32
reviewed
Jun 17, 2025
src/main/java/org/opensearch/geospatial/ip2geo/processor/Ip2GeoProcessor.java
Show resolved
Hide resolved
Collaborator
|
Please add a change log. |
bzhangam
changed the title
heemin32
reviewed
Jun 17, 2025
|
|
||
| private void clearMetadata() { | ||
| log.info("Resetting all datasource metadata to force a refresh from the primary index shard."); | ||
| metadata = null; |
Collaborator
There was a problem hiding this comment.
We might need to handle it more gracefully. Current metadata reading shouldn't be breaking due to this code.
Member
There was a problem hiding this comment.
Consider initializing an empty Map instead？ Will it cause NPE when getMetadata() is called elsewhere?
Contributor
Author
There was a problem hiding this comment.
Modified the getMetadata() to handle the edge case that we can set the metadata as null before getMetadata() returns the non-null metadata. Create a local variable to ensure the returned metadata is non-null.
Collaborator
There was a problem hiding this comment.
Please add a comment to getMetadata() method explaning why we return local variable instead of metadat.
junqiu-lei
reviewed
Jun 17, 2025
|
|
||
| private void clearMetadata() { | ||
| log.info("Resetting all datasource metadata to force a refresh from the primary index shard."); | ||
| metadata = null; |
Member
There was a problem hiding this comment.
Consider initializing an empty Map instead？ Will it cause NPE when getMetadata() is called elsewhere?
src/main/java/org/opensearch/geospatial/ip2geo/processor/Ip2GeoProcessor.java
Outdated
Show resolved
Hide resolved
bzhangam
force-pushed
the
main
branch
4 times, most recently
from
c1b11f5 to
5a02aba
Compare
heemin32
approved these changes
Jun 17, 2025
junqiu-lei
approved these changes
Jun 17, 2025
…ostDelete to force refresh it from the primary index shard. Signed-off-by: Bo Zhang <bzhangam@amazon.com>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jun 17, 2025
…ostDelete to force refresh it from the primary index shard. (#761) * Add release notes for 3.1.0 Signed-off-by: Bo Zhang <bzhangam@amazon.com> * Reset datasource metadata when failed to update it in postIndex and postDelete to force refresh it from the primary index shard. Signed-off-by: Bo Zhang <bzhangam@amazon.com> --------- Signed-off-by: Bo Zhang <bzhangam@amazon.com> (cherry picked from commit f57507c)
heemin32
pushed a commit
that referenced
this pull request
Jun 17, 2025
…ostDelete to force refresh it from the primary index shard. (#761) (#762) * Add release notes for 3.1.0 * Reset datasource metadata when failed to update it in postIndex and postDelete to force refresh it from the primary index shard. --------- (cherry picked from commit f57507c) Signed-off-by: Bo Zhang <bzhangam@amazon.com> Co-authored-by: Bo Zhang <bzhangam@amazon.com>
3 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Reset datasource metadata when failed to update it in postIndex and postDelete to force refresh it from the primary index shard. This can help on the case when the update in the primary shard succeeds but the update in the replica shard fails and causing the outdated datasource metadata in the Cache.
Also add more logs to Ip2GeoCachedDao to monitor its behavior.
Related Issues
N/A
Check List
--signoff.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.