Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Race condition fix for datetime optimization #10385

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Race condition fix for datetime optimization #10385

merged 2 commits into from
Oct 5, 2023

Conversation

CaptainDredge
Copy link
Contributor

@CaptainDredge CaptainDredge commented Oct 5, 2023 •
edited
Loading

Description

This PR fixes a race condition in datetime optimization done under PR #9567
It addresses the case where dateTimeFormatter parser list can be partially read by threads when another thread is modifying it

Related Issues

Resolves #4558

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • GitHub issue/PR created in OpenSearch documentation repo for the required public documentation changes (#[Issue/PR number])

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.

@github-actions github-actions bot added the enhancement Enhancement or improvement to existing feature or request label Oct 5, 2023
@CaptainDredge CaptainDredge mentioned this pull request Oct 5, 2023
Merged
6 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023 •
edited
Loading

Compatibility status:

Checks if related components are compatible with change cbc2780

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git]

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testShardRoutingWithNetworkDisruption_FailOpenEnabled

@CaptainDredge CaptainDredge force-pushed the datetime-optimization-concurrency-fix branch from 9c7d3ae to e12af8d Compare October 5, 2023 17:33
@CaptainDredge
Copy link
Contributor Author

Sorry, I didn't get the chance to take a look at the comments early but now I've incorporated the above suggestion. @reta / @dblock can we go ahead and merge it now?

@reta
Copy link
Collaborator

reta commented Oct 5, 2023

@reta / @dblock can we go ahead and merge it now?

Once we get green builds, thanks @CaptainDredge

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.cluster.allocation.ClusterRerouteIT.testDelayWithALargeAmountOfShards

Changed JavaDateTimeFormatter caching of parser from MRU(most recentl…
cbc2780 
…y used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
@CaptainDredge CaptainDredge force-pushed the datetime-optimization-concurrency-fix branch from e12af8d to cbc2780 Compare October 5, 2023 18:58
@CaptainDredge
Copy link
Contributor Author

Trigerring build again in the hope that flaky test passes

@dblock
Copy link
Member

dblock commented Oct 5, 2023

I’m good merging this if gradle check passes and preconmit fails because of infra

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.repositories.azure.AzureBlobContainerRetriesTests.testWriteLargeBlob

@reta
Copy link
Collaborator

reta commented Oct 5, 2023

Merging it with failing pre-commit checks to fix issue in main

@reta reta merged commit 0facd50 into opensearch-project:main Oct 5, 2023
11 of 13 checks passed
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
accdf7a 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
@CaptainDredge CaptainDredge mentioned this pull request Oct 6, 2023
Merged
7 tasks
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
28b3627 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
1268ad5 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
ad17b38 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
4112eba 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
(cherry picked from commit ad17b38)
@CaptainDredge CaptainDredge mentioned this pull request Oct 6, 2023
Closed
7 tasks
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
fbddd58 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
(cherry picked from commit ad17b38)
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
d938362 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
727c869 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Oct 6, 2023
@CaptainDredge @kaushalmahi12
Race condition fix for datetime optimization (opensearch-project#10385)
4e9db58 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request Oct 9, 2023
@CaptainDredge @deshsidd
Race condition fix for datetime optimization (opensearch-project#10385)
76da117 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 16, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
7c57574 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
@reta reta mentioned this pull request Oct 17, 2023
Closed
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Oct 19, 2023
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
b660da1 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
reta pushed a commit that referenced this pull request Oct 19, 2023
@CaptainDredge
[Backport 2.x] Performance Improvement for Datetime formats to 2.x (#…
21045f8 
…10448)

* Added performance improvement for datetime field parsing (#9567)

* Added performance improvement for datetime field parsing

This adds caching of formatters in case of no explicit format specified for the datetime field in mapping.
This also adds `strict_date_time_no_millis` as additional formatter in default date time formats

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Refactor DateTimeFormatter Access under featireflag

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
(cherry picked from commit 2965e69)
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Race condition fix for datetime optimization (#10385)

* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
austintlee pushed a commit to austintlee/OpenSearch that referenced this pull request Oct 23, 2023
@CaptainDredge @austintlee
Race condition fix for datetime optimization (opensearch-project#10385)
dbe6564 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
CaptainDredge added a commit to CaptainDredge/OpenSearch that referenced this pull request Jan 31, 2024
@CaptainDredge
Race condition fix for datetime optimization (opensearch-project#10385)
3758a64 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
@CaptainDredge @shiv0408
Race condition fix for datetime optimization (opensearch-project#10385)
b7020a4 
* Race condition fix for datetime optimization

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

* Changed JavaDateTimeFormatter caching of parser from MRU(most recently used) to a simple last used formatter

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>

---------

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reta reta reta approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@setiah setiah Awaiting requested review from setiah

@kartg kartg Awaiting requested review from kartg

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@peternied peternied Awaiting requested review from peternied

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@ryanbogan ryanbogan Awaiting requested review from ryanbogan

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

Assignees
No one assigned
Labels
enhancement Enhancement or improvement to existing feature or request skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Infer and cache date field format instead of re-parsing it for every document
3 participants
@CaptainDredge @dblock @reta