mirror of
https://github.com/GoodOlClint/PSProxmoxVE.git
synced 2026-09-04 03:05:32 +00:00
Every service method built and disposed its own PveHttpClient, and each client owned a fresh HttpClientHandler, so every API call was a TCP connect plus a TLS handshake and WaitForTask paid that 300 times over a ten-minute wait. PveServiceBase now owns the injected-or-fresh client lifetime behind one Invoke helper; the 201 hand-written try/finally blocks across the 16 services collapse to calls on it, and the nested NodeService/VmService instances receive the injected client. PveHttpClient takes its handler from a process-wide PveHandlerCache keyed on (host, port, skipCertificateCheck) and never disposes it, so the connection pool outlives any one client. WaitForTask holds one client for the whole wait and, when no pollInterval is supplied, backs off from 1 s toward a 10 s cap, never sleeping past the deadline. Co-authored-by: goodolclint-claude[bot] <323206664+goodolclint-claude[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
40f4eae9e2
commit
907b2aa1f2
@@ -2,7 +2,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Reflection;
|
||||
using Moq;
|
||||
using PSProxmoxVE.Core.Authentication;
|
||||
using PSProxmoxVE.Core.Client;
|
||||
@@ -123,20 +122,6 @@ namespace PSProxmoxVE.Core.Tests.Services
|
||||
// GetContainers multi-node aggregation: issue #142
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
/// <summary>
|
||||
/// Points the private NodeService field a ContainerService constructs at a mock
|
||||
/// client, so the "list all nodes" call the multi-node overload issues is reachable
|
||||
/// without a real HTTP connection. ContainerService(client) only injects the client
|
||||
/// used for the per-node lxc calls; NodeService is never constructor-injectable from
|
||||
/// ContainerService, so this is the only offline path to the aggregation loop.
|
||||
/// </summary>
|
||||
private static void InjectNodeServiceClient(ContainerService service, IPveHttpClient client)
|
||||
{
|
||||
var field = typeof(ContainerService).GetField("_nodeService", BindingFlags.NonPublic | BindingFlags.Instance)
|
||||
?? throw new InvalidOperationException("ContainerService._nodeService field not found.");
|
||||
field.SetValue(service, new NodeService(client));
|
||||
}
|
||||
|
||||
private static Mock<IPveHttpClient> SetupTwoNodeCluster()
|
||||
{
|
||||
var mockClient = new Mock<IPveHttpClient>();
|
||||
@@ -158,7 +143,6 @@ namespace PSProxmoxVE.Core.Tests.Services
|
||||
.ThrowsAsync(new PveApiException(HttpStatusCode.InternalServerError, "internal error", "nodes/pve2/lxc", "GET"));
|
||||
|
||||
var service = new ContainerService(mockClient.Object);
|
||||
InjectNodeServiceClient(service, mockClient.Object);
|
||||
|
||||
var skipped = new List<string>();
|
||||
var containers = service.GetContainers(CreateSession(), onNodeSkipped: (node, ex) => skipped.Add(node));
|
||||
@@ -180,7 +164,6 @@ namespace PSProxmoxVE.Core.Tests.Services
|
||||
.ThrowsAsync(new PveApiException(HttpStatusCode.Forbidden, "permission denied", "nodes/pve2/lxc", "GET"));
|
||||
|
||||
var service = new ContainerService(mockClient.Object);
|
||||
InjectNodeServiceClient(service, mockClient.Object);
|
||||
|
||||
var ex = Assert.Throws<PveApiException>(() => service.GetContainers(CreateSession()));
|
||||
Assert.Equal(HttpStatusCode.Forbidden, ex.StatusCode);
|
||||
@@ -203,7 +186,6 @@ namespace PSProxmoxVE.Core.Tests.Services
|
||||
"nodes/pve2/lxc", "GET", new HttpRequestException("connection refused")));
|
||||
|
||||
var service = new ContainerService(mockClient.Object);
|
||||
InjectNodeServiceClient(service, mockClient.Object);
|
||||
|
||||
var skipped = new List<string>();
|
||||
var containers = service.GetContainers(CreateSession(), onNodeSkipped: (node, ex) => skipped.Add(node));
|
||||
@@ -230,7 +212,6 @@ namespace PSProxmoxVE.Core.Tests.Services
|
||||
"nodes/pve2/lxc", "GET"));
|
||||
|
||||
var service = new ContainerService(mockClient.Object);
|
||||
InjectNodeServiceClient(service, mockClient.Object);
|
||||
|
||||
var skipped = new List<string>();
|
||||
var containers = service.GetContainers(CreateSession(), onNodeSkipped: (node, ex) => skipped.Add(node));
|
||||
|
||||
Reference in New Issue
Block a user