Wait for FRR reload to complete, restart if failed

telekom · Oct 10, 2023 · 1833b0d · 1833b0d
1 parent 0d20295
commit 1833b0d
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/pkg/frr/manager.go b/pkg/frr/manager.go
@@ -92,10 +92,22 @@ func (*Manager) ReloadFRR() error {
 	}
 	defer con.Close()
 
-	_, err = con.ReloadUnitContext(context.Background(), frrUnit, "fail", nil)
-	if err != nil {
+	jobChan := make(chan string)
+	if _, err = con.ReloadUnitContext(context.Background(), frrUnit, "fail", jobChan); err != nil {
 		return fmt.Errorf("error reloading %s context: %w", frrUnit, err)
 	}
+	reloadStatus := <-jobChan
+	if reloadStatus == "done" {
+		return nil
+	}
+
+	if _, err = con.RestartUnitContext(context.Background(), frrUnit, "fail", jobChan); err != nil {
+		return fmt.Errorf("error restarting %s context: %w", frrUnit, err)
+	}
+	restartStatus := <-jobChan
+	if restartStatus != "done" {
+		return fmt.Errorf("error restarting unit after failed reload: %s (reload error: %s)", restartStatus, reloadStatus)
+	}
 	return nil
 }