Merge pull request #654 from gibmat/delay-provider-refresh

Add option to delay provider refresh when bringing up the network

Author: stgraber

incus-osd/cmd/incus-osd/main.go

@@ -347,10 +347,19 @@ func startup(ctx context.Context, s *state.State, t *tui.TUI) error { //nolint:r
 		return err
 	}
 
+	// Sometimes the system may not be able to immediately check the provider for any updates.
+	// One such example is when Operations Center is installed and the underlying IncusOS system
+	// is registered to it as the provider. We need to wait until the Operations Center
+	// application has started, otherwise any update check will fail.
+	delayInitialUpdateCheck, err := checkDelayInitialUpdate(ctx, s)
+	if err != nil {
+		return err
+	}
+
 	// Perform network configuration.
 	slog.InfoContext(ctx, "Bringing up the network")
 
-	err = systemd.ApplyNetworkConfiguration(ctx, s, s.System.Network.Config, 30*time.Second, s.OS.SuccessfulBoot, providers.Refresh)
+	err = systemd.ApplyNetworkConfiguration(ctx, s, s.System.Network.Config, 30*time.Second, s.OS.SuccessfulBoot, providers.Refresh, delayInitialUpdateCheck)
 	if err != nil {
 		return err
 	}
@@ -395,15 +404,6 @@ func startup(ctx context.Context, s *state.State, t *tui.TUI) error { //nolint:r
 		return err
 	}
 
-	// Sometimes the system may not be able to immediately check the provider for any updates.
-	// One such example is when Operations Center is installed and the underlying IncusOS system
-	// is registered to it as the provider. We need to wait until the Operations Center
-	// application has started, otherwise any update check will fail.
-	delayInitialUpdateCheck, err := checkDelayInitialUpdate(ctx, s)
-	if err != nil {
-		return err
-	}
-
 	if !delayInitialUpdateCheck {
 		// Perform an initial blocking check for updates before proceeding.
 		updateChecker(ctx, s, t, p, true, false)

incus-osd/internal/rest/api_system_network.go

@@ -124,7 +124,7 @@ func (s *Server) apiSystemNetwork(w http.ResponseWriter, r *http.Request) {
 
 		slog.InfoContext(r.Context(), "Applying new network configuration")
 
-		err = systemd.ApplyNetworkConfiguration(r.Context(), s.state, newConfig.Config, 30*time.Second, false, providers.Refresh)
+		err = systemd.ApplyNetworkConfiguration(r.Context(), s.state, newConfig.Config, 30*time.Second, false, providers.Refresh, false)
 		if err != nil {
 			slog.ErrorContext(r.Context(), "Failed to update network configuration: "+err.Error())
 			_ = response.InternalError(err).Render(w)

incus-osd/internal/systemd/networkd.go

@@ -30,7 +30,7 @@ type networkdConfigFile struct {
 }
 
 // ApplyNetworkConfiguration instructs systemd-networkd to apply the supplied network configuration.
-func ApplyNetworkConfiguration(ctx context.Context, s *state.State, networkCfg *api.SystemNetworkConfig, timeout time.Duration, allowPartialConfig bool, refresh func(context.Context, *state.State) error) error {
+func ApplyNetworkConfiguration(ctx context.Context, s *state.State, networkCfg *api.SystemNetworkConfig, timeout time.Duration, allowPartialConfig bool, refresh func(context.Context, *state.State) error, delayRefreshCheck bool) error {
 	// If a timezone is specified, apply it before doing any network configuration.
 	if networkCfg.Time != nil && networkCfg.Time.Timezone != "" {
 		_, err := subprocess.RunCommandContext(ctx, "timedatectl", "set-timezone", networkCfg.Time.Timezone)
@@ -136,12 +136,19 @@ func ApplyNetworkConfiguration(ctx context.Context, s *state.State, networkCfg *
 		return err
 	}
 
-	// Refresh registration.
+	// Refresh registration, delaying by 30 seconds if needed to allow the provider to become available,
+	// such as when IncusOS is self-hosting Operations Center.
 	if refresh != nil {
-		err := refresh(ctx, s)
-		if err != nil {
-			slog.WarnContext(ctx, "Failed to refresh provider registration", "err", err)
-		}
+		go func() {
+			if delayRefreshCheck {
+				time.Sleep(30 * time.Second)
+			}
+
+			err := refresh(ctx, s)
+			if err != nil {
+				slog.WarnContext(ctx, "Failed to refresh provider registration", "err", err)
+			}
+		}()
 	}
 
 	return nil