github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9626 from kiashok/debugToTraceLogs

Browse Source 
Move certain debug  level logs to trace level logs
This commit is contained in:
Samuel Karp
2024-01-11 05:35:21 +00:00
committed by GitHub
parent cf9aec3185 f261969507
commit a2f167e836
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ctr/commands/content/content.go
View File

@@ -424,7 +424,7 @@ var (
ctx = log.WithLogger(ctx, log.G(ctx).WithField("ref", ref)) ctx = log.WithLogger(ctx, log.G(ctx).WithField("ref", ref))
log.G(ctx).Debugf("resolving") log.G(ctx).Tracef("resolving")
name, desc, err := resolver.Resolve(ctx, ref) name, desc, err := resolver.Resolve(ctx, ref)
if err != nil { if err != nil {
return err return err
@@ -434,7 +434,7 @@ var (
return err return err
} }
log.G(ctx).Debugf("fetching") log.G(ctx).Tracef("fetching")
rc, err := fetcher.Fetch(ctx, desc) rc, err := fetcher.Fetch(ctx, desc)
if err != nil { if err != nil {
return err return err
@@ -475,7 +475,7 @@ var (
ctx = log.WithLogger(ctx, log.G(ctx).WithField("ref", ref)) ctx = log.WithLogger(ctx, log.G(ctx).WithField("ref", ref))
log.G(ctx).Debugf("resolving") log.G(ctx).Tracef("resolving")
fetcher, err := resolver.Fetcher(ctx, ref) fetcher, err := resolver.Fetcher(ctx, ref)
if err != nil { if err != nil {
return err return err
@@ -534,7 +534,7 @@ var (
ctx = log.WithLogger(ctx, log.G(ctx).WithField("ref", ref)) ctx = log.WithLogger(ctx, log.G(ctx).WithField("ref", ref))
log.G(ctx).Debugf("resolving") log.G(ctx).Tracef("resolving")
pusher, err := resolver.Pusher(ctx, ref) pusher, err := resolver.Pusher(ctx, ref)
if err != nil { if err != nil {
return err return err

2
gc/scheduler/scheduler.go
View File

@@ -330,7 +330,7 @@ func (s *gcScheduler) run(ctx context.Context) {
gcTime := stats.Elapsed() gcTime := stats.Elapsed()
gcTimeHist.Update(gcTime) gcTimeHist.Update(gcTime)
log.G(ctx).WithField("d", gcTime).Debug("garbage collected") log.G(ctx).WithField("d", gcTime).Trace("garbage collected")
gcTimeSum += gcTime gcTimeSum += gcTime
collections++ collections++
collectionCounter.WithValues("success").Inc() collectionCounter.WithValues("success").Inc()

4
metadata/db.go
View File

@@ -522,7 +522,7 @@ func (m *DB) cleanupSnapshotter(ctx context.Context, name string) (time.Duration
if err != nil { if err != nil {
logger.WithError(err).Warn("snapshot garbage collection failed") logger.WithError(err).Warn("snapshot garbage collection failed")
} else { } else {
logger.WithField("d", d).Debugf("snapshot garbage collected") logger.WithField("d", d).Tracef("snapshot garbage collected")
} }
return d, err return d, err
} }
@@ -537,7 +537,7 @@ func (m *DB) cleanupContent(ctx context.Context) (time.Duration, error) {
if err != nil { if err != nil {
log.G(ctx).WithError(err).Warn("content garbage collection failed") log.G(ctx).WithError(err).Warn("content garbage collection failed")
} else { } else {
log.G(ctx).WithField("d", d).Debugf("content garbage collected") log.G(ctx).WithField("d", d).Tracef("content garbage collected")
} }
return d, err return d, err

18
pkg/cri/instrument/instrumented_service.go
View File

@@ -270,7 +270,7 @@ func (in *instrumentedService) ExecSync(ctx context.Context, r *runtime.ExecSync
if err != nil { if err != nil {
log.G(ctx).WithError(err).Errorf("ExecSync for %q failed", r.GetContainerId()) log.G(ctx).WithError(err).Errorf("ExecSync for %q failed", r.GetContainerId())
} else { } else {
log.G(ctx).Debugf("ExecSync for %q returns with exit code %d", r.GetContainerId(), res.GetExitCode()) log.G(ctx).Tracef("ExecSync for %q returns with exit code %d", r.GetContainerId(), res.GetExitCode())
} }
}() }()
res, err = in.c.ExecSync(ctrdutil.WithNamespace(ctx), r) res, err = in.c.ExecSync(ctrdutil.WithNamespace(ctx), r)
@@ -411,12 +411,12 @@ func (in *instrumentedService) ImageFsInfo(ctx context.Context, r *runtime.Image
} }
ctx, span := tracing.StartSpan(ctx, tracing.Name(criSpanPrefix, "ImageFsInfo")) ctx, span := tracing.StartSpan(ctx, tracing.Name(criSpanPrefix, "ImageFsInfo"))
defer span.End() defer span.End()
log.G(ctx).Debugf("ImageFsInfo") log.G(ctx).Tracef("ImageFsInfo")
defer func() { defer func() {
if err != nil { if err != nil {
log.G(ctx).WithError(err).Error("ImageFsInfo failed") log.G(ctx).WithError(err).Error("ImageFsInfo failed")
} else { } else {
log.G(ctx).Debugf("ImageFsInfo returns filesystem info %+v", res.ImageFilesystems) log.G(ctx).Tracef("ImageFsInfo returns filesystem info %+v", res.ImageFilesystems)
} }
span.SetStatus(err) span.SetStatus(err)
}() }()
@@ -428,12 +428,12 @@ func (in *instrumentedService) PodSandboxStats(ctx context.Context, r *runtime.P
if err := in.checkInitialized(); err != nil { if err := in.checkInitialized(); err != nil {
return nil, err return nil, err
} }
log.G(ctx).Debugf("PodSandboxStats for %q", r.GetPodSandboxId()) log.G(ctx).Tracef("PodSandboxStats for %q", r.GetPodSandboxId())
defer func() { defer func() {
if err != nil { if err != nil {
log.G(ctx).WithError(err).Errorf("PodSandboxStats for %q failed", r.GetPodSandboxId()) log.G(ctx).WithError(err).Errorf("PodSandboxStats for %q failed", r.GetPodSandboxId())
} else { } else {
log.G(ctx).Debugf("PodSandboxStats for %q returns stats %+v", r.GetPodSandboxId(), res.GetStats()) log.G(ctx).Tracef("PodSandboxStats for %q returns stats %+v", r.GetPodSandboxId(), res.GetStats())
} }
}() }()
res, err = in.c.PodSandboxStats(ctrdutil.WithNamespace(ctx), r) res, err = in.c.PodSandboxStats(ctrdutil.WithNamespace(ctx), r)
@@ -444,12 +444,12 @@ func (in *instrumentedService) ContainerStats(ctx context.Context, r *runtime.Co
if err := in.checkInitialized(); err != nil { if err := in.checkInitialized(); err != nil {
return nil, err return nil, err
} }
log.G(ctx).Debugf("ContainerStats for %q", r.GetContainerId()) log.G(ctx).Tracef("ContainerStats for %q", r.GetContainerId())
defer func() { defer func() {
if err != nil { if err != nil {
log.G(ctx).WithError(err).Errorf("ContainerStats for %q failed", r.GetContainerId()) log.G(ctx).WithError(err).Errorf("ContainerStats for %q failed", r.GetContainerId())
} else { } else {
log.G(ctx).Debugf("ContainerStats for %q returns stats %+v", r.GetContainerId(), res.GetStats()) log.G(ctx).Tracef("ContainerStats for %q returns stats %+v", r.GetContainerId(), res.GetStats())
} }
}() }()
res, err = in.c.ContainerStats(ctrdutil.WithNamespace(ctx), r) res, err = in.c.ContainerStats(ctrdutil.WithNamespace(ctx), r)
@@ -596,7 +596,7 @@ func (in *instrumentedService) ListMetricDescriptors(ctx context.Context, r *run
if err != nil { if err != nil {
log.G(ctx).WithError(err).Errorf("ListMetricDescriptors failed, error") log.G(ctx).WithError(err).Errorf("ListMetricDescriptors failed, error")
} else { } else {
log.G(ctx).Debug("ListMetricDescriptors returns successfully") log.G(ctx).Trace("ListMetricDescriptors returns successfully")
} }
}() }()
@@ -613,7 +613,7 @@ func (in *instrumentedService) ListPodSandboxMetrics(ctx context.Context, r *run
if err != nil { if err != nil {
log.G(ctx).WithError(err).Errorf("ListPodSandboxMetrics failed, error") log.G(ctx).WithError(err).Errorf("ListPodSandboxMetrics failed, error")
} else { } else {
log.G(ctx).Debug("ListPodSandboxMetrics returns successfully") log.G(ctx).Trace("ListPodSandboxMetrics returns successfully")
} }
}() }()

2
pkg/cri/io/logger.go
View File

@@ -167,7 +167,7 @@ func redirectLogs(path string, rc io.ReadCloser, w io.Writer, s StreamType, maxL
} }
if err != nil { if err != nil {
if err == io.EOF { if err == io.EOF {
log.L.Debugf("Getting EOF from stream %q while redirecting to log file %q", s, path) log.L.Tracef("Getting EOF from stream %q while redirecting to log file %q", s, path)
} else { } else {
log.L.WithError(err).Errorf("An error occurred when redirecting stream %q to log file %q", s, path) log.L.WithError(err).Errorf("An error occurred when redirecting stream %q to log file %q", s, path)
} }

2
pkg/cri/server/container_execsync.go
View File

@@ -293,7 +293,7 @@ func drainExecSyncIO(ctx context.Context, execProcess containerd.Process, drainE
select { select {
case <-timerCh: case <-timerCh:
case <-attachDone: case <-attachDone:
log.G(ctx).Debugf("Stream pipe for exec process %q done", execProcess.ID()) log.G(ctx).Tracef("Stream pipe for exec process %q done", execProcess.ID())
return nil return nil
} }