Files
Ayush RanjanandgVisor bot aa4ef9229a Fix runsc log and profile file handling.
There were several issues with how runsc log and profile files were generated:
- Variables like "%ID" in flag-specified file paths were substituted by the
  runsc shim in `pkg/shim/v1/runsccmd/utils.go:replaceID()`. Consequently, runsc
  commands that did *not* invoke the shim missed this logic. Notably, Docker
  invokes runsc via `runc shim`, so Docker use cases were missing this
  feature.
- Variable support across flags was inconsistent. For example, the --debug-log
  flag supported variables like ID, TIMESTAMP, COMMAND, and TEST, while
  --profile-cpu supported ID, TIMESTAMP, YYYY, MM, etc.
- "%ID%" was intended to be substituted with the sandbox ID, but the shim was
  incorrectly substituting it with the container ID.
- Variables specified via flag annotations were not substituted because the
  shim did not process flag annotations.
- `specutils.ReadSpec() => ReadSpecFromFile() => fixSpec()` had the side effect
  of modifying the `Config` object itself with annotation-based flags, rather
  than just fixing the spec.
- Flag annotations were applied to Config for only 6 runsc commands (via
  `fixSpec()`): boot, gofer, create, restore, run, and start. Other commands
  did not see flags set via annotations.
- When using flag annotations to generate debug logs, only boot and gofer logs
  were generated. This is because the debug file was created by the runsc CLI,
  but flag annotations were processed later by the sub-command implementation.
  Only `boot` and `gofer` had the correct configuration because `runsc create`
  had already fixed its config by the time it invoked them.
- The parent directories of the configured file paths is created via
  os.MkdirAll() only for a subset of the flags. This is inconsistent.

This change fixes all above-mentioned issues:
- Moves all variable substitution logic from the shim to the runsc CLI.
- Centralizes the logic for opening and formatting paths for log and profile
  files within `specutils`.
- Introduces `specutils.LogFileOpts` to standardize variable substitution in
  log and profile paths.
- Refactors profile file handling to use `DonateProfileFDs`, leveraging
  `LogFileOpts` and `DonateLogFile` for consistent path substitution.
- Extracts `specutils.FixConfig()` from `specutils.fixSpec()` to only call it
  when necessary. This prevents side effects; `fixSpec()` now only fixes the OCI
  spec, and `FixConfig()` only fixes `config.Config`. The config is now fixed
  uniformly for all commands via the runsc CLI.
- Standarizes the variables supported across all file path flags:
  - `%TIMESTAMP%`: Replaced with the start-up time of the command with format
    `<yyyymmdd-hhmmss.uuuuuu>`.
  - `%COMMAND%`: Replaced with the command name.
  - `%TEST%`: Replaced with the value of the environment variable named
    `-TESTONLY-test-name-env`. The value is fetched from container spec.
  - `%ID%`: Replaced with the sandbox ID.
  - `%CID%`: Replaced with the container ID.
- Open all log files consistently with mode 0644 and create intermediate
  directories with mode 0755.

To facilitate these improvements, the `subcommands.Command` interface has been
extended via `util.SubCommand` to include `FetchSpec(conf, flatSet)`.
- All runsc sub-commands must implement this interface.
- `FetchSpec` extracts the container ID from the command line arguments and
  ensures the OCI spec is loaded (either from the bundle or container) for
  configuration processing.
- Caching is added to all sub-commands to reuse the work done by `FetchSpec`
  during `Execute()`.

Note: `runsc tar` and `runsc trace` implement `FetchSpec` as a no-op. These
commands have nested sub-commands that make spec pre-fetching complex. Variable
substitution is currently not supported for their file path flags.
PiperOrigin-RevId: 877758843
2026-03-02 22:59:55 -08:00

132 lines
4.3 KiB
Go

// Copyright 2019 The gVisor 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 util groups a bunch of common helper functions used by commands.
package util
import (
"encoding/json"
"fmt"
"io"
"os"
"time"
"github.com/google/subcommands"
specs "github.com/opencontainers/runtime-spec/specs-go"
"gvisor.dev/gvisor/pkg/log"
"gvisor.dev/gvisor/runsc/config"
"gvisor.dev/gvisor/runsc/flag"
)
// SubCommand is an extension of subcommands.Command that allows runsc CLI to
// fetch the OCI spec for the container that is targeted by the command.
type SubCommand interface {
subcommands.Command
// FetchSpec returns the container ID, OCI spec associated with the command.
// If the command does not target a container, it should return "", nil, nil.
FetchSpec(conf *config.Config, f *flag.FlagSet) (string, *specs.Spec, error)
}
// InternalCommand is an interface for internal commands.
//
// Internal commands are invoked by runsc itself. All of them use the
// --debug-log-fd and --log-fd mechanism. They all return "", nil, nil from
// SubCommand.FetchSpec because they don't need to have the spec as debug log
// file and log files are already created for them. This avoids having to
// re-load the Container struct from local filesystem, read all annotations and
// fix the config via specutils.FixConfig(). They already get the fixed config
// values as conf.ToFlags() is used to create their flags. They don't operate
// on a container so don't even take a container ID as an argument. Some of
// them (like boot and gofer) don't even have access to the host filesystem so
// they can't really open any host files.
type InternalCommand interface {
InternalFetchSpec() (string, *specs.Spec, error)
}
// InternalSubCommand is a struct that implements FetchSpec for internal
// commands. It should be embedded in internal commands.
type InternalSubCommand struct{}
// FetchSpec implements SubCommand.FetchSpec.
func (i *InternalSubCommand) FetchSpec(*config.Config, *flag.FlagSet) (string, *specs.Spec, error) {
return i.InternalFetchSpec()
}
// InternalFetchSpec implements InternalCommand.InternalFetchSpec.
func (*InternalSubCommand) InternalFetchSpec() (string, *specs.Spec, error) {
return "", nil, nil
}
// ErrorLogger is where error messages should be written to. These messages are
// consumed by containerd and show up to users of command line tools,
// like docker/kubectl.
var ErrorLogger io.Writer
type jsonError struct {
Msg string `json:"msg"`
Level string `json:"level"`
Time time.Time `json:"time"`
}
// Writer writes to log and stdout.
type Writer struct{}
// Write implements io.Writer.
func (i *Writer) Write(data []byte) (n int, err error) {
log.Infof("%s", data)
return os.Stdout.Write(data)
}
// Infof writes message to log and stdout.
func Infof(format string, args ...any) {
log.Infof(format, args...)
fmt.Printf(format+"\n", args...)
}
// Errorf logs error to containerd log (--log), to stderr, and debug logs. It
// returns subcommands.ExitFailure for convenience with subcommand.Execute()
// methods:
//
// return Errorf("Danger! Danger!")
func Errorf(format string, args ...any) subcommands.ExitStatus {
// If runsc is being invoked by docker or cri-o, then we might not have
// access to stderr, so we log a serious-looking warning in addition to
// writing to stderr.
log.Warningf("FATAL ERROR: "+format, args...)
fmt.Fprintf(os.Stderr, format+"\n", args...)
if ErrorLogger != nil {
j := jsonError{
Msg: fmt.Sprintf(format, args...),
Level: "error",
Time: time.Now(),
}
b, err := json.Marshal(j)
if err != nil {
panic(err)
}
_, _ = ErrorLogger.Write(b)
}
return subcommands.ExitFailure
}
// Fatalf logs the same way as Errorf() does, plus *exits* the process.
func Fatalf(format string, args ...any) {
Errorf(format, args...)
// Return an error that is unlikely to be used by the application.
os.Exit(128)
}