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

[Backport 2.x] Correct RHLC searchTemplate & mtermVectors endpoints to have leading slash (#14465) #14480

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

Xtansia
Copy link
Contributor

@Xtansia Xtansia commented Jun 20, 2024

Description

Backport 9675c4f from #14465

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

…slash (opensearch-project#14465)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit 9675c4f)
@dblock
Copy link
Member

dblock commented Jun 20, 2024

Let’s try to get this into 2.15 as well. I labeled this with a backport.

Copy link
Contributor

❌ Gradle check result for 6d28617: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

❌ Gradle check result for 6d28617: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Copy link
Contributor

❌ Gradle check result for b1529d7: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@Xtansia
Copy link
Contributor Author

Xtansia commented Jun 20, 2024

Failing test is org.opensearch.action.admin.indices.create.RemoteCloneIndexIT.testCreateCloneIndexLowPriorityRateLimit which has reports of other failures in #14292

Copy link
Contributor

✅ Gradle check result for b1529d7: SUCCESS

@reta reta merged commit a9d806a into opensearch-project:2.x Jun 21, 2024
30 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 failed:

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

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.15 2.15
# Navigate to the new working tree
pushd ../.worktrees/backport-2.15
# Create a new branch
git switch --create backport/backport-14480-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a9d806a6c4fa9b10d1a3344f446134d82dece351
# Push it to GitHub
git push --set-upstream origin backport/backport-14480-to-2.15
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.15

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

@Xtansia Xtansia deleted the backport/backport-14465-to-2.x branch June 21, 2024 04:55
Xtansia added a commit to Xtansia/OpenSearch that referenced this pull request Jun 21, 2024
…slash (opensearch-project#14465) (opensearch-project#14480)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit 9675c4f)

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
(cherry picked from commit a9d806a)
dblock pushed a commit that referenced this pull request Jun 21, 2024
…slash (#14465) (#14480) (#14487)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit 9675c4f)

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
(cherry picked from commit a9d806a)
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
…slash (opensearch-project#14465) (opensearch-project#14480)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit 9675c4f)

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Signed-off-by: kkewwei <kkewwei@163.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