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.

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

increase the wait timeout to fetch the master key #3151

Merged
merged 2 commits into from
Oct 28, 2024

Conversation

jngz-es
Copy link
Collaborator

@jngz-es jngz-es commented Oct 23, 2024

Description

There is a race condition during initializing master key when encrypt/decrypt credentials in a connector. The encrypt/decrypt thread could get a null key even if the key is fetched from config index successfully in another thread.

Related Issues

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

ylwu-amzn
ylwu-amzn previously approved these changes Oct 23, 2024
@dhrubo-os
Copy link
Collaborator

Test is failing.

@dhrubo-os
Copy link
Collaborator

Increasing timeout seems like a temporary solution to me. Could you please add more details like why giving more time could potentially solve this issue? Also if this is a temporary fix, please add more details in the code and let's create an issue to fix it with a permanent solution.

@ylwu-amzn
Copy link
Collaborator

UT failed testOpenAITextEmbeddingModel_ISO8859_1, rebase ?

Signed-off-by: Jing Zhang <[email protected]>
@jngz-es jngz-es merged commit c7e564c into opensearch-project:main Oct 28, 2024
9 of 10 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 28, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 28, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 28, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)
ylwu-amzn pushed a commit that referenced this pull request Oct 28, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)

Co-authored-by: Jing Zhang <[email protected]>
ylwu-amzn pushed a commit that referenced this pull request Oct 28, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)

Co-authored-by: Jing Zhang <[email protected]>
ylwu-amzn pushed a commit that referenced this pull request Oct 28, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)

Co-authored-by: Jing Zhang <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 29, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 29, 2024
* increase the wait timeout to fetch the master key

Signed-off-by: Jing Zhang <[email protected]>

* fix UTs

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c7e564c)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.14 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.14 2.14
# Navigate to the new working tree
cd .worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-3151-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c7e564c04957feb2978f403c4279c09f006710b9
# Push it to GitHub
git push --set-upstream origin backport/backport-3151-to-2.14
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.14

Then, create a pull request where the base branch is 2.14 and the compare/head branch is backport/backport-3151-to-2.14.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.13 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.13 2.13
# Navigate to the new working tree
cd .worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-3151-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c7e564c04957feb2978f403c4279c09f006710b9
# Push it to GitHub
git push --set-upstream origin backport/backport-3151-to-2.13
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.13

Then, create a pull request where the base branch is 2.13 and the compare/head branch is backport/backport-3151-to-2.13.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants