Skip to content

Modern Docker Management, Designed for Everyone

perf: route docker deamon calls through singleflight callers (#3818)

Kyle Mendell64c2500b669f
diff --git a/backend/internal/container/service.go b/backend/internal/container/service.go
index d41363135..06d9dc249 100644
--- a/backend/internal/container/service.go
+++ b/backend/internal/container/service.go
@@ -1446,24 +1446,19 @@ func (s *ContainerService) ListContainersPaginated(
includeInternal bool,
groupBy string,
) (ContainerListResult, error) {
- var dockerContainers []container.Summary
- if includeAll {
- var err error
- dockerContainers, err = s.dockerService.ListContainers(ctx)
- if err != nil {
- return ContainerListResult{}, err
- }
- } else {
- dockerClient, err := s.dockerService.GetClient(ctx)
- if err != nil {
- return ContainerListResult{}, errors.WrapIf(err, "failed to connect to Docker")
- }
-
- containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: false})
- if err != nil {
- return ContainerListResult{}, errors.WrapIf(err, "failed to list Docker containers")
+ dockerContainers, err := s.dockerService.ListContainers(ctx)
+ if err != nil {
+ return ContainerListResult{}, err
+ }
+ if !includeAll {
+ running := make([]container.Summary, 0, len(dockerContainers))
+ for _, dc := range dockerContainers {
+ switch dc.State {
+ case container.StateRunning, container.StatePaused, container.StateRestarting:
+ running = append(running, dc)
+ }
}
- dockerContainers = containerList.Items
+ dockerContainers = running
}
dockerContainers = FilterInternalContainers(dockerContainers, includeInternal)
diff --git a/backend/internal/docker/service.go b/backend/internal/docker/service.go
index 728bcd09c..d29b761ac 100644
--- a/backend/internal/docker/service.go
+++ b/backend/internal/docker/service.go
@@ -344,6 +344,13 @@ func listCoalescedInternal[T any](ctx context.Context, group *singleflight.Group
}
}
+func (s *DockerClientService) apiTimeoutInternal() time.Duration {
+ if s.settingsService == nil {
+ return timeouts.DefaultDockerAPI
+ }
+ return timeouts.GetDuration(s.settingsService.GetSettingsConfig().DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI)
+}
+
func (s *DockerClientService) ListContainers(ctx context.Context) ([]container.Summary, error) {
return listCoalescedInternal(ctx, &s.containerListFlight, func(ctx context.Context) ([]container.Summary, error) {
dockerClient, err := s.GetClient(ctx)
@@ -351,8 +358,7 @@ func (s *DockerClientService) ListContainers(ctx context.Context) ([]container.S
return nil, errors.WrapIf(err, "failed to connect to Docker")
}
- settings := s.settingsService.GetSettingsConfig()
- apiCtx, cancel := context.WithTimeout(ctx, timeouts.GetDuration(settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI))
+ apiCtx, cancel := context.WithTimeout(ctx, s.apiTimeoutInternal())
defer cancel()
containerList, err := dockerClient.ContainerList(apiCtx, client.ContainerListOptions{All: true})
@@ -370,8 +376,7 @@ func (s *DockerClientService) ListImages(ctx context.Context) ([]image.Summary,
return nil, errors.WrapIf(err, "failed to connect to Docker")
}
- settings := s.settingsService.GetSettingsConfig()
- apiCtx, cancel := context.WithTimeout(ctx, timeouts.GetDuration(settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI))
+ apiCtx, cancel := context.WithTimeout(ctx, s.apiTimeoutInternal())
defer cancel()
imageList, err := dockerClient.ImageList(apiCtx, client.ImageListOptions{All: true})
@@ -388,8 +393,7 @@ func (s *DockerClientService) listNetworksInternal(ctx context.Context) ([]netwo
return nil, errors.WrapIf(err, "failed to connect to Docker")
}
- settings := s.settingsService.GetSettingsConfig()
- apiCtx, cancel := context.WithTimeout(ctx, timeouts.GetDuration(settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI))
+ apiCtx, cancel := context.WithTimeout(ctx, s.apiTimeoutInternal())
defer cancel()
networkList, err := libarcane.NetworkListWithCompatibility(apiCtx, dockerClient, client.NetworkListOptions{})
@@ -405,8 +409,7 @@ func (s *DockerClientService) listVolumesInternal(ctx context.Context) (*client.
return nil, errors.WrapIf(err, "failed to connect to Docker")
}
- settings := s.settingsService.GetSettingsConfig()
- apiCtx, cancel := context.WithTimeout(ctx, timeouts.GetDuration(settings.DockerAPITimeout.AsInt(), timeouts.DefaultDockerAPI))
+ apiCtx, cancel := context.WithTimeout(ctx, s.apiTimeoutInternal())
defer cancel()
volResp, err := dockerClient.VolumeList(apiCtx, client.VolumeListOptions{})
diff --git a/backend/internal/network/service.go b/backend/internal/network/service.go
index 5f98d75de..87e178cbd 100644
--- a/backend/internal/network/service.go
+++ b/backend/internal/network/service.go
@@ -59,12 +59,12 @@ func (s *NetworkService) GetNetworkTopology(ctx context.Context) (*networktypes.
return nil, errors.WrapIf(err, "failed to connect to Docker")
}
- containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})
+ containers, err := s.dockerService.ListContainers(ctx)
if err != nil {
return nil, errors.WrapIf(err, "failed to list containers")
}
- containerInfoByID := buildTopologyContainerInfoInternal(containerList.Items)
+ containerInfoByID := buildTopologyContainerInfoInternal(containers)
networkList, err := libarcane.NetworkListWithCompatibility(ctx, dockerClient, client.NetworkListOptions{})
if err != nil {
@@ -354,11 +354,10 @@ func (s *NetworkService) ListNetworksPaginated(ctx context.Context, params pagin
return nil, pagination.Response{}, networktypes.UsageCounts{}, errors.WrapIf(err, "failed to connect to Docker")
}
- containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})
+ containers, err := s.dockerService.ListContainers(ctx)
if err != nil {
return nil, pagination.Response{}, networktypes.UsageCounts{}, errors.WrapIf(err, "failed to list containers")
}
- containers := containerList.Items
inUseByID, inUseByName := s.buildNetworkUsageMaps(containers)
diff --git a/backend/internal/port/service.go b/backend/internal/port/service.go
index eed929bce..a30bc1a5b 100644
--- a/backend/internal/port/service.go
+++ b/backend/internal/port/service.go
@@ -11,7 +11,6 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
containertypes "github.com/getarcaneapp/arcane/types/v2/container"
porttypes "github.com/getarcaneapp/arcane/types/v2/port"
- "github.com/moby/moby/client"
)
type PortService struct {
@@ -23,18 +22,13 @@ func NewPortService(dockerService *docker.DockerClientService) *PortService {
}
func (s *PortService) ListPortsPaginated(ctx context.Context, params pagination.QueryParams) ([]porttypes.PortMapping, pagination.Response, error) {
- dockerClient, err := s.dockerService.GetClient(ctx)
- if err != nil {
- return nil, pagination.Response{}, errors.WrapIf(err, "failed to connect to Docker")
- }
-
- containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})
+ containers, err := s.dockerService.ListContainers(ctx)
if err != nil {
return nil, pagination.Response{}, errors.WrapIf(err, "failed to list containers")
}
items := make([]porttypes.PortMapping, 0)
- for _, rawContainer := range containerList.Items {
+ for _, rawContainer := range containers {
summary := containertypes.NewSummary(rawContainer)
containerName := primaryContainerNameInternal(summary.Names, summary.ID)
for _, port := range summary.Ports {
diff --git a/backend/internal/volume/listing.go b/backend/internal/volume/listing.go
index feb29f871..4e741a4c4 100644
--- a/backend/internal/volume/listing.go
+++ b/backend/internal/volume/listing.go
@@ -103,14 +103,14 @@ func enrichVolumesWithUsageDataInternal(volumes []volume.Volume, usageVolumes []
return result
}
-func buildVolumeContainerMapInternal(ctx context.Context, dockerClient *client.Client) (map[string][]string, error) {
- containers, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})
+func (s *VolumeService) buildVolumeContainerMapInternal(ctx context.Context) (map[string][]string, error) {
+ containers, err := s.dockerService.ListContainers(ctx)
if err != nil {
return nil, errors.WrapIf(err, "failed to list containers")
}
volumeContainerMap := make(map[string][]string)
- for _, c := range containers.Items {
+ for _, c := range containers {
for _, m := range c.Mounts {
if m.Type == mount.TypeVolume && m.Name != "" {
volumeContainerMap[m.Name] = append(volumeContainerMap[m.Name], c.ID)
@@ -386,7 +386,7 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat
}(apiCtx)
go func(ctx context.Context) {
- containerMap, err := buildVolumeContainerMapInternal(ctx, dockerClient)
+ containerMap, err := s.buildVolumeContainerMapInternal(ctx)
containerChan <- containerMapResult{containerMap: containerMap, err: err}
}(apiCtx)