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

Fix handler for existing query #2968

Merged

Conversation

ykmr1224
Copy link
Collaborator

@ykmr1224 ykmr1224 commented Sep 4, 2024

Description

  • Fix handler for existing query
  • We changed handler for CREATE INDEX with manual refresh to batch, but did not update the logic for get/cancel query. This lead to manual refresh job to be handled by RefreshQueryHandler

Related Issues

n/a

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • 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.

@ykmr1224 ykmr1224 force-pushed the fix-batch-cancel-handler branch from d8db25f to f83351a Compare September 4, 2024 16:01
@ykmr1224 ykmr1224 added bug Something isn't working backport 2.x labels Sep 4, 2024
Signed-off-by: Tomoyuki Morita <[email protected]>
@@ -8,6 +8,7 @@
public enum JobType {
INTERACTIVE("interactive"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we revisit the definitions of these jobtypes? What is the difference between a streaming and refresh job type.

@ykmr1224 ykmr1224 merged commit b14a8cb into opensearch-project:main Sep 4, 2024
14 of 15 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 4, 2024
Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit b14a8cb)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.17
# Create a new branch
git switch --create backport/backport-2968-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b14a8cb7eeb5bd74eb1aebfe7cd8d56bfe2c88d8
# Push it to GitHub
git push --set-upstream origin backport/backport-2968-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.17

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.17
# Create a new branch
git switch --create backport/backport-2968-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b14a8cb7eeb5bd74eb1aebfe7cd8d56bfe2c88d8
# Push it to GitHub
git push --set-upstream origin backport/backport-2968-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.17

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

ykmr1224 added a commit to ykmr1224/sql that referenced this pull request Sep 4, 2024
Signed-off-by: Tomoyuki Morita <[email protected]>

(cherry picked from commit b14a8cb)
ykmr1224 pushed a commit that referenced this pull request Sep 4, 2024
(cherry picked from commit b14a8cb)

Signed-off-by: Tomoyuki Morita <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.17
# Create a new branch
git switch --create backport/backport-2968-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b14a8cb7eeb5bd74eb1aebfe7cd8d56bfe2c88d8
# Push it to GitHub
git push --set-upstream origin backport/backport-2968-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.17

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

ykmr1224 added a commit to ykmr1224/sql that referenced this pull request Sep 5, 2024
Signed-off-by: Tomoyuki Morita <[email protected]>

(cherry picked from commit b14a8cb)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 5, 2024
Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit b14a8cb)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ykmr1224 pushed a commit that referenced this pull request Sep 5, 2024
(cherry picked from commit b14a8cb)

Signed-off-by: Tomoyuki Morita <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.

3 participants