Merge pull request #4088 from tonistiigi/v0.12.1-picks

[v0.12.1] cherry-picks
moby · Aug 2, 2023 · bb857a0 · bb857a0
2 parents 2556ec9 + 5d53119
commit bb857a0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go
@@ -663,7 +663,8 @@ func newController(c *cli.Context, cfg *config.Config) (*control.Controller, err
 	if tc != nil {
 		traceSocket = traceSocketPath(cfg.Root)
 		if err := runTraceController(traceSocket, tc); err != nil {
-			return nil, err
+			logrus.Warnf("failed set up otel-grpc controller: %v", err)
+			traceSocket = ""
 		}
 	}
 

diff --git a/executor/resources/monitor.go b/executor/resources/monitor.go
@@ -56,6 +56,10 @@ func (r *cgroupRecord) Start() {
 	r.closeSampler = s.Close
 }
 
+func (r *cgroupRecord) Close() {
+	r.close()
+}
+
 func (r *cgroupRecord) CloseAsync(next func(context.Context) error) error {
 	go func() {
 		r.close()
@@ -160,6 +164,9 @@ func (r *nopRecord) Samples() (*types.Samples, error) {
 	return nil, nil
 }
 
+func (r *nopRecord) Close() {
+}
+
 func (r *nopRecord) CloseAsync(next func(context.Context) error) error {
 	return next(context.TODO())
 }

diff --git a/executor/resources/types/types.go b/executor/resources/types/types.go
@@ -9,6 +9,7 @@ import (
 
 type Recorder interface {
 	Start()
+	Close()
 	CloseAsync(func(context.Context) error) error
 	Wait() error
 	Samples() (*Samples, error)

diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go
@@ -335,6 +335,9 @@ func (w *runcExecutor) Run(ctx context.Context, id string, root executor.Mount,
 
 	err = exitError(ctx, err)
 	if err != nil {
+		if rec != nil {
+			rec.Close()
+		}
 		releaseContainer(context.TODO())
 		return nil, err
 	}