Skip to content

Make it so the close call returns ok even if the pool cannot be closed #144

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
ric394 merged 1 commit into from
Apr 22, 2026
Merged

Make it so the close call returns ok even if the pool cannot be closed #144

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
19 changes: 16 additions & 3 deletions APSIM.POStats.Portal/Controllers/Api.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ public async Task<IActionResult> Close(int pullrequestnumber, string commitid)
if (statsDb.PullRequestWithCommitExists(pullrequestnumber, commitid))
{
Console.WriteLine($"Closing PR \"{pullrequestnumber} with commit {commitid}\"");

PullRequestDetails pullRequest = new();
try
{
// Send pass/fail to gitHub
var pullRequest = statsDb.ClosePullRequest(pullrequestnumber);
pullRequest = statsDb.ClosePullRequest(pullrequestnumber);

if (PullRequestFunctions.HasExceptionInLogs(pullRequest))
{
Expand All @@ -143,12 +143,25 @@ public async Task<IActionResult> Close(int pullrequestnumber, string commitid)
if (string.IsNullOrEmpty(pullRequest.Pool))
throw new Exception("No pool associated with this pull request. Pool is required to close the Azure Batch pool.");

await AzureBatchManager.CloseBatchPoolAsync(pullRequest.Pool);
}
catch (Exception ex)
{
return BadRequest(ex.ToString());
}

// Close the Azure Batch pool
try
{
await AzureBatchManager.CloseBatchPoolAsync(pullRequest.Pool);
}
catch(InvalidOperationException ex)
{
// If we get an exception here, it likely means the pool was
// already closed.
// Log the error, but do not return an error to the user as
// the PR was successfully closed in the database and GitHub.
return Ok($"PR closed, but failed to close Azure Batch pool ({pullRequest.Pool}). Error: {ex}");
}
}
else
{
Expand Down
Loading