mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 13:27:16 +00:00
Switch the CRI integration layer from containerd's forked Kubernetes helpers and clients to the upstream Kubernetes modules, and finalize the dependency update to Kubernetes v0.36.0. Replace the remaining internal helper copies with upstream packages: - internal/cri/clock -> k8s.io/utils/clock - internal/cri/executil -> upstream CRI exec helpers - internal/cri/resourcequantity -> k8s.io/apimachinery/pkg/api/resource - internal/cri/setutils -> k8s.io/apimachinery/pkg/util/sets - internal/cri/types/labels.go -> internal/cri/labels - integration/cri-api/pkg/apis/services.go -> k8s.io/cri-api/pkg/apis/services.go Adopt the upstream CRI clients directly: - add k8s.io/cri-client v0.36.0, k8s.io/cri-streaming v0.36.0, and k8s.io/streaming v0.36.0 as direct dependencies - promote k8s.io/utils to a direct dependency and pull in k8s.io/component-base v0.36.0 indirectly - keep integration/remote as a thin containerd adapter around cri-client, because the integration tests still need the stream-shaped GetContainerEvents RPC Finalize the Kubernetes dependency update from v0.36.0-rc.0 to v0.36.0, refresh vendor/, and drop the obsolete internal utility copies. Also fix the protobuf MessageState mutex-copy vet failures exposed by the new APIs and close the temporary integration CRI clients explicitly. Signed-off-by: Davanum Srinivas <davanum@gmail.com>
260 lines
7.7 KiB
Go
260 lines
7.7 KiB
Go
// Copyright The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package procfs
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/prometheus/procfs/internal/fs"
|
|
"github.com/prometheus/procfs/internal/util"
|
|
)
|
|
|
|
// CPUStat shows how much time the cpu spend in various stages.
|
|
type CPUStat struct {
|
|
User float64
|
|
Nice float64
|
|
System float64
|
|
Idle float64
|
|
Iowait float64
|
|
IRQ float64
|
|
SoftIRQ float64
|
|
Steal float64
|
|
Guest float64
|
|
GuestNice float64
|
|
}
|
|
|
|
// SoftIRQStat represent the softirq statistics as exported in the procfs stat file.
|
|
// A nice introduction can be found at https://0xax.gitbooks.io/linux-insides/content/interrupts/interrupts-9.html
|
|
// It is possible to get per-cpu stats by reading `/proc/softirqs`.
|
|
type SoftIRQStat struct {
|
|
Hi uint64
|
|
Timer uint64
|
|
NetTx uint64
|
|
NetRx uint64
|
|
Block uint64
|
|
BlockIoPoll uint64
|
|
Tasklet uint64
|
|
Sched uint64
|
|
Hrtimer uint64
|
|
Rcu uint64
|
|
}
|
|
|
|
// Stat represents kernel/system statistics.
|
|
type Stat struct {
|
|
// Boot time in seconds since the Epoch.
|
|
BootTime uint64
|
|
// Summed up cpu statistics.
|
|
CPUTotal CPUStat
|
|
// Per-CPU statistics.
|
|
CPU map[int64]CPUStat
|
|
// Number of times interrupts were handled, which contains numbered and unnumbered IRQs.
|
|
IRQTotal uint64
|
|
// Number of times a numbered IRQ was triggered.
|
|
IRQ []uint64
|
|
// Number of times a context switch happened.
|
|
ContextSwitches uint64
|
|
// Number of times a process was created.
|
|
ProcessCreated uint64
|
|
// Number of processes currently running.
|
|
ProcessesRunning uint64
|
|
// Number of processes currently blocked (waiting for IO).
|
|
ProcessesBlocked uint64
|
|
// Number of times a softirq was scheduled.
|
|
SoftIRQTotal uint64
|
|
// Detailed softirq statistics.
|
|
SoftIRQ SoftIRQStat
|
|
}
|
|
|
|
// Parse a cpu statistics line and returns the CPUStat struct plus the cpu id (or -1 for the overall sum).
|
|
func parseCPUStat(line string) (CPUStat, int64, error) {
|
|
cpuStat := CPUStat{}
|
|
var cpu string
|
|
|
|
count, err := fmt.Sscanf(line, "%s %f %f %f %f %f %f %f %f %f %f",
|
|
&cpu,
|
|
&cpuStat.User, &cpuStat.Nice, &cpuStat.System, &cpuStat.Idle,
|
|
&cpuStat.Iowait, &cpuStat.IRQ, &cpuStat.SoftIRQ, &cpuStat.Steal,
|
|
&cpuStat.Guest, &cpuStat.GuestNice)
|
|
|
|
if err != nil && !errors.Is(err, io.EOF) {
|
|
return CPUStat{}, -1, fmt.Errorf("%w: couldn't parse %q (cpu): %w", ErrFileParse, line, err)
|
|
}
|
|
if count == 0 {
|
|
return CPUStat{}, -1, fmt.Errorf("%w: couldn't parse %q (cpu): 0 elements parsed", ErrFileParse, line)
|
|
}
|
|
|
|
cpuStat.User /= userHZ
|
|
cpuStat.Nice /= userHZ
|
|
cpuStat.System /= userHZ
|
|
cpuStat.Idle /= userHZ
|
|
cpuStat.Iowait /= userHZ
|
|
cpuStat.IRQ /= userHZ
|
|
cpuStat.SoftIRQ /= userHZ
|
|
cpuStat.Steal /= userHZ
|
|
cpuStat.Guest /= userHZ
|
|
cpuStat.GuestNice /= userHZ
|
|
|
|
if cpu == "cpu" {
|
|
return cpuStat, -1, nil
|
|
}
|
|
|
|
cpuID, err := strconv.ParseInt(cpu[3:], 10, 64)
|
|
if err != nil {
|
|
return CPUStat{}, -1, fmt.Errorf("%w: couldn't parse %q (cpu/cpuid): %w", ErrFileParse, line, err)
|
|
}
|
|
|
|
return cpuStat, cpuID, nil
|
|
}
|
|
|
|
// Parse a softirq line.
|
|
func parseSoftIRQStat(line string) (SoftIRQStat, uint64, error) {
|
|
softIRQStat := SoftIRQStat{}
|
|
var total uint64
|
|
var prefix string
|
|
|
|
_, err := fmt.Sscanf(line, "%s %d %d %d %d %d %d %d %d %d %d %d",
|
|
&prefix, &total,
|
|
&softIRQStat.Hi, &softIRQStat.Timer, &softIRQStat.NetTx, &softIRQStat.NetRx,
|
|
&softIRQStat.Block, &softIRQStat.BlockIoPoll,
|
|
&softIRQStat.Tasklet, &softIRQStat.Sched,
|
|
&softIRQStat.Hrtimer, &softIRQStat.Rcu)
|
|
|
|
if err != nil {
|
|
return SoftIRQStat{}, 0, fmt.Errorf("%w: couldn't parse %q (softirq): %w", ErrFileParse, line, err)
|
|
}
|
|
|
|
return softIRQStat, total, nil
|
|
}
|
|
|
|
// NewStat returns information about current cpu/process statistics.
|
|
// See https://www.kernel.org/doc/Documentation/filesystems/proc.txt
|
|
//
|
|
// Deprecated: Use fs.Stat() instead.
|
|
func NewStat() (Stat, error) {
|
|
fs, err := NewFS(fs.DefaultProcMountPoint)
|
|
if err != nil {
|
|
return Stat{}, err
|
|
}
|
|
return fs.Stat()
|
|
}
|
|
|
|
// NewStat returns information about current cpu/process statistics.
|
|
// See: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
|
|
//
|
|
// Deprecated: Use fs.Stat() instead.
|
|
func (fs FS) NewStat() (Stat, error) {
|
|
return fs.Stat()
|
|
}
|
|
|
|
// Stat returns information about current cpu/process statistics.
|
|
// See: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
|
|
func (fs FS) Stat() (Stat, error) {
|
|
fileName := fs.proc.Path("stat")
|
|
data, err := util.ReadFileNoStat(fileName)
|
|
if err != nil {
|
|
return Stat{}, err
|
|
}
|
|
procStat, err := parseStat(bytes.NewReader(data), fileName)
|
|
if err != nil {
|
|
return Stat{}, err
|
|
}
|
|
return procStat, nil
|
|
}
|
|
|
|
// parseStat parses the metrics from /proc/[pid]/stat.
|
|
func parseStat(r io.Reader, fileName string) (Stat, error) {
|
|
var (
|
|
scanner = bufio.NewScanner(r)
|
|
stat = Stat{
|
|
CPU: make(map[int64]CPUStat),
|
|
}
|
|
err error
|
|
)
|
|
|
|
// Increase default scanner buffer to handle very long `intr` lines.
|
|
buf := make([]byte, 0, 8*1024)
|
|
scanner.Buffer(buf, 1024*1024)
|
|
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
parts := strings.Fields(scanner.Text())
|
|
// require at least <key> <value>
|
|
if len(parts) < 2 {
|
|
continue
|
|
}
|
|
switch {
|
|
case parts[0] == "btime":
|
|
if stat.BootTime, err = strconv.ParseUint(parts[1], 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (btime): %w", ErrFileParse, parts[1], err)
|
|
}
|
|
case parts[0] == "intr":
|
|
if stat.IRQTotal, err = strconv.ParseUint(parts[1], 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (intr): %w", ErrFileParse, parts[1], err)
|
|
}
|
|
numberedIRQs := parts[2:]
|
|
stat.IRQ = make([]uint64, len(numberedIRQs))
|
|
for i, count := range numberedIRQs {
|
|
if stat.IRQ[i], err = strconv.ParseUint(count, 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (intr%d): %w", ErrFileParse, count, i, err)
|
|
}
|
|
}
|
|
case parts[0] == "ctxt":
|
|
if stat.ContextSwitches, err = strconv.ParseUint(parts[1], 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (ctxt): %w", ErrFileParse, parts[1], err)
|
|
}
|
|
case parts[0] == "processes":
|
|
if stat.ProcessCreated, err = strconv.ParseUint(parts[1], 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (processes): %w", ErrFileParse, parts[1], err)
|
|
}
|
|
case parts[0] == "procs_running":
|
|
if stat.ProcessesRunning, err = strconv.ParseUint(parts[1], 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (procs_running): %w", ErrFileParse, parts[1], err)
|
|
}
|
|
case parts[0] == "procs_blocked":
|
|
if stat.ProcessesBlocked, err = strconv.ParseUint(parts[1], 10, 64); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q (procs_blocked): %w", ErrFileParse, parts[1], err)
|
|
}
|
|
case parts[0] == "softirq":
|
|
softIRQStats, total, err := parseSoftIRQStat(line)
|
|
if err != nil {
|
|
return Stat{}, err
|
|
}
|
|
stat.SoftIRQTotal = total
|
|
stat.SoftIRQ = softIRQStats
|
|
case strings.HasPrefix(parts[0], "cpu"):
|
|
cpuStat, cpuID, err := parseCPUStat(line)
|
|
if err != nil {
|
|
return Stat{}, err
|
|
}
|
|
if cpuID == -1 {
|
|
stat.CPUTotal = cpuStat
|
|
} else {
|
|
stat.CPU[cpuID] = cpuStat
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := scanner.Err(); err != nil {
|
|
return Stat{}, fmt.Errorf("%w: couldn't parse %q: %w", ErrFileParse, fileName, err)
|
|
}
|
|
|
|
return stat, nil
|
|
}
|