Skip to content

Fix handle renewJob error return values and log them #216

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
ChristopherHX merged 4 commits into from
Aug 28, 2025
Merged

Fix handle renewJob error return values and log them #216

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bcc2bd
fix: handle renewJob error return values and log them
ChristopherHX Aug 28, 2025
28db959
.
ChristopherHX Aug 28, 2025
ab7aa34
.
ChristopherHX Aug 28, 2025
261efcf
.
ChristopherHX Aug 28, 2025
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
52 changes: 31 additions & 21 deletions actionsrunner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,27 +528,7 @@ func runJob(runnerenv RunnerEnvironment, joblock *sync.Mutex, vssConnection *pro
con := *vssConnection
go func() {
for {
var renewErr error
if runServiceURL != "" {
jobVssConnection, _, _ := jobreq.GetConnection("SystemVssConnection")
jobVssConnection.Trace = con.Trace
renewjobURL, _ := url.Parse(runServiceURL)
renewjobURL.Path = path.Join(renewjobURL.Path, "renewjob")
jobVssConnection.TenantURL = runServiceURL
payload := &runservice.RenewJobRequest{
PlanID: jobreq.Plan.PlanID,
JobID: jobreq.JobID,
}
resp := &runservice.RenewJobResponse{}
renewErr = jobVssConnection.RequestWithContext2(jobctx, "POST", renewjobURL.String(), "", payload, &resp)
} else {
renewErr = con.RequestWithContext(jobctx, "fc825784-c92a-4299-9221-998a02d1b54f", "5.1-preview", "PATCH", map[string]string{
"poolId": fmt.Sprint(instance.PoolID),
"requestId": fmt.Sprint(jobreq.RequestID),
}, map[string]string{
"lockToken": "00000000-0000-0000-0000-000000000000",
}, &protocol.RenewAgent{RequestID: jobreq.RequestID}, nil)
}
renewErr := renewJob(jobctx, runServiceURL, jobreq, &con, instance)
if renewErr != nil {
if errors.Is(renewErr, context.Canceled) {
return
Expand Down Expand Up @@ -634,3 +614,33 @@ func runJob(runnerenv RunnerEnvironment, joblock *sync.Mutex, vssConnection *pro
}
}()
}

func renewJob(jobctx context.Context, runServiceURL string, jobreq *protocol.AgentJobRequestMessage,
con *protocol.VssConnection, instance *runnerconfiguration.RunnerInstance,
) error {
if runServiceURL != "" {
jobVssConnection, _, conErr := jobreq.GetConnection("SystemVssConnection")
if conErr != nil {
return conErr
}
jobVssConnection.Trace = con.Trace
renewjobURL, urlErr := url.Parse(runServiceURL)
if urlErr != nil {
return urlErr
}
renewjobURL.Path = path.Join(renewjobURL.Path, "renewjob")
jobVssConnection.TenantURL = runServiceURL
payload := &runservice.RenewJobRequest{
PlanID: jobreq.Plan.PlanID,
JobID: jobreq.JobID,
}
resp := &runservice.RenewJobResponse{}
return jobVssConnection.RequestWithContext2(jobctx, "POST", renewjobURL.String(), "", payload, &resp)
}
return con.RequestWithContext(jobctx, "fc825784-c92a-4299-9221-998a02d1b54f", "5.1-preview", "PATCH", map[string]string{
"poolId": fmt.Sprint(instance.PoolID),
"requestId": fmt.Sprint(jobreq.RequestID),
}, map[string]string{
"lockToken": "00000000-0000-0000-0000-000000000000",
}, &protocol.RenewAgent{RequestID: jobreq.RequestID}, nil)
}
Loading