8000 [1.15] daemon: Cleanup after a failed start by antonipp · Pull Request #36801 · cilium/cilium · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[1.15] daemon: Cleanup after a failed start #36801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[1.15] daemon: Cleanup after a failed start #36801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e510718
daemon: bubble up error from startDaemon instead of fataling
joamaki Jan 25, 2024
fe76061
daemon: Cleanup after a failed start
joamaki May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions daemon/cmd/daemon_main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,22 +1713,26 @@ func newDaemonPromise(params daemonParams) promise.Promise[*Daemon] {
OnStart: func(cell.HookContext) error {
d, restoredEndpoints, err := newDaemon(daemonCtx, cleaner, &params)
if err != nil {
cancelDaemonCtx()
cleaner.Clean()
return fmt.Errorf("daemon creation failed: %w", err)
}
daemon = d

if !option.Config.DryMode {
startDaemon(daemon, restoredEndpoints, cleaner, params)
if err := startDaemon(daemon, restoredEndpoints, cleaner, params); err != nil {
daemonResolver.Reject(err)
cancelDaemonCtx()
cleaner.Clean()
return err
}
}
daemonResolver.Resolve(daemon)

return nil
},
OnStop: func(cell.HookContext) error {
cancelDaemonCtx()
if daemon.statusCollector != nil {
daemon.statusCollector.Close()
}
cleaner.Clean()
wg.Wait()
return nil
Expand All @@ -1738,14 +1742,14 @@ func newDaemonPromise(params daemonParams) promise.Promise[*Daemon] {
}

// startDaemon starts the old unmodular part of the cilium-agent.
func startDaemon(d *Daemon, restoredEndpoints *endpointRestoreState, cleaner *daemonCleanup, params daemonParams) {
func startDaemon(d *Daemon, restoredEndpoints *endpointRestoreState, cleaner *daemonCleanup, params daemonParams) error {
log.Info("Initializing daemon")

// This validation needs to be done outside of the agent until
// datapath.NodeAddressing is used consistently across the code base.
log.Info("Validating configured node address ranges")
if err := node.ValidatePostInit(); err != nil {
log.Fatalf("postinit failed: %s", err)
return fmt.Errorf("postinit failed: %w", err)
}

bootstrapStats.enableConntrack.Start()
Expand Down Expand Up @@ -1774,11 +1778,11 @@ func startDaemon(d *Daemon, restoredEndpoints *endpointRestoreState, cleaner *da
d.endpointManager.InitHostEndpointLabels(d.ctx)
} else {
log.Info("Creating host endpoint")
if err := d.endpointManager.AddHostEndpoint(
err := d.endpointManager.AddHostEndpoint(
d.ctx, d, d, d.ipcache, d.l7Proxy, d.identityAllocator,
"Create host endpoint", nodeTypes.GetName(),
); err != nil {
log.Fatalf("unable to create host endpoint: %s", err)
"Create host endpoint", nodeTypes.GetName())
if err != nil {
return fmt.Errorf("unable to create host endpoint: %w", err)
}
}

Expand All @@ -1791,11 +1795,11 @@ func startDaemon(d *Daemon, restoredEndpoints *endpointRestoreState, cleaner *da
log.Warn("Ingress IPs are not available, skipping creation of the Ingress Endpoint: Policy enforcement on Cilium Ingress will not work as expected.")
} else {
log.Info("Creating ingress endpoint")
if err := d.endpointManager.AddIngressEndpoint(
err := d.endpointManager.AddIngressEndpoint(
d.ctx, d, d, d.ipcache, d.l7Proxy, d.identityAllocator,
"Create ingress endpoint",
); err != nil {
log.Fatalf("unable to create ingress endpoint: %s", err)
"Create ingress endpoint")
if err != nil {
return fmt.Errorf("unable to create ingress endpoint: %w", err)
}
}
}
Expand All @@ -1804,7 +1808,7 @@ func startDaemon(d *Daemon, restoredEndpoints *endpointRestoreState, cleaner *da
if option.Config.EnableIPMasqAgent {
ipmasqAgent, err := ipmasq.NewIPMasqAgent(option.Config.IPMasqAgentConfigPath)
if err != nil {
log.Fatalf("failed to create ipmasq agent: %s", err)
return fmt.Errorf("failed to create ipmasq agent: %w", err)
}
ipmasqAgent.Start()
}
Expand Down Expand Up @@ -1906,6 +1910,8 @@ func startDaemon(d *Daemon, restoredEndpoints *endpointRestoreState, cleaner *da
if err != nil {
log.WithError(err).Error("Unable to store Viper's configuration")
}

return nil
}

func newRestorerPromise(lc cell.Lifecycle, daemonPromise promise.Promise[*Daemon]) promise.Promise[endpointstate.Restorer] {
Expand Down
2 changes: 2 additions & 0 deletions daemon/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,5 +1128,7 @@ func (d *Daemon) startStatusCollector(cleaner *daemonCleanup) {
}).Error("KVStore state not OK")

}

d.statusCollector.Close()
})
}
Loading
0