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

Add feature enable setting for controller index #2652

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

b4sjoo
Copy link
Collaborator

@b4sjoo b4sjoo commented Jul 16, 2024

Description

This PR will add a feature enable setting for controller index, to support multi-tenancy

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

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.

@dhrubo-os
Copy link
Collaborator

Shouldn't we check this kind of places too:

deployControllerWithDeployingModel(mlModel, eligibleNodeCount);

@dhrubo-os
Copy link
Collaborator

@b4sjoo Any update on this?

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented Sep 3, 2024

@b4sjoo Any update on this?

@dhrubo-os I don't think there are any blocking comments left, can we approve and merge it?

@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env September 3, 2024 15:28 — with GitHub Actions Inactive
@dhrubo-os
Copy link
Collaborator

I haven't see any unit tests when controller is disabled for the transport actions. Can we add some tests accordingly?

@dhrubo-os
Copy link
Collaborator

Integration tests are failing. I retried now. I left few comments @b4sjoo

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented Sep 3, 2024

I haven't see any unit tests when controller is disabled for the transport actions. Can we add some tests accordingly?

Fine I can add them when I get back. Not a hard job

@dhrubo-os
Copy link
Collaborator

I think we should also check here before performing deletion?

@b4sjoo
Copy link
Collaborator Author

b4sjoo commented Sep 17, 2024

I think we should also check here before performing deletion?

No need because it calls DeleteControllerTransportAction, which already have applied feature flag. No need to do the duplicated call.

@b4sjoo b4sjoo merged commit a72181a into opensearch-project:main Sep 17, 2024
5 of 6 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is feature/multi_tenancy and the compare/head branch is backport/backport-2652-to-feature/multi_tenancy.

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