Skip to content

fix: prevent inventory from overwriting Deleting status for NVLink #2674

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.

Sign up for GitHub

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

Open
obondarev wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −12
Open

fix: prevent inventory from overwriting Deleting status for NVLink #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions rest-api/workflow/pkg/activity/nvlinklogicalpartition/nvlinklogicalpartition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ func (mnlp ManageNVLinkLogicalPartition) UpdateNVLinkLogicalPartitionsInDB(ctx c

// Update status if necessary
if controllerNvllp.Status != nil {
if nvllp.Status == cdbm.NVLinkLogicalPartitionStatusDeleting {
continue
}

var mapped cdbm.NVLinkLogicalPartitionStatus
mapped.FromProto(controllerNvllp.Status.State)
if mapped != "" && mapped != nvllp.Status {
Expand Down
31 changes: 19 additions & 12 deletions rest-api/workflow/pkg/activity/nvlinklogicalpartition/nvlinklogicalpartition_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,15 @@ func TestManageNVLinkLogicalPartition_UpdateNVLinkLogicalPartitionsInDB(t *testi
}

tests := []struct {
name string
fields fields
args args
updatedNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
readyNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
deletedNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
missingNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
restoredNVLinkLogicalPartition *cdbm.NVLinkLogicalPartition
name string
fields fields
args args
updatedNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
readyNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
deletedNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
missingNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
deletingNVLinkLogicalPartitions []*cdbm.NVLinkLogicalPartition
restoredNVLinkLogicalPartition *cdbm.NVLinkLogicalPartition

wantErr bool
}{
Expand Down Expand Up @@ -331,10 +332,11 @@ func TestManageNVLinkLogicalPartition_UpdateNVLinkLogicalPartitionsInDB(t *testi
},
},
},
updatedNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp1, nvllp3},
deletedNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp5, nvllp6},
missingNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp7, nvllp11},
restoredNVLinkLogicalPartition: nvllp8,
updatedNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp1},
deletedNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp5, nvllp6},
missingNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp7, nvllp11},
deletingNVLinkLogicalPartitions: []*cdbm.NVLinkLogicalPartition{nvllp3},
restoredNVLinkLogicalPartition: nvllp8,
wantErr: false,
},
{
Expand Down Expand Up @@ -455,6 +457,11 @@ func TestManageNVLinkLogicalPartition_UpdateNVLinkLogicalPartitionsInDB(t *testi
assert.Equal(t, cdbm.NVLinkLogicalPartitionStatusError, uv.Status)
}

for _, nvllp := range tt.deletingNVLinkLogicalPartitions {
uv, _ := nvllpDAO.GetByID(ctx, nil, nvllp.ID, nil)
assert.Equal(t, cdbm.NVLinkLogicalPartitionStatusDeleting, uv.Status, "Deleting status should not be overwritten by inventory")
}

if tt.restoredNVLinkLogicalPartition != nil {
rv, _ := nvllpDAO.GetByID(ctx, nil, tt.restoredNVLinkLogicalPartition.ID, nil)
assert.False(t, rv.IsMissingOnSite)
Expand Down