Skip to content

Commit

Permalink
*: update dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
criyle committed Aug 11, 2023
1 parent 04804ed commit faec026
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 46 deletions.
26 changes: 26 additions & 0 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ builds:
- arm
- arm64
- riscv64
- loong64
# - mips64le
- ppc64le
- s390x
goarm:
- "6"
- "7"
Expand Down Expand Up @@ -81,6 +85,24 @@ dockers:
- "mount.yaml"
build_flag_templates:
- "--platform=linux/arm/v7"
- image_templates:
- "criyle/executorserver:{{ .Tag }}-ppc64le"
use: buildx
dockerfile: "Dockerfile.goreleaser"
goarch: ppc64le
extra_files:
- "mount.yaml"
build_flag_templates:
- "--platform=linux/ppc64le"
- image_templates:
- "criyle/executorserver:{{ .Tag }}-s390x"
use: buildx
dockerfile: "Dockerfile.goreleaser"
goarch: s390x
extra_files:
- "mount.yaml"
build_flag_templates:
- "--platform=linux/s390x"
# Debian is not supporting riscv64 on stable branch, skip it first
# - image_templates:
# - "criyle/executorserver:{{ .Tag }}-riscv64"
Expand All @@ -97,12 +119,16 @@ docker_manifests:
- "criyle/executorserver:{{ .Tag }}-amd64"
- "criyle/executorserver:{{ .Tag }}-arm64"
- "criyle/executorserver:{{ .Tag }}-arm"
- "criyle/executorserver:{{ .Tag }}-ppc64le"
- "criyle/executorserver:{{ .Tag }}-s390x"
# - "criyle/executorserver:{{ .Tag }}-riscv64"
- name_template: "criyle/executorserver:latest"
image_templates:
- "criyle/executorserver:{{ .Tag }}-amd64"
- "criyle/executorserver:{{ .Tag }}-arm64"
- "criyle/executorserver:{{ .Tag }}-arm"
- "criyle/executorserver:{{ .Tag }}-ppc64le"
- "criyle/executorserver:{{ .Tag }}-s390x"
# - "criyle/executorserver:{{ .Tag }}-riscv64"
skip_push: auto
checksum:
Expand Down
2 changes: 1 addition & 1 deletion README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ interface WSResult {

#### cgroup v2

`executorserver` 目前已经支持 cgroup v2 鉴于越来越多的 Linux 发行版默认启用 cgroup v2 而不是 v1 (比如 Ubuntu 21.10+,Fedora 31+)。然而,因为 cgroup v2 在内存控制器里面缺少 `memory.max_usage_in_bytes`,内存使用量计数会转而采用 `maxrss` 指标。这项指标会显示的比使用 cgroup v1 时候要稍多,在运行使用内存较少的程序时比较明显。
`executorserver` 目前已经支持 cgroup v2 鉴于越来越多的 Linux 发行版默认启用 cgroup v2 而不是 v1 (比如 Ubuntu 21.10+,Fedora 31+)。然而,对于内核版本小于 5.19 的版本,因为 cgroup v2 在内存控制器里面缺少 `memory.max_usage_in_bytes`,内存使用量计数会转而采用 `maxrss` 指标。这项指标会显示的比使用 cgroup v1 时候要稍多,在运行使用内存较少的程序时比较明显。对于内核版本大于或等于 5.19 的版本,`memory.peak` 会被采用

同时,如果本程序在容器中运行,容器中的进程会被移到 `/init` cgroup v2 控制器中来开启 cgroup v2 嵌套支持。

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ If a bind mount is specifying a target within the previous mounted one, please e

#### cgroup v2 support

The cgroup v2 is supported by `executorserver` now when running as root since more Linux distribution are enabling cgroup v2 by default (e.g. Ubuntu 21.10+, Fedora 31+). However, due to missing `memory.max_usage_in_bytes` in `memory` controller, the memory usage is now accounted by `maxrss` returned by `wait4` syscall. Thus, the memory usage appears higher than those who uses cgroup v1.
The cgroup v2 is supported by `executorserver` now when running as root since more Linux distribution are enabling cgroup v2 by default (e.g. Ubuntu 21.10+, Fedora 31+). However, for kernel < 5.19, due to missing `memory.max_usage_in_bytes` in `memory` controller, the memory usage is now accounted by `maxrss` returned by `wait4` syscall. Thus, the memory usage appears higher than those who uses cgroup v1. For kernel >= 5.19, `memory.peak` is being used.

When running in containers, the `executorserver` will migrate all processed into `/init` hierarchy to enable nesting support.

Expand Down
27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/creack/pty v1.1.18
github.com/criyle/go-sandbox v0.9.15
github.com/criyle/go-sandbox v0.9.16
github.com/elastic/go-seccomp-bpf v1.3.0
github.com/elastic/go-ucfg v0.8.6
github.com/gin-contrib/zap v0.1.0
Expand All @@ -16,21 +16,21 @@ require (
github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7
github.com/prometheus/client_golang v1.16.0
github.com/zsais/go-gin-prometheus v0.1.0
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.11.0
golang.org/x/net v0.12.0
go.uber.org/zap v1.25.0
golang.org/x/crypto v0.12.0
golang.org/x/net v0.14.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.10.0
google.golang.org/grpc v1.56.2
golang.org/x/sys v0.11.0
google.golang.org/grpc v1.57.0
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
)

require (
cloud.google.com/go/compute v1.22.0 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic v1.10.0-rc // indirect
github.com/bytedance/sonic v1.10.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
Expand All @@ -40,7 +40,7 @@ require (
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.1 // indirect
github.com/go-playground/validator/v10 v10.15.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
Expand All @@ -52,18 +52,17 @@ require (
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.4.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
Loading

0 comments on commit faec026

Please sign in to comment.