Skip to content

ROX-33939: virtual machine v2 reconciliation improvements #19904

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

Merged
dashrews78 merged 3 commits into from
Apr 14, 2026
Merged

ROX-33939: virtual machine v2 reconciliation improvements #19904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c6f5b9
X-Smart-Branch-Parent: master
dashrews78 Apr 8, 2026
1fd38ea
ROX-33939: Use Search instead of SearchRawVirtualMachines in V2 recon…
dashrews78 Apr 8, 2026
7828320
coderabbit had a point that the default paging of search is not corre…
dashrews78 Apr 10, 2026
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
8 changes: 2 additions & 6 deletions central/sensor/service/pipeline/virtualmachines/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,13 @@ func (p *pipelineImpl) reconcileV1(ctx context.Context, clusterID string, storeM
func (p *pipelineImpl) reconcileV2(ctx context.Context, clusterID string, storeMap *reconciliation.StoreMap) error {
query := search.NewQueryBuilder().AddExactMatches(search.ClusterID, clusterID).ProtoQuery()
query.Pagination = &v1.QueryPagination{Limit: math.MaxInt32}
virtualMachines, err := p.virtualMachineV2Store.SearchRawVirtualMachines(ctx, query)
results, err := p.virtualMachineV2Store.Search(ctx, query)
Comment thread
dashrews78 marked this conversation as resolved.
if err != nil {
return errors.Wrap(err, "retrieving v2 virtual machines for reconciliation")
}
clusterVMIDs := set.NewStringSet()
for _, vm := range virtualMachines {
clusterVMIDs.Add(vm.GetId())
}

store := storeMap.Get((*central.SensorEvent_VirtualMachine)(nil))
return reconciliation.Perform(store, clusterVMIDs, "virtualmachines", func(id string) error {
return reconciliation.Perform(store, search.ResultsToIDSet(results), "virtualmachines", func(id string) error {
return p.virtualMachineV2Store.DeleteVirtualMachines(ctx, id)
})
}
Expand Down
35 changes: 12 additions & 23 deletions central/sensor/service/pipeline/virtualmachines/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/stackrox/rox/pkg/features"
"github.com/stackrox/rox/pkg/fixtures/fixtureconsts"
"github.com/stackrox/rox/pkg/protomock"
"github.com/stackrox/rox/pkg/search"
"github.com/stackrox/rox/pkg/uuid"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
Expand Down Expand Up @@ -387,12 +388,9 @@ func TestPipelineReconcileV2(t *testing.T) {
m.Add((*central.SensorEvent_VirtualMachine)(nil), "existing-vm")
},
setupMock: func(m *virtualMachineV2DSMocks.MockDataStore) {
m.EXPECT().SearchRawVirtualMachines(gomock.Any(), gomock.Any()).
Return([]*storage.VirtualMachineV2{
{
Id: "existing-vm",
ClusterId: testClusterID,
},
m.EXPECT().Search(gomock.Any(), gomock.Any()).
Return([]search.Result{
{ID: "existing-vm"},
}, nil)
},
},
Expand All @@ -403,12 +401,9 @@ func TestPipelineReconcileV2(t *testing.T) {
},
setupMock: func(m *virtualMachineV2DSMocks.MockDataStore) {
// Query is now cluster-scoped, so only VMs from testClusterID are returned.
m.EXPECT().SearchRawVirtualMachines(gomock.Any(), gomock.Any()).
Return([]*storage.VirtualMachineV2{
{
Id: "existing-vm",
ClusterId: testClusterID,
},
m.EXPECT().Search(gomock.Any(), gomock.Any()).
Return([]search.Result{
{ID: "existing-vm"},
}, nil)
},
},
Expand All @@ -419,16 +414,10 @@ func TestPipelineReconcileV2(t *testing.T) {
},
setupMock: func(m *virtualMachineV2DSMocks.MockDataStore) {
m.EXPECT().
SearchRawVirtualMachines(gomock.Any(), gomock.Any()).
Return([]*storage.VirtualMachineV2{
{
Id: "existing-vm",
ClusterId: testClusterID,
},
{
Id: "vm-to-remove-from-cluster",
ClusterId: testClusterID,
},
Search(gomock.Any(), gomock.Any()).
Return([]search.Result{
{ID: "existing-vm"},
{ID: "vm-to-remove-from-cluster"},
}, nil)
m.EXPECT().
DeleteVirtualMachines(gomock.Any(), "vm-to-remove-from-cluster").
Expand All @@ -442,7 +431,7 @@ func TestPipelineReconcileV2(t *testing.T) {
},
setupMock: func(m *virtualMachineV2DSMocks.MockDataStore) {
m.EXPECT().
SearchRawVirtualMachines(gomock.Any(), gomock.Any()).
Search(gomock.Any(), gomock.Any()).
Return(nil, errox.InvalidArgs)
},
expectsError: true,
Expand Down
Loading