Rearrange daemon startup sequence (#214)

[#191] Container remains Stopped after container-management service restart * Rearrange daemon startup sequence * Add dev branch to the workflow Signed-off-by: Kristiyan Gostev <[email protected]>
eclipse-kanto · Nov 22, 2023 · 0dabb8c · 0dabb8c
1 parent 77f94ac
commit 0dabb8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml
@@ -4,10 +4,12 @@ on:
   pull_request:
     branches:
       - main
+      - dev-m5
     paths-ignore:
       - "**/*.md"
   push:
     branches:
+      - dev-m5
       - main
     paths-ignore:
       - "**/*.md"

diff --git a/containerm/daemon/daemon_internal.go b/containerm/daemon/daemon_internal.go
@@ -27,6 +27,11 @@ import (
 func (d *daemon) start() error {
 	log.Debug("starting daemon instance")
 
+	if err := d.startGrpcServers(); err != nil {
+		log.ErrorErr(err, "could not start gRPC servers")
+		return err
+	}
+
 	if err := d.loadContainerManagersStoredInfo(); err != nil {
 		log.ErrorErr(err, "could not load and restore persistent data for the Container Manager Services")
 		return err
@@ -54,7 +59,7 @@ func (d *daemon) start() error {
 		log.Debug("Containers Update Agent is not enabled.")
 	}
 
-	return d.startGrpcServers()
+	return nil
 }
 
 func (d *daemon) stop() {