Skip to content

Modern Docker Management, Designed for Everyone

fix: swarm scale mode and replicas fixes (#2470)

Kyle Mendell4f076c46a318
diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.go
index 96bbd48f0..30319eeeb 100644
--- a/backend/internal/services/swarm_service.go
+++ b/backend/internal/services/swarm_service.go
@@ -1141,13 +1141,9 @@ func (s *SwarmService) ScaleService(ctx context.Context, serviceID string, repli
}
service := serviceResult.Service
- if service.Spec.Mode.Global != nil {
- return nil, errors.New("cannot scale global service")
- }
- if service.Spec.Mode.Replicated == nil {
- service.Spec.Mode.Replicated = &swarm.ReplicatedService{}
+ if err := applySwarmServiceScaleInternal(&service.Spec.Mode, replicas); err != nil {
+ return nil, err
}
- service.Spec.Mode.Replicated.Replicas = &replicas
updateResult, err := dockerClient.ServiceUpdate(ctx, serviceID, dockerclient.ServiceUpdateOptions{
Version: service.Version,
@@ -1160,6 +1156,19 @@ func (s *SwarmService) ScaleService(ctx context.Context, serviceID string, repli
return &swarmtypes.ServiceUpdateResponse{Warnings: updateResult.Warnings}, nil
}
+func applySwarmServiceScaleInternal(mode *swarm.ServiceMode, replicas uint64) error {
+ switch {
+ case mode.Replicated != nil:
+ mode.Replicated.Replicas = &replicas
+ case mode.ReplicatedJob != nil:
+ mode.ReplicatedJob.TotalCompletions = &replicas
+ default:
+ return fmt.Errorf("scale can only be used with replicated or replicated-job mode: %w", cerrdefs.ErrInvalidArgument)
+ }
+
+ return nil
+}
+
func (s *SwarmService) UpdateNode(ctx context.Context, nodeID string, req swarmtypes.NodeUpdateRequest) error {
if err := s.ensureSwarmManagerInternal(ctx); err != nil {
return err
diff --git a/backend/internal/services/swarm_service_test.go b/backend/internal/services/swarm_service_test.go
index 1f52a208d..6d669e4ad 100644
--- a/backend/internal/services/swarm_service_test.go
+++ b/backend/internal/services/swarm_service_test.go
@@ -8,8 +8,11 @@ import (
"path/filepath"
"testing"
+ cerrdefs "github.com/containerd/errdefs"
"github.com/getarcaneapp/arcane/backend/internal/models"
swarmtypes "github.com/getarcaneapp/arcane/types/swarm"
+ "github.com/moby/moby/api/types/swarm"
+ "github.com/moby/moby/api/types/system"
"github.com/stretchr/testify/require"
)
@@ -100,3 +103,107 @@ func TestSwarmService_UpdateAndGetStackSource_UsesStoredFilesWithoutSwarmManager
require.Equal(t, updated.ComposeContent, source.ComposeContent)
require.Equal(t, updated.EnvContent, source.EnvContent)
}
+
+func TestSwarmService_ScaleService_HandlesServiceModesInternal(t *testing.T) {
+ ctx := context.Background()
+ replicas := uint64(5)
+ maxConcurrent := uint64(2)
+
+ tests := []struct {
+ name string
+ mode swarm.ServiceMode
+ assertMode func(*testing.T, swarm.ServiceMode)
+ wantErr bool
+ }{
+ {
+ name: "replicated",
+ mode: swarm.ServiceMode{Replicated: &swarm.ReplicatedService{}},
+ assertMode: func(t *testing.T, mode swarm.ServiceMode) {
+ t.Helper()
+ require.NotNil(t, mode.Replicated)
+ require.NotNil(t, mode.Replicated.Replicas)
+ require.Equal(t, replicas, *mode.Replicated.Replicas)
+ require.Nil(t, mode.ReplicatedJob)
+ },
+ },
+ {
+ name: "replicated job",
+ mode: swarm.ServiceMode{ReplicatedJob: &swarm.ReplicatedJob{MaxConcurrent: &maxConcurrent}},
+ assertMode: func(t *testing.T, mode swarm.ServiceMode) {
+ t.Helper()
+ require.Nil(t, mode.Replicated)
+ require.NotNil(t, mode.ReplicatedJob)
+ require.NotNil(t, mode.ReplicatedJob.TotalCompletions)
+ require.Equal(t, replicas, *mode.ReplicatedJob.TotalCompletions)
+ require.NotNil(t, mode.ReplicatedJob.MaxConcurrent)
+ require.Equal(t, maxConcurrent, *mode.ReplicatedJob.MaxConcurrent)
+ },
+ },
+ {
+ name: "global",
+ mode: swarm.ServiceMode{Global: &swarm.GlobalService{}},
+ wantErr: true,
+ },
+ {
+ name: "global job",
+ mode: swarm.ServiceMode{GlobalJob: &swarm.GlobalJob{}},
+ wantErr: true,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ updateCalls := 0
+ var updatedSpec swarm.ServiceSpec
+
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "application/json")
+
+ switch {
+ case r.Method == http.MethodGet && r.URL.Path == "/v1.41/info":
+ require.NoError(t, json.NewEncoder(w).Encode(system.Info{
+ Swarm: swarm.Info{
+ LocalNodeState: swarm.LocalNodeStateActive,
+ ControlAvailable: true,
+ },
+ }))
+ case r.Method == http.MethodGet && r.URL.Path == "/v1.41/services/service-1":
+ require.NoError(t, json.NewEncoder(w).Encode(swarm.Service{
+ ID: "service-1",
+ Meta: swarm.Meta{
+ Version: swarm.Version{Index: 7},
+ },
+ Spec: swarm.ServiceSpec{
+ Annotations: swarm.Annotations{Name: "service-1"},
+ Mode: tt.mode,
+ },
+ }))
+ case r.Method == http.MethodPost && r.URL.Path == "/v1.41/services/service-1/update":
+ updateCalls++
+ require.Equal(t, "7", r.URL.Query().Get("version"))
+ require.NoError(t, json.NewDecoder(r.Body).Decode(&updatedSpec))
+ require.NoError(t, json.NewEncoder(w).Encode(map[string]any{"Warnings": []string{"updated"}}))
+ default:
+ http.NotFound(w, r)
+ }
+ }))
+ t.Cleanup(server.Close)
+
+ svc := NewSwarmService(&DockerClientService{client: newTestDockerClient(t, server)}, nil, nil, nil, nil)
+
+ resp, err := svc.ScaleService(ctx, "service-1", replicas)
+ if tt.wantErr {
+ require.Error(t, err)
+ require.True(t, cerrdefs.IsInvalidArgument(err), "expected invalid argument, got %v", err)
+ require.Equal(t, 0, updateCalls)
+ return
+ }
+
+ require.NoError(t, err)
+ require.NotNil(t, resp)
+ require.Equal(t, []string{"updated"}, resp.Warnings)
+ require.Equal(t, 1, updateCalls)
+ tt.assertMode(t, updatedSpec.Mode)
+ })
+ }
+}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 8a9c41c33..3d2f9a74f 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -922,6 +922,8 @@
"swarm_service_form_hostname_placeholder": "my-service",
"swarm_service_mode_replicated": "Replicated",
"swarm_service_mode_global": "Global",
+ "swarm_service_mode_replicated_job": "Replicated Job",
+ "swarm_service_mode_global_job": "Global Job",
"swarm_service_replica_singular": "replica",
"swarm_service_replica_plural": "replicas",
"swarm_service_env_var": "ENV_VAR",
diff --git a/frontend/src/lib/types/swarm.type.ts b/frontend/src/lib/types/swarm.type.ts
index ad79da403..8ecd4de0e 100644
--- a/frontend/src/lib/types/swarm.type.ts
+++ b/frontend/src/lib/types/swarm.type.ts
@@ -75,7 +75,7 @@ export interface SwarmServiceSummary {
id: string;
name: string;
image: string;
- mode: string;
+ mode: SwarmServiceModeName;
replicas: number;
runningReplicas: number;
ports: SwarmServicePort[];
@@ -88,6 +88,24 @@ export interface SwarmServiceSummary {
mounts: SwarmServiceMount[];
}
+export type SwarmServiceModeName = 'replicated' | 'global' | 'replicated-job' | 'global-job' | 'unknown';
+
+export interface SwarmReplicatedMode {
+ Replicas?: number;
+}
+
+export interface SwarmReplicatedJobMode {
+ MaxConcurrent?: number;
+ TotalCompletions?: number;
+}
+
+export interface SwarmServiceModeSpec {
+ Replicated?: SwarmReplicatedMode;
+ Global?: Record<string, never>;
+ ReplicatedJob?: SwarmReplicatedJobMode;
+ GlobalJob?: Record<string, never>;
+}
+
export interface ServiceNetworkIPAMConfig {
subnet?: string;
gateway?: string;
diff --git a/frontend/src/lib/utils/swarm-service-mode.utils.ts b/frontend/src/lib/utils/swarm-service-mode.utils.ts
new file mode 100644
index 000000000..d5cd1cab8
--- /dev/null
+++ b/frontend/src/lib/utils/swarm-service-mode.utils.ts
@@ -0,0 +1,46 @@
+import { m } from '$lib/paraglide/messages';
+import type { SwarmServiceModeName, SwarmServiceModeSpec } from '$lib/types/swarm.type';
+
+export type SwarmServiceModeBadgeVariant = 'green' | 'blue' | 'amber' | 'purple' | 'gray';
+
+export function getSwarmServiceModeFromSpec(mode: SwarmServiceModeSpec | undefined): SwarmServiceModeName {
+ if (mode?.Replicated) return 'replicated';
+ if (mode?.Global !== undefined) return 'global';
+ if (mode?.ReplicatedJob) return 'replicated-job';
+ if (mode?.GlobalJob !== undefined) return 'global-job';
+ return 'unknown';
+}
+
+export function getSwarmServiceModeLabel(mode: string): string {
+ switch (mode) {
+ case 'replicated':
+ return m.swarm_service_mode_replicated();
+ case 'global':
+ return m.swarm_service_mode_global();
+ case 'replicated-job':
+ return m.swarm_service_mode_replicated_job();
+ case 'global-job':
+ return m.swarm_service_mode_global_job();
+ default:
+ return m.common_unknown();
+ }
+}
+
+export function getSwarmServiceModeVariant(mode: string): SwarmServiceModeBadgeVariant {
+ switch (mode) {
+ case 'replicated':
+ return 'blue';
+ case 'global':
+ return 'green';
+ case 'replicated-job':
+ return 'amber';
+ case 'global-job':
+ return 'purple';
+ default:
+ return 'gray';
+ }
+}
+
+export function isSwarmServiceModeScalable(mode: string): boolean {
+ return mode === 'replicated' || mode === 'replicated-job';
+}
diff --git a/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte b/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte
index c570d12b5..322fe91f6 100644
--- a/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte
+++ b/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte
@@ -21,7 +21,8 @@
ServiceVirtualIP,
SwarmServiceInspect,
SwarmServiceMount,
- SwarmServicePort
+ SwarmServicePort,
+ SwarmServiceModeSpec
} from '$lib/types/swarm.type';
import ServiceEditorDialog from '../service-editor-dialog.svelte';
import ServiceOverview from '../components/ServiceOverview.svelte';
@@ -44,6 +45,12 @@
RedeployIcon,
TrashIcon
} from '$lib/icons';
+ import {
+ getSwarmServiceModeFromSpec,
+ getSwarmServiceModeLabel,
+ getSwarmServiceModeVariant,
+ isSwarmServiceModeScalable
+ } from '$lib/utils/swarm-service-mode.utils';
let { data } = $props();
let service = $derived(data?.service as SwarmServiceInspect);
@@ -71,10 +78,7 @@
type ServiceSpecShape = {
Name?: string;
Labels?: Record<string, string>;
- Mode?: {
- Replicated?: { Replicas?: number };
- Global?: unknown;
- };
+ Mode?: SwarmServiceModeSpec;
TaskTemplate?: {
ContainerSpec?: ServiceContainerSpecShape;
Networks?: RawServiceNetworkAttachment[];
@@ -87,14 +91,15 @@
const serviceName = $derived(spec?.Name || '');
const serviceImage = $derived(containerSpec?.Image || '');
- const serviceMode = $derived.by(() => {
- if (spec?.Mode?.Replicated) return 'replicated';
- if (spec?.Mode?.Global !== undefined) return 'global';
- return 'unknown';
- });
+ const serviceMode = $derived(getSwarmServiceModeFromSpec(spec?.Mode));
+ const canScaleService = $derived(isSwarmServiceModeScalable(serviceMode));
const desiredReplicas = $derived.by(() => {
if (serviceMode === 'global') return 0;
+ if (serviceMode === 'global-job') return 0;
+ if (serviceMode === 'replicated-job') {
+ return spec?.Mode?.ReplicatedJob?.TotalCompletions ?? spec?.Mode?.ReplicatedJob?.MaxConcurrent ?? 1;
+ }
return spec?.Mode?.Replicated?.Replicas ?? 1;
});
const scaleReplicas = $derived.by(() => {
@@ -264,7 +269,7 @@
}
async function handleScale() {
- if (!service?.id || serviceMode !== 'replicated') return;
+ if (!service?.id || !canScaleService) return;
const replicas = Math.max(0, Number(scaleReplicas) || 0);
handleApiResultWithCallbacks({
result: await tryCatch(swarmService.scaleService(service.id, { replicas })),
@@ -288,11 +293,8 @@
<h1 class="max-w-[300px] truncate text-lg font-semibold" title={serviceName}>
{serviceName}
</h1>
- <StatusBadge
- variant={serviceMode === 'replicated' ? 'blue' : serviceMode === 'global' ? 'green' : 'gray'}
- text={serviceMode}
- />
- {#if serviceMode === 'replicated'}
+ <StatusBadge variant={getSwarmServiceModeVariant(serviceMode)} text={getSwarmServiceModeLabel(serviceMode)} />
+ {#if canScaleService}
<span class="text-muted-foreground font-mono text-sm">
{desiredReplicas}
{m.swarm_replicas()}
@@ -303,7 +305,7 @@
{#snippet headerActions()}
<div class="flex items-center gap-2">
- {#if serviceMode === 'replicated'}
+ {#if canScaleService}
<div class="flex items-center gap-2">
<Input
type="number"
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
index f00fadf93..c281f580e 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
@@ -6,6 +6,11 @@
import { format, formatDistanceToNow } from 'date-fns';
import { InfoIcon, ConnectionIcon } from '$lib/icons';
import { truncateImageDigest } from '$lib/utils/string.utils';
+ import {
+ getSwarmServiceModeLabel,
+ getSwarmServiceModeVariant,
+ isSwarmServiceModeScalable
+ } from '$lib/utils/swarm-service-mode.utils';
interface Props {
service: SwarmServiceInspect;
@@ -40,6 +45,7 @@
const nodes = $derived((service?.nodes as string[]) || []);
const versionIndex = $derived(service?.version?.index ?? service?.version?.Index ?? 0);
const updateStatus = $derived(service?.updateStatus as Record<string, any> | null | undefined);
+ const canScaleService = $derived(isSwarmServiceModeScalable(serviceMode));
</script>
<Card.Root>
@@ -76,11 +82,8 @@
{m.swarm_mode()} / {m.swarm_replicas()}
</div>
<div class="flex items-center gap-2">
- <StatusBadge
- variant={serviceMode === 'replicated' ? 'blue' : serviceMode === 'global' ? 'green' : 'gray'}
- text={serviceMode}
- />
- {#if serviceMode === 'replicated'}
+ <StatusBadge variant={getSwarmServiceModeVariant(serviceMode)} text={getSwarmServiceModeLabel(serviceMode)} />
+ {#if canScaleService}
<span class="text-foreground font-mono text-sm">
{desiredReplicas}
{m.swarm_replicas()}
@@ -159,7 +162,7 @@
</div>
{#if nodes.length > 0}
<div class="flex flex-wrap gap-1.5">
- {#each nodes as node}
+ {#each nodes as node (node)}
<div class="flex items-center gap-1">
<ConnectionIcon class="text-muted-foreground size-3" />
<span class="text-foreground text-sm font-medium">{node}</span>
diff --git a/frontend/src/routes/(app)/swarm/services/service-editor-dialog.svelte b/frontend/src/routes/(app)/swarm/services/service-editor-dialog.svelte
index 73f0d1a3e..4a8af24d2 100644
--- a/frontend/src/routes/(app)/swarm/services/service-editor-dialog.svelte
+++ b/frontend/src/routes/(app)/swarm/services/service-editor-dialog.svelte
@@ -9,6 +9,7 @@
import * as Accordion from '$lib/components/ui/accordion/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import { untrack } from 'svelte';
+ import { getSwarmServiceModeLabel } from '$lib/utils/swarm-service-mode.utils';
type ServiceEditorPayload = {
spec: Record<string, unknown>;
@@ -31,7 +32,7 @@
error: string;
};
- type ServiceEditorMode = 'replicated' | 'global';
+ type ServiceEditorMode = 'replicated' | 'global' | 'replicated-job' | 'global-job';
type ServicePortDraft = {
target: string;
@@ -74,6 +75,11 @@
Replicas?: number;
};
Global?: Record<string, unknown>;
+ ReplicatedJob?: {
+ MaxConcurrent?: number;
+ TotalCompletions?: number;
+ };
+ GlobalJob?: Record<string, unknown>;
};
TaskTemplate?: {
ContainerSpec?: {
@@ -156,6 +162,10 @@
return value === 'udp' ? 'udp' : 'tcp';
}
+ function isJobMode(mode: ServiceEditorMode): boolean {
+ return mode === 'replicated-job' || mode === 'global-job';
+ }
+
function parseInitialSpec(specText: string): SwarmServiceSpecRaw | null {
if (!specText.trim()) return null;
@@ -172,7 +182,10 @@
if (!spec) return createEmptyFormState();
const containerSpec = spec.TaskTemplate?.ContainerSpec;
- const mode: ServiceEditorMode = spec.Mode?.Global ? 'global' : 'replicated';
+ let mode: ServiceEditorMode = 'replicated';
+ if (spec.Mode?.Global) mode = 'global';
+ if (spec.Mode?.ReplicatedJob) mode = 'replicated-job';
+ if (spec.Mode?.GlobalJob) mode = 'global-job';
return {
name: createTextField(spec.Name ?? ''),
@@ -275,10 +288,16 @@
const containerSpec = ensureRecord(taskTemplate, 'ContainerSpec');
containerSpec.Image = form.image.value.trim();
- spec.Mode =
- form.mode === 'replicated'
- ? { Replicated: { Replicas: Math.max(0, parseInt(form.replicas.value, 10) || 1) } }
- : { Global: {} };
+ const baseMode = asRecord(form.baseSpec.Mode);
+ if (form.mode === 'replicated') {
+ spec.Mode = { Replicated: { Replicas: Math.max(0, parseInt(form.replicas.value, 10) || 1) } };
+ } else if (form.mode === 'global') {
+ spec.Mode = { Global: {} };
+ } else if (form.mode === 'replicated-job') {
+ spec.Mode = { ReplicatedJob: structuredClone(asRecord(baseMode?.ReplicatedJob) ?? {}) };
+ } else {
+ spec.Mode = { GlobalJob: structuredClone(asRecord(baseMode?.GlobalJob) ?? {}) };
+ }
// Add optional container config
const commandParts = form.command.value.trim().split(' ').filter(Boolean);
@@ -372,11 +391,9 @@
<div class="grid grid-cols-2 gap-4">
<FormInput label={m.swarm_mode()}>
{#snippet children()}
- <Select.Root type="single" bind:value={form.mode} disabled={isLoading}>
+ <Select.Root type="single" bind:value={form.mode} disabled={isLoading || isJobMode(form.mode)}>
<Select.Trigger class="w-full">
- <span class="capitalize"
- >{form.mode === 'replicated' ? m.swarm_service_mode_replicated() : m.swarm_service_mode_global()}</span
- >
+ <span>{getSwarmServiceModeLabel(form.mode)}</span>
</Select.Trigger>
<Select.Content>
<Select.Item value="replicated" label={m.swarm_service_mode_replicated()}
diff --git a/frontend/src/routes/(app)/swarm/services/services-table.svelte b/frontend/src/routes/(app)/swarm/services/services-table.svelte
index 2a728aa45..fada01e41 100644
--- a/frontend/src/routes/(app)/swarm/services/services-table.svelte
+++ b/frontend/src/routes/(app)/swarm/services/services-table.svelte
@@ -15,6 +15,7 @@
import { tryCatch } from '$lib/utils/try-catch';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { goto } from '$app/navigation';
+ import { getSwarmServiceModeLabel, getSwarmServiceModeVariant } from '$lib/utils/swarm-service-mode.utils';
let {
services = $bindable(),
@@ -50,9 +51,11 @@
return name;
}
- function modeVariant(mode: string): 'green' | 'blue' | 'amber' | 'gray' {
+ function modeIconVariant(mode: string): 'emerald' | 'blue' | 'amber' | 'purple' | 'gray' {
if (mode === 'replicated') return 'blue';
- if (mode === 'global') return 'green';
+ if (mode === 'global') return 'emerald';
+ if (mode === 'replicated-job') return 'amber';
+ if (mode === 'global-job') return 'purple';
return 'gray';
}
@@ -126,7 +129,7 @@
{/snippet}
{#snippet ModeCell({ value }: { value: unknown })}
- <StatusBadge text={String(value ?? m.common_unknown())} variant={modeVariant(String(value ?? ''))} />
+ <StatusBadge text={getSwarmServiceModeLabel(String(value ?? ''))} variant={getSwarmServiceModeVariant(String(value ?? ''))} />
{/snippet}
{#snippet StackCell({ value }: { value: unknown })}
@@ -146,7 +149,7 @@
<span class="text-muted-foreground text-sm">{m.common_na()}</span>
{:else}
<div class="flex flex-col gap-0.5">
- {#each items.slice(0, MAX_OVERFLOW_ITEMS) as item}
+ {#each items.slice(0, MAX_OVERFLOW_ITEMS) as item (item)}
<span class="max-w-45 truncate font-mono text-sm">{item}</span>
{/each}
{#if items.length > MAX_OVERFLOW_ITEMS}
@@ -181,13 +184,15 @@
{item}
icon={() => ({
component: DockIcon,
- variant: item.mode === 'global' ? 'emerald' : 'blue'
+ variant: modeIconVariant(item.mode)
})}
title={(item: SwarmServiceSummary) => getShortName(item.name, item.stackName)}
subtitle={(item: SwarmServiceSummary) => ((mobileFieldVisibility.stackName ?? true) ? (item.stackName ?? null) : null)}
badges={[
(item: SwarmServiceSummary) =>
- (mobileFieldVisibility.mode ?? true) ? { variant: modeVariant(item.mode), text: item.mode } : null
+ (mobileFieldVisibility.mode ?? true)
+ ? { variant: getSwarmServiceModeVariant(item.mode), text: getSwarmServiceModeLabel(item.mode) }
+ : null
]}
fields={[
{
diff --git a/types/swarm/service.go b/types/swarm/service.go
index db83dab45..a7c541bd9 100644
--- a/types/swarm/service.go
+++ b/types/swarm/service.go
@@ -70,7 +70,7 @@ type ServiceSummary struct {
// Required: true
Image string `json:"image"`
- // Mode is the service mode (replicated or global).
+ // Mode is the service mode (replicated, global, replicated-job, or global-job).
//
// Required: true
Mode string `json:"mode"`
@@ -317,16 +317,32 @@ func NewServiceSummary(service swarm.Service, nodeNames []string, networkNameByI
mode := "unknown"
replicas := uint64(0)
runningReplicas := uint64(0)
- if spec.Mode.Replicated != nil {
+ switch {
+ case spec.Mode.Replicated != nil:
mode = "replicated"
if spec.Mode.Replicated.Replicas != nil {
replicas = *spec.Mode.Replicated.Replicas
}
- } else if spec.Mode.Global != nil {
+ case spec.Mode.Global != nil:
mode = "global"
if service.ServiceStatus != nil {
replicas = service.ServiceStatus.DesiredTasks
}
+ case spec.Mode.ReplicatedJob != nil:
+ mode = "replicated-job"
+ switch {
+ case spec.Mode.ReplicatedJob.TotalCompletions != nil:
+ replicas = *spec.Mode.ReplicatedJob.TotalCompletions
+ case spec.Mode.ReplicatedJob.MaxConcurrent != nil:
+ replicas = *spec.Mode.ReplicatedJob.MaxConcurrent
+ default:
+ replicas = 1
+ }
+ case spec.Mode.GlobalJob != nil:
+ mode = "global-job"
+ if service.ServiceStatus != nil {
+ replicas = service.ServiceStatus.DesiredTasks
+ }
}
if service.ServiceStatus != nil {
diff --git a/types/swarm/service_test.go b/types/swarm/service_test.go
new file mode 100644
index 000000000..23d200291
--- /dev/null
+++ b/types/swarm/service_test.go
@@ -0,0 +1,79 @@
+package swarm
+
+import (
+ "testing"
+
+ mobyswarm "github.com/moby/moby/api/types/swarm"
+ "github.com/stretchr/testify/require"
+)
+
+func TestNewServiceSummary_ReportsJobModes(t *testing.T) {
+ totalCompletions := uint64(5)
+ maxConcurrent := uint64(2)
+
+ tests := []struct {
+ name string
+ service mobyswarm.Service
+ wantMode string
+ wantReplicas uint64
+ }{
+ {
+ name: "replicated job uses total completions",
+ service: mobyswarm.Service{
+ Spec: mobyswarm.ServiceSpec{
+ Mode: mobyswarm.ServiceMode{
+ ReplicatedJob: &mobyswarm.ReplicatedJob{
+ MaxConcurrent: &maxConcurrent,
+ TotalCompletions: &totalCompletions,
+ },
+ },
+ },
+ },
+ wantMode: "replicated-job",
+ wantReplicas: totalCompletions,
+ },
+ {
+ name: "replicated job falls back to max concurrent",
+ service: mobyswarm.Service{
+ Spec: mobyswarm.ServiceSpec{
+ Mode: mobyswarm.ServiceMode{
+ ReplicatedJob: &mobyswarm.ReplicatedJob{MaxConcurrent: &maxConcurrent},
+ },
+ },
+ },
+ wantMode: "replicated-job",
+ wantReplicas: maxConcurrent,
+ },
+ {
+ name: "replicated job falls back to Docker default",
+ service: mobyswarm.Service{
+ Spec: mobyswarm.ServiceSpec{
+ Mode: mobyswarm.ServiceMode{
+ ReplicatedJob: &mobyswarm.ReplicatedJob{},
+ },
+ },
+ },
+ wantMode: "replicated-job",
+ wantReplicas: 1,
+ },
+ {
+ name: "global job uses service status desired tasks",
+ service: mobyswarm.Service{
+ Spec: mobyswarm.ServiceSpec{
+ Mode: mobyswarm.ServiceMode{GlobalJob: &mobyswarm.GlobalJob{}},
+ },
+ ServiceStatus: &mobyswarm.ServiceStatus{DesiredTasks: 4},
+ },
+ wantMode: "global-job",
+ wantReplicas: 4,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ summary := NewServiceSummary(tt.service, nil, nil)
+ require.Equal(t, tt.wantMode, summary.Mode)
+ require.Equal(t, tt.wantReplicas, summary.Replicas)
+ })
+ }
+}