Skip to content

[DO NOT MERGE] fix: ensure proper handling of termination signals and metadata updates #1517

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[DO NOT MERGE] fix: ensure proper handling of termination signals and metadata updates #1517

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ad13bf
fix: ensure proper handling of termination signals and metadata updates
antontroshin Jul 4, 2025
ca92b34
Merge branch 'master' into fix-ctrlc-not-stopping
antontroshin Jul 31, 2025
12d116a
Merge branch 'master' into fix-ctrlc-not-stopping
yaron2 Aug 13, 2025
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
55 changes: 33 additions & 22 deletions cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ dapr run --run-file /path/to/directory -k
} else {
print.SuccessStatusEvent(os.Stdout, "Exited Dapr successfully")
}
daprRunning <- false
sigCh <- os.Interrupt
}()

Expand Down Expand Up @@ -330,7 +331,7 @@ dapr run --run-file /path/to/directory -k
daprRunning <- true
}()

<-daprRunning
daprRunStatus := <-daprRunning

go func() {
if output.AppCMD == nil {
Expand Down Expand Up @@ -382,6 +383,7 @@ dapr run --run-file /path/to/directory -k
} else {
print.SuccessStatusEvent(os.Stdout, "Exited App successfully")
}
appRunning <- false
sigCh <- os.Interrupt
}()

Expand All @@ -400,32 +402,41 @@ dapr run --run-file /path/to/directory -k
os.Exit(1)
}

// Metadata API is only available if app has started listening to port, so wait for app to start before calling metadata API.
err = metadata.Put(output.DaprHTTPPort, "cliPID", strconv.Itoa(os.Getpid()), output.AppID, unixDomainSocket)
if err != nil {
print.WarningStatusEvent(os.Stdout, "Could not update sidecar metadata for cliPID: %s", err.Error())
}

if output.AppCMD != nil {
if output.AppCMD.Process != nil {
print.InfoStatusEvent(os.Stdout, fmt.Sprintf("Updating metadata for appPID: %d", output.AppCMD.Process.Pid))
err = metadata.Put(output.DaprHTTPPort, "appPID", strconv.Itoa(output.AppCMD.Process.Pid), output.AppID, unixDomainSocket)
if err != nil {
print.WarningStatusEvent(os.Stdout, "Could not update sidecar metadata for appPID: %s", err.Error())
}
// Call metadata endpoint and update the dapr cli PID, app PID and app command in separate goroutine to avoid blocking termination signals.
// For example, when "dapr run" initialization fails with fatal errors on component init errors.
// See issue: https://github.com/dapr/cli/issues/1338
go func() {
for !daprRunStatus || !appRunStatus {
return
}

appCommand := strings.Join(args, " ")
print.InfoStatusEvent(os.Stdout, "Updating metadata for app command: "+appCommand)
err = metadata.Put(output.DaprHTTPPort, "appCommand", appCommand, output.AppID, unixDomainSocket)
// Metadata API is only available if app has started listening to port, so wait for app to start before calling metadata API.
err = metadata.Put(output.DaprHTTPPort, "cliPID", strconv.Itoa(os.Getpid()), output.AppID, unixDomainSocket)
if err != nil {
print.WarningStatusEvent(os.Stdout, "Could not update sidecar metadata for appCommand: %s", err.Error())
print.WarningStatusEvent(os.Stdout, "Could not update sidecar metadata for cliPID: %s", err.Error())
}

if output.AppCMD != nil {
if output.AppCMD.Process != nil {
print.InfoStatusEvent(os.Stdout, fmt.Sprintf("Updating metadata for appPID: %d", output.AppCMD.Process.Pid))
err = metadata.Put(output.DaprHTTPPort, "appPID", strconv.Itoa(output.AppCMD.Process.Pid), output.AppID, unixDomainSocket)
if err != nil {
print.WarningStatusEvent(os.Stdout, "Could not update sidecar metadata for appPID: %s", err.Error())
}
}

appCommand := strings.Join(args, " ")
print.InfoStatusEvent(os.Stdout, "Updating metadata for app command: "+appCommand)
err = metadata.Put(output.DaprHTTPPort, "appCommand", appCommand, output.AppID, unixDomainSocket)
if err != nil {
print.WarningStatusEvent(os.Stdout, "Could not update sidecar metadata for appCommand: %s", err.Error())
} else {
print.SuccessStatusEvent(os.Stdout, "You're up and running! Both Dapr and your app logs will appear here.\n")
}
} else {
print.SuccessStatusEvent(os.Stdout, "You're up and running! Both Dapr and your app logs will appear here.\n")
print.SuccessStatusEvent(os.Stdout, "You're up and running! Dapr logs will appear here.\n")
}
} else {
print.SuccessStatusEvent(os.Stdout, "You're up and running! Dapr logs will appear here.\n")
}
}()

<-sigCh
print.InfoStatusEvent(os.Stdout, "\nterminated signal received: shutting down")
Expand Down
Loading