Skip to content

Commit cc0da22

Browse files
elohmeierslonopotamus
elohmeier
and
slonopotamus
authored
Upgrade deps, switch to new stats interface (Roblox#176)
* Update deprecated API usage * upgrade nomad & containerd deps, use new cpustats interface --------- Co-authored-by: Marat Radchenko <[email protected]>
1 parent 80b9be1 commit cc0da22

File tree

6 files changed

+528
-1152
lines changed

6 files changed

+528
-1152
lines changed

‎containerd/containerd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (d *Driver) parshAuth(auth *RegistryAuth) CredentialsOpt {
8888
func withResolver(creds CredentialsOpt) containerd.RemoteOpt {
8989
resolver := remotesdocker.NewResolver(remotesdocker.ResolverOptions{
9090
Hosts: remotesdocker.ConfigureDefaultRegistries(remotesdocker.WithAuthorizer(
91-
remotesdocker.NewAuthorizer(nil, creds))),
91+
remotesdocker.NewDockerAuthorizer(remotesdocker.WithAuthCreds(creds)))),
9292
})
9393
return containerd.WithResolver(resolver)
9494
}

‎containerd/driver.go‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/hashicorp/consul-template/signals"
2929
"github.com/hashicorp/go-hclog"
3030
log "github.com/hashicorp/go-hclog"
31-
"github.com/hashicorp/nomad/client/stats"
31+
"github.com/hashicorp/nomad/client/lib/cpustats"
3232
"github.com/hashicorp/nomad/client/taskenv"
3333
"github.com/hashicorp/nomad/drivers/shared/eventer"
3434
"github.com/hashicorp/nomad/drivers/shared/resolvconf"
@@ -223,6 +223,9 @@ type Driver struct {
223223
// nomadConfig is the client config from Nomad
224224
nomadConfig *base.ClientDriverConfig
225225

226+
// compute contains information about the available cpu compute
227+
compute cpustats.Compute
228+
226229
// tasks is the in memory datastore mapping taskIDs to driver handles
227230
tasks *taskStore
228231

@@ -336,6 +339,7 @@ func (d *Driver) SetConfig(cfg *base.Config) error {
336339
// Save the Nomad agent configuration
337340
if cfg.AgentConfig != nil {
338341
d.nomadConfig = cfg.AgentConfig.Driver
342+
d.compute = cfg.AgentConfig.Compute()
339343
}
340344

341345
return nil
@@ -501,9 +505,9 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
501505
procState: drivers.TaskStateRunning,
502506
startedAt: time.Now().Round(time.Millisecond),
503507
logger: d.logger,
504-
totalCpuStats: stats.NewCpuStats(),
505-
userCpuStats: stats.NewCpuStats(),
506-
systemCpuStats: stats.NewCpuStats(),
508+
totalCpuStats: cpustats.New(d.compute),
509+
userCpuStats: cpustats.New(d.compute),
510+
systemCpuStats: cpustats.New(d.compute),
507511
container: container,
508512
containerName: containerName,
509513
task: task,
@@ -576,9 +580,9 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
576580
startedAt: taskState.StartedAt,
577581
exitResult: &drivers.ExitResult{},
578582
logger: d.logger,
579-
totalCpuStats: stats.NewCpuStats(),
580-
userCpuStats: stats.NewCpuStats(),
581-
systemCpuStats: stats.NewCpuStats(),
583+
totalCpuStats: cpustats.New(d.compute),
584+
userCpuStats: cpustats.New(d.compute),
585+
systemCpuStats: cpustats.New(d.compute),
582586
container: container,
583587
containerName: taskState.ContainerName,
584588
task: task,

‎containerd/handle.go‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ import (
2525
"syscall"
2626
"time"
2727

28-
v1 "github.com/containerd/cgroups/stats/v1"
29-
v2 "github.com/containerd/cgroups/v2/stats"
28+
v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
29+
v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
3030
"github.com/containerd/containerd"
3131
"github.com/containerd/containerd/cio"
32-
"github.com/containerd/typeurl"
32+
"github.com/containerd/typeurl/v2"
3333
"github.com/hashicorp/go-hclog"
3434
uuid "github.com/hashicorp/go-uuid"
35-
"github.com/hashicorp/nomad/client/stats"
36-
hstats "github.com/hashicorp/nomad/helper/stats"
35+
"github.com/hashicorp/nomad/client/lib/cpustats"
3736
"github.com/hashicorp/nomad/plugins/drivers"
3837
)
3938

@@ -50,9 +49,9 @@ type taskHandle struct {
5049
startedAt time.Time
5150
completedAt time.Time
5251
exitResult *drivers.ExitResult
53-
totalCpuStats *stats.CpuStats
54-
userCpuStats *stats.CpuStats
55-
systemCpuStats *stats.CpuStats
52+
totalCpuStats *cpustats.Tracker
53+
userCpuStats *cpustats.Tracker
54+
systemCpuStats *cpustats.Tracker
5655
containerName string
5756
container containerd.Container
5857
task containerd.Task
@@ -103,11 +102,6 @@ func (h *taskHandle) run(ctxContainerd context.Context) {
103102
h.stateLock.Lock()
104103
defer h.stateLock.Unlock()
105104

106-
// Every executor runs this init at creation for stats
107-
if err := hstats.Init(); err != nil {
108-
h.logger.Error("unable to initialize stats", "error", err)
109-
}
110-
111105
// Sleep for 5 seconds to allow h.task.Wait() to kick in.
112106
// TODO: Use goroutine and a channel to synchronize this, instead of sleep.
113107
time.Sleep(5 * time.Second)

‎etchosts/etchosts.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"bytes"
2222
"fmt"
2323
"io"
24-
"io/ioutil"
2524
"os"
2625
"strings"
2726

@@ -64,7 +63,7 @@ func BuildEtcHosts(hostsFile string) error {
6463
return err
6564
}
6665
}
67-
return ioutil.WriteFile(hostsFile, content.Bytes(), 0644)
66+
return os.WriteFile(hostsFile, content.Bytes(), 0644)
6867
}
6968

7069
// CopyEtcHosts copies /etc/hosts to NOMAD_TASK_DIR/etc_hosts

‎go.mod‎

Lines changed: 128 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,114 +3,169 @@ module github.com/Roblox/nomad-driver-containerd
33
go 1.21.5
44

55
require (
6-
github.com/containerd/cgroups v1.0.3
7-
github.com/containerd/containerd v1.6.6
8-
github.com/containerd/typeurl v1.0.2
9-
github.com/docker/docker v20.10.12+incompatible
10-
github.com/docker/go-units v0.4.0
11-
github.com/hashicorp/consul-template v0.25.2
12-
github.com/hashicorp/go-hclog v1.2.2
13-
github.com/hashicorp/go-uuid v1.0.2
14-
github.com/hashicorp/nomad v1.2.13
6+
github.com/containerd/cgroups/v3 v3.0.3
7+
github.com/containerd/containerd v1.7.14
8+
github.com/containerd/typeurl/v2 v2.1.1
9+
github.com/docker/docker v25.0.2+incompatible
10+
github.com/docker/go-units v0.5.0
11+
github.com/hashicorp/consul-template v0.37.4
12+
github.com/hashicorp/go-hclog v1.6.2
13+
github.com/hashicorp/go-uuid v1.0.3
14+
github.com/hashicorp/nomad v1.7.6
1515
github.com/opencontainers/runc v1.1.12
16-
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
17-
github.com/spf13/cobra v1.1.3
16+
github.com/opencontainers/runtime-spec v1.2.0
17+
github.com/spf13/cobra v1.8.0
1818
)
1919

2020
require (
21+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
22+
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
2123
github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5 // indirect
22-
github.com/Microsoft/go-winio v0.5.1 // indirect
23-
github.com/Microsoft/hcsshim v0.9.3 // indirect
24+
github.com/Masterminds/goutils v1.1.1 // indirect
25+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
26+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
27+
github.com/Microsoft/go-winio v0.6.1 // indirect
28+
github.com/Microsoft/hcsshim v0.12.0 // indirect
2429
github.com/agext/levenshtein v1.2.1 // indirect
2530
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
26-
github.com/armon/go-metrics v0.4.0 // indirect
27-
github.com/container-storage-interface/spec v1.4.0 // indirect
28-
github.com/containerd/continuity v0.2.2 // indirect
29-
github.com/containerd/fifo v1.0.0 // indirect
30-
github.com/containerd/ttrpc v1.1.0 // indirect
31-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
31+
github.com/armon/go-metrics v0.4.1 // indirect
32+
github.com/armon/go-radix v1.0.0 // indirect
33+
github.com/bgentry/speakeasy v0.1.0 // indirect
34+
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
35+
github.com/container-storage-interface/spec v1.7.0 // indirect
36+
github.com/containerd/continuity v0.4.3 // indirect
37+
github.com/containerd/errdefs v0.1.0 // indirect
38+
github.com/containerd/fifo v1.1.0 // indirect
39+
github.com/containerd/log v0.1.0 // indirect
40+
github.com/containerd/ttrpc v1.2.3 // indirect
41+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3242
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
33-
github.com/davecgh/go-spew v1.1.1 // indirect
43+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3444
github.com/docker/go-connections v0.4.0 // indirect
3545
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
36-
github.com/docker/libnetwork v0.8.0-dev.2.0.20200612180813-9e99af28df21 // indirect
37-
github.com/fatih/color v1.13.0 // indirect
46+
github.com/dustin/go-humanize v1.0.1 // indirect
47+
github.com/fatih/color v1.15.0 // indirect
48+
github.com/felixge/httpsnoop v1.0.4 // indirect
49+
github.com/fsnotify/fsnotify v1.7.0 // indirect
50+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
51+
github.com/go-logr/logr v1.4.1 // indirect
52+
github.com/go-logr/stdr v1.2.2 // indirect
3853
github.com/go-ole/go-ole v1.2.6 // indirect
39-
github.com/godbus/dbus/v5 v5.0.6 // indirect
40-
github.com/gogo/googleapis v1.4.0 // indirect
54+
github.com/godbus/dbus/v5 v5.1.0 // indirect
4155
github.com/gogo/protobuf v1.3.2 // indirect
56+
github.com/gojuno/minimock/v3 v3.0.6 // indirect
4257
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
43-
github.com/golang/protobuf v1.5.2 // indirect
44-
github.com/google/uuid v1.2.0 // indirect
45-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
46-
github.com/hashicorp/consul/api v1.10.0 // indirect
47-
github.com/hashicorp/cronexpr v1.1.1 // indirect
58+
github.com/golang/protobuf v1.5.4 // indirect
59+
github.com/google/btree v1.0.1 // indirect
60+
github.com/google/go-cmp v0.6.0 // indirect
61+
github.com/google/uuid v1.6.0 // indirect
62+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
63+
github.com/hashicorp/consul/api v1.26.1 // indirect
64+
github.com/hashicorp/cronexpr v1.1.2 // indirect
4865
github.com/hashicorp/errwrap v1.1.0 // indirect
66+
github.com/hashicorp/go-bexpr v0.1.13 // indirect
4967
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5068
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
51-
github.com/hashicorp/go-msgpack v1.1.5 // indirect
69+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
70+
github.com/hashicorp/go-msgpack v1.1.6-0.20240304204939-8824e8ccc35f // indirect
5271
github.com/hashicorp/go-multierror v1.1.1 // indirect
53-
github.com/hashicorp/go-plugin v1.4.3 // indirect
72+
github.com/hashicorp/go-plugin v1.6.0 // indirect
73+
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
5474
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
55-
github.com/hashicorp/go-set v0.1.6 // indirect
75+
github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.4 // indirect
76+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
77+
github.com/hashicorp/go-secure-stdlib/reloadutil v0.1.1 // indirect
78+
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
79+
github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2 // indirect
80+
github.com/hashicorp/go-set/v2 v2.1.0 // indirect
5681
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
57-
github.com/hashicorp/go-version v1.3.0 // indirect
82+
github.com/hashicorp/go-version v1.6.0 // indirect
5883
github.com/hashicorp/golang-lru v0.5.4 // indirect
59-
github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee // indirect
60-
github.com/hashicorp/hcl/v2 v2.9.2-0.20210407182552-eb14f8319bdc // indirect
61-
github.com/hashicorp/memberlist v0.3.1 // indirect
62-
github.com/hashicorp/raft v1.3.1 // indirect
63-
github.com/hashicorp/serf v0.9.5 // indirect
64-
github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493 // indirect
84+
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
85+
github.com/hashicorp/hcl v1.0.1-vault-3 // indirect
86+
github.com/hashicorp/hcl/v2 v2.9.2-0.20220525143345-ab3cae0737bc // indirect
87+
github.com/hashicorp/memberlist v0.5.0 // indirect
88+
github.com/hashicorp/raft v1.5.0 // indirect
89+
github.com/hashicorp/raft-autopilot v0.1.6 // indirect
90+
github.com/hashicorp/serf v0.10.1 // indirect
91+
github.com/hashicorp/vault/api v1.10.0 // indirect
92+
github.com/hashicorp/yamux v0.1.1 // indirect
6593
github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745 // indirect
66-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
94+
github.com/huandu/xstrings v1.4.0 // indirect
95+
github.com/imdario/mergo v0.3.13 // indirect
96+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6797
github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect
68-
github.com/klauspost/compress v1.13.6 // indirect
98+
github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f // indirect
99+
github.com/klauspost/compress v1.17.7 // indirect
100+
github.com/kr/pretty v0.3.1 // indirect
101+
github.com/kr/text v0.2.0 // indirect
69102
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
70-
github.com/mattn/go-colorable v0.1.12 // indirect
71-
github.com/mattn/go-isatty v0.0.14 // indirect
72-
github.com/miekg/dns v1.1.41 // indirect
73-
github.com/mitchellh/copystructure v1.1.1 // indirect
103+
github.com/mattn/go-colorable v0.1.13 // indirect
104+
github.com/mattn/go-isatty v0.0.17 // indirect
105+
github.com/miekg/dns v1.1.50 // indirect
106+
github.com/mitchellh/cli v1.1.5 // indirect
107+
github.com/mitchellh/copystructure v1.2.0 // indirect
74108
github.com/mitchellh/go-homedir v1.1.0 // indirect
75-
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
109+
github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 // indirect
76110
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
77-
github.com/mitchellh/hashstructure v1.0.0 // indirect
111+
github.com/mitchellh/hashstructure v1.1.0 // indirect
78112
github.com/mitchellh/mapstructure v1.5.0 // indirect
79-
github.com/mitchellh/reflectwalk v1.0.1 // indirect
113+
github.com/mitchellh/pointerstructure v1.2.1 // indirect
114+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
80115
github.com/moby/locker v1.0.1 // indirect
81-
github.com/moby/sys/mount v0.3.1 // indirect
82-
github.com/moby/sys/mountinfo v0.6.0 // indirect
83-
github.com/moby/sys/signal v0.6.0 // indirect
84-
github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28 // indirect
116+
github.com/moby/sys/mount v0.3.3 // indirect
117+
github.com/moby/sys/mountinfo v0.7.1 // indirect
118+
github.com/moby/sys/sequential v0.5.0 // indirect
119+
github.com/moby/sys/signal v0.7.0 // indirect
120+
github.com/moby/sys/user v0.1.0 // indirect
121+
github.com/oklog/run v1.1.0 // indirect
85122
github.com/opencontainers/go-digest v1.0.0 // indirect
86-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
87-
github.com/opencontainers/selinux v1.10.1 // indirect
123+
github.com/opencontainers/image-spec v1.1.0 // indirect
124+
github.com/opencontainers/selinux v1.11.0 // indirect
88125
github.com/pkg/errors v0.9.1 // indirect
89-
github.com/pmezard/go-difflib v1.0.0 // indirect
126+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
127+
github.com/posener/complete v1.2.3 // indirect
90128
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
129+
github.com/prometheus/client_golang v1.19.0 // indirect
130+
github.com/rogpeppe/go-internal v1.10.0 // indirect
91131
github.com/ryanuber/go-glob v1.0.0 // indirect
92-
github.com/shirou/gopsutil/v3 v3.22.7 // indirect
93-
github.com/sirupsen/logrus v1.8.1 // indirect
132+
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
133+
github.com/shirou/gopsutil/v3 v3.23.9 // indirect
134+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
135+
github.com/shoenig/test v1.7.0 // indirect
136+
github.com/shopspring/decimal v1.3.1 // indirect
137+
github.com/sirupsen/logrus v1.9.3 // indirect
138+
github.com/spf13/cast v1.5.0 // indirect
94139
github.com/spf13/pflag v1.0.5 // indirect
95-
github.com/stretchr/testify v1.8.0 // indirect
96-
github.com/tklauser/go-sysconf v0.3.10 // indirect
97-
github.com/tklauser/numcpus v0.4.0 // indirect
140+
github.com/stretchr/testify v1.9.0 // indirect
141+
github.com/tklauser/go-sysconf v0.3.12 // indirect
142+
github.com/tklauser/numcpus v0.6.1 // indirect
98143
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
99144
github.com/vmihailenco/tagparser v0.1.1 // indirect
100-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
101-
github.com/zclconf/go-cty v1.8.0 // indirect
102-
go.opencensus.io v0.23.0 // indirect
103-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
104-
golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect
105-
golang.org/x/net v0.8.0 // indirect
106-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
107-
golang.org/x/sys v0.6.0 // indirect
108-
golang.org/x/text v0.8.0 // indirect
109-
google.golang.org/appengine v1.6.7 // indirect
110-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
111-
google.golang.org/grpc v1.45.0 // indirect
112-
google.golang.org/protobuf v1.27.1 // indirect
145+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
146+
github.com/zclconf/go-cty v1.12.1 // indirect
147+
go.opencensus.io v0.24.0 // indirect
148+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
149+
go.opentelemetry.io/otel v1.24.0 // indirect
150+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
151+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
152+
golang.org/x/crypto v0.19.0 // indirect
153+
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
154+
golang.org/x/mod v0.16.0 // indirect
155+
golang.org/x/net v0.21.0 // indirect
156+
golang.org/x/sync v0.6.0 // indirect
157+
golang.org/x/sys v0.18.0 // indirect
158+
golang.org/x/text v0.14.0 // indirect
159+
golang.org/x/time v0.3.0 // indirect
160+
golang.org/x/tools v0.16.1 // indirect
161+
google.golang.org/appengine v1.6.8 // indirect
162+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
163+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
164+
google.golang.org/grpc v1.62.1 // indirect
165+
google.golang.org/protobuf v1.33.0 // indirect
113166
gopkg.in/fsnotify.v1 v1.4.7 // indirect
114167
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
115168
gopkg.in/yaml.v3 v3.0.1 // indirect
169+
gotest.tools/v3 v3.5.1 // indirect
170+
oss.indeed.com/go/libtime v1.6.0 // indirect
116171
)

0 commit comments

Comments
 (0)