mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 13:27:16 +00:00
Davanum Srinivas
c30f23452c
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>
81 lines
2.3 KiB
Go
81 lines
2.3 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 (
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
|
|
fsi "github.com/prometheus/procfs/internal/fs"
|
|
)
|
|
|
|
// Provide access to /proc/PID/task/TID files, for thread specific values. Since
|
|
// such files have the same structure as /proc/PID/ ones, the data structures
|
|
// and the parsers for the latter may be reused.
|
|
|
|
// AllThreads returns a list of all currently available threads under /proc/PID.
|
|
func AllThreads(pid int) (Procs, error) {
|
|
fs, err := NewFS(DefaultMountPoint)
|
|
if err != nil {
|
|
return Procs{}, err
|
|
}
|
|
return fs.AllThreads(pid)
|
|
}
|
|
|
|
// AllThreads returns a list of all currently available threads for PID.
|
|
func (fs FS) AllThreads(pid int) (Procs, error) {
|
|
taskPath := fs.proc.Path(strconv.Itoa(pid), "task")
|
|
d, err := os.Open(taskPath)
|
|
if err != nil {
|
|
return Procs{}, err
|
|
}
|
|
defer d.Close()
|
|
|
|
names, err := d.Readdirnames(-1)
|
|
if err != nil {
|
|
return Procs{}, fmt.Errorf("%w: could not read %q: %w", ErrFileRead, d.Name(), err)
|
|
}
|
|
|
|
t := Procs{}
|
|
for _, n := range names {
|
|
tid, err := strconv.ParseInt(n, 10, 64)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
t = append(t, Proc{PID: int(tid), fs: FS{fsi.FS(taskPath), fs.isReal}})
|
|
}
|
|
|
|
return t, nil
|
|
}
|
|
|
|
// Thread returns a process for a given PID, TID.
|
|
func (fs FS) Thread(pid, tid int) (Proc, error) {
|
|
taskPath := fs.proc.Path(strconv.Itoa(pid), "task")
|
|
if _, err := os.Stat(taskPath); err != nil {
|
|
return Proc{}, err
|
|
}
|
|
return Proc{PID: tid, fs: FS{fsi.FS(taskPath), fs.isReal}}, nil
|
|
}
|
|
|
|
// Thread returns a process for a given TID of Proc.
|
|
func (proc Proc) Thread(tid int) (Proc, error) {
|
|
tfs := FS{fsi.FS(proc.path("task")), proc.fs.isReal}
|
|
if _, err := os.Stat(tfs.proc.Path(strconv.Itoa(tid))); err != nil {
|
|
return Proc{}, err
|
|
}
|
|
return Proc{PID: tid, fs: tfs}, nil
|
|
}
|