Merge pull request #22985 from lambinoo/fix-hang-boot-podman

Fix hang boot podman
containers · Jul 9, 2024 · 6221e63 · 6221e63 · packit-as-a-service · Jul 9, 2024
2 parents abf0350 + c819c7a
commit 6221e63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/libpod/runtime.go b/libpod/runtime.go
@@ -613,6 +613,11 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 	// refresh runs.
 	runtime.valid = true
 
+	// Setup the worker channel early to start accepting jobs from refresh,
+	// but do not start to execute the jobs right away. The runtime is not
+	// ready at this point.
+	runtime.setupWorkerQueue()
+
 	// If we need to refresh the state, do it now - things are guaranteed to
 	// be set up by now.
 	if doRefresh {

diff --git a/libpod/runtime_worker.go b/libpod/runtime_worker.go
@@ -2,8 +2,11 @@
 
 package libpod
 
-func (r *Runtime) startWorker() {
+func (r *Runtime) setupWorkerQueue() {
 	r.workerChannel = make(chan func(), 10)
+}
+
+func (r *Runtime) startWorker() {
 	go func() {
 		for w := range r.workerChannel {
 			w()