fix: allow workspaces to be attempted to be deleted when experiments had existed historically [CM-412] #10050
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…etion & add integration test
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #10050 +/- ##
==========================================
+ Coverage 54.60% 54.82% +0.21%
==========================================
Files 1260 840 -420
Lines 157635 83102 -74533
Branches 3632 0 -3632
==========================================
- Hits 86082 45563 -40519
+ Misses 71419 37539 -33880
+ Partials 134 0 -134
Flags with carried forward coverage won't be shown. Click here to find out more.
|
✅ Deploy Preview for determined-ui canceled.
|
kkunapuli
reviewed
Oct 14, 2024
kkunapuli
reviewed
Oct 14, 2024
master/internal/api_workspace.go
Outdated
| } | ||
|
|
||
| // modelsExist, err := a.workspaceHasModels(ctx, req.Id) |
kkunapuli
approved these changes
Oct 14, 2024
stoksc
reviewed
Oct 30, 2024
| checkFunc func(context.Context, int32) (bool, error) | ||
| errorStr string | ||
| }{ | ||
| {a.workspaceHasModels, "workspace (%d) contains models; move or delete models first"}, |
There was a problem hiding this comment.
@maxrussell it looks like you took this over. can you unroll this loop?
| func (a *apiServer) workspaceHasExperiments(ctx context.Context, workspaceID int32) (bool, error) { | ||
| exists, err := db.Bun().NewSelect().Table("experiments"). | ||
| Join("INNER JOIN projects ON experiments.project_id = projects.id"). | ||
| Where("projects.workspace_id=?", workspaceID). |
There was a problem hiding this comment.
Suggested change
| Where("projects.workspace_id=?", workspaceID). | |
| Where("projects.workspace_id = ?", workspaceID). |
| @@ -1002,6 +1003,44 @@ func TestDeleteWorkspace(t *testing.T) { | |||
| Id: resp.Workspace.Id, | |||
| }) | |||
| require.Error(t, err) | |||
|
|
|||
| // create another workspace, and add a experiment | |||
There was a problem hiding this comment.
nit, put the new test in a separate test.
| @@ -469,9 +474,18 @@ def setup_workspaces( | |||
| for e in exps: | |||
| if e.workspaceId not in wids: | |||
| continue | |||
| bindings.post_KillExperiment(session, id=e.id) | |||
| bindings.delete_DeleteExperiment(session, experimentId=e.id) | |||
| time.sleep(0.5) | |||
There was a problem hiding this comment.
what's up with the sleeping? is this waiting on the deletes to finish? if so there's no way this doesn't flake eventually haha.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket
CM-412
Description
A bug in the webUI was found where workspaces couldn't be deleted if there had ever been an experiment present in the workspace at any point in time. This removes the frontend check to disable the delete action in the action dropdown & adds logic into the API to perform the experiment present check.
Test Plan
Checklist
docs/release-notes/See Release Note for details.