Skip to content

patch(2.0): Nil check DPU extension timestamp error logging (#3744) #4119

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
hwadekar-nv wants to merge 2 commits into
base: release/v2.0
Choose a base branch
from
+101 −3
Open

patch(2.0): Nil check DPU extension timestamp error logging (#3744) #4119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfedd6e
fix(rest-api): Nil check DPU extension timestamp error logging (#3744)
hwadekar-nv Jul 21, 2026
08b791e
Fix go vet finding
hwadekar-nv Jul 24, 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
5 changes: 3 additions & 2 deletions rest-api/workflow/pkg/activity/dpuextensionservice/dpuextensionservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,10 @@ func (mde ManageDpuExtensionService) UpdateDpuExtensionServicesInDB(ctx context.

created, err := time.Parse(DpuExtensionServiceTimeFormat, controllerDpuExtensionService.LatestVersionInfo.Created)
if err != nil {
if controllerDpuExtensionService.LatestVersionInfo.Created != "" {
slogger.Error().Err(err).Str("Created", controllerDpuExtensionService.LatestVersionInfo.Created).Msg("failed to parse timestamp for version info")
}
created = dpuExtensionService.Updated
} else if controllerDpuExtensionService.LatestVersionInfo.Created != "" {
slogger.Error().Err(err).Str("Created", controllerDpuExtensionService.LatestVersionInfo.Created).Msg("failed to parse timestamp for version info")
}

if dpuExtensionService.Version != nil && *dpuExtensionService.Version != latestVersion {
Expand Down
99 changes: 98 additions & 1 deletion rest-api/workflow/pkg/activity/dpuextensionservice/dpuextensionservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package dpuextensionservice

import (
"bytes"
"context"
"fmt"
"reflect"
Expand All @@ -16,6 +17,8 @@ import (
cwssaws "github.com/NVIDIA/infra-controller/rest-api/workflow-schema/schema/site-agent/workflows/v1"
sc "github.com/NVIDIA/infra-controller/rest-api/workflow/pkg/client/site"
"github.com/NVIDIA/infra-controller/rest-api/workflow/pkg/util"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
"github.com/uptrace/bun/extra/bundebug"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down Expand Up @@ -102,6 +105,8 @@ func TestManageDpuExtensionService_UpdateDpuExtensionServicesInDB(t *testing.T)
st := util.TestBuildSite(t, dbSession, ip, "test-site", cdbm.SiteStatusRegistered, nil, user)
st2 := util.TestBuildSite(t, dbSession, ip, "test-site-2", cdbm.SiteStatusRegistered, nil, user)
st3 := util.TestBuildSite(t, dbSession, ip, "test-site-3", cdbm.SiteStatusRegistered, nil, user)
st4 := util.TestBuildSite(t, dbSession, ip, "test-site-4", cdbm.SiteStatusRegistered, nil, user)
st5 := util.TestBuildSite(t, dbSession, ip, "test-site-5", cdbm.SiteStatusRegistered, nil, user)

// Create DPU Extension Services with different statuses
version1 := fmt.Sprintf("V1-T%d", time.Now().Unix()*1000000)
Expand Down Expand Up @@ -134,6 +139,18 @@ func TestManageDpuExtensionService_UpdateDpuExtensionServicesInDB(t *testing.T)
dpuExtensionService3 := util.TestBuildDpuExtensionService(t, dbSession, "test-dpu-extension-service-3", st, tenant, cdbm.DpuExtensionServiceServiceTypeKubernetesPod, cutil.GetPtr(version1), nil, []string{}, cdbm.DpuExtensionServiceStatusReady, user)
dpuExtensionService4 := util.TestBuildDpuExtensionService(t, dbSession, "test-dpu-extension-service-4", st, tenant, cdbm.DpuExtensionServiceServiceTypeKubernetesPod, nil, nil, []string{}, cdbm.DpuExtensionServiceStatusPending, user)
dpuExtensionService5 := util.TestBuildDpuExtensionService(t, dbSession, "test-dpu-extension-service-5", st, tenant, cdbm.DpuExtensionServiceServiceTypeKubernetesPod, nil, nil, []string{}, cdbm.DpuExtensionServiceStatusDeleting, user)
dpuExtensionService6 := util.TestBuildDpuExtensionService(t, dbSession, "test-dpu-extension-service-6", st4, tenant, cdbm.DpuExtensionServiceServiceTypeKubernetesPod, cutil.GetPtr(version1), &cdbm.DpuExtensionServiceVersionInfo{
Version: version1,
Data: "test-data",
HasCredentials: false,
Created: time.Now().UTC().Round(time.Microsecond),
}, []string{version1}, cdbm.DpuExtensionServiceStatusReady, user)
dpuExtensionService7 := util.TestBuildDpuExtensionService(t, dbSession, "test-dpu-extension-service-7", st5, tenant, cdbm.DpuExtensionServiceServiceTypeKubernetesPod, cutil.GetPtr(version1), &cdbm.DpuExtensionServiceVersionInfo{
Version: version1,
Data: "test-data",
HasCredentials: false,
Created: time.Now().UTC().Round(time.Microsecond),
}, []string{version1}, cdbm.DpuExtensionServiceStatusReady, user)

// Build DPU Extension Services for paged testing
pagedDpuExtensionServices := []*cdbm.DpuExtensionService{}
Expand Down Expand Up @@ -192,6 +209,8 @@ func TestManageDpuExtensionService_UpdateDpuExtensionServicesInDB(t *testing.T)
args args
updatedDpuExtensionServices []*cdbm.DpuExtensionService
deletedDpuExtensionServices []*cdbm.DpuExtensionService
expectedCreated map[uuid.UUID]time.Time
expectTimestampParseError bool
wantErr bool
}{
{
Expand Down Expand Up @@ -287,6 +306,72 @@ func TestManageDpuExtensionService_UpdateDpuExtensionServicesInDB(t *testing.T)
deletedDpuExtensionServices: []*cdbm.DpuExtensionService{dpuExtensionService5},
wantErr: false,
},
{
name: "test DPU Extension Service inventory processing logs invalid version timestamp and uses fallback",
fields: fields{
dbSession: dbSession,
siteClientPool: tSiteClientPool,
env: env,
},
args: args{
ctx: ctx,
siteID: st4.ID,
dpuExtensionServiceInventory: &cwssaws.DpuExtensionServiceInventory{
DpuExtensionServices: []*cwssaws.DpuExtensionService{
{
ServiceId: dpuExtensionService6.ID.String(),
LatestVersionInfo: &cwssaws.DpuExtensionServiceVersionInfo{
Version: "V2",
Data: "updated-test-data",
Created: "invalid timestamp",
HasCredential: false,
},
ActiveVersions: []string{"V2"},
},
},
InventoryStatus: cwssaws.InventoryStatus_INVENTORY_STATUS_SUCCESS,
},
},
updatedDpuExtensionServices: []*cdbm.DpuExtensionService{dpuExtensionService6},
expectedCreated: map[uuid.UUID]time.Time{
dpuExtensionService6.ID: dpuExtensionService6.Updated,
},
expectTimestampParseError: true,
wantErr: false,
},
{
name: "test DPU Extension Service inventory processing uses fallback for empty version timestamp without logging error",
fields: fields{
dbSession: dbSession,
siteClientPool: tSiteClientPool,
env: env,
},
args: args{
ctx: ctx,
siteID: st5.ID,
dpuExtensionServiceInventory: &cwssaws.DpuExtensionServiceInventory{
DpuExtensionServices: []*cwssaws.DpuExtensionService{
{
ServiceId: dpuExtensionService7.ID.String(),
LatestVersionInfo: &cwssaws.DpuExtensionServiceVersionInfo{
Version: "V2",
Data: "updated-test-data",
Created: "",
HasCredential: false,
},
ActiveVersions: []string{"V2"},
},
},
InventoryStatus: cwssaws.InventoryStatus_INVENTORY_STATUS_SUCCESS,
},
},
updatedDpuExtensionServices: []*cdbm.DpuExtensionService{dpuExtensionService7},
expectedCreated: map[uuid.UUID]time.Time{
dpuExtensionService7.ID: dpuExtensionService7.Updated,
},
expectTimestampParseError: false,
wantErr: false,
},
{
name: "test DPU Extension Service inventory processing with failed status",
fields: fields{
Expand Down Expand Up @@ -373,13 +458,21 @@ func TestManageDpuExtensionService_UpdateDpuExtensionServicesInDB(t *testing.T)

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var logOutput bytes.Buffer
originalLogger := log.Logger
log.Logger = zerolog.New(&logOutput)
defer func() {
log.Logger = originalLogger
}()

mde := ManageDpuExtensionService{
dbSession: tt.fields.dbSession,
siteClientPool: tt.fields.siteClientPool,
}

err := mde.UpdateDpuExtensionServicesInDB(tt.args.ctx, tt.args.siteID, tt.args.dpuExtensionServiceInventory)
assert.Equal(t, tt.wantErr, err != nil)
assert.Equal(t, tt.expectTimestampParseError, bytes.Contains(logOutput.Bytes(), []byte("failed to parse timestamp for version info")))

if tt.wantErr {
return
Expand All @@ -401,7 +494,11 @@ func TestManageDpuExtensionService_UpdateDpuExtensionServicesInDB(t *testing.T)
}
assert.Equal(t, controllerDes.LatestVersionInfo.Data, updatedDpuExtService.VersionInfo.Data)
assert.Equal(t, controllerDes.LatestVersionInfo.HasCredential, updatedDpuExtService.VersionInfo.HasCredentials)
assert.Equal(t, controllerDes.LatestVersionInfo.Created, updatedDpuExtService.VersionInfo.Created.Format(DpuExtensionServiceTimeFormat))
if expectedCreated, ok := tt.expectedCreated[updatedDpuExtService.ID]; ok {
assert.Equal(t, expectedCreated, updatedDpuExtService.VersionInfo.Created)
} else {
assert.Equal(t, controllerDes.LatestVersionInfo.Created, updatedDpuExtService.VersionInfo.Created.Format(DpuExtensionServiceTimeFormat))
}
if controllerDes.LatestVersionInfo.Observability != nil {
assert.Equal(t, controllerDes.LatestVersionInfo.GetObservability().Configs[0].GetPrometheus().Endpoint, updatedDpuExtService.VersionInfo.Observability.GetConfigs()[0].GetPrometheus().Endpoint)
} else {
Expand Down
Loading