Skip to content

fix: actually handle NonTerminatingCancellation error - #249

Merged
iinuwa merged 1 commit into
linux-credentials:mainfrom
michaelbeaumont:fix/non-terminating-cancel
Nov 2, 2026
Merged

iinuwa merged 1 commit into
linux-credentials:mainfrom
michaelbeaumont:fix/non-terminating-cancel

Conversation

@michaelbeaumont

Copy link
Copy Markdown
Contributor

We get false from is_ceremony_terminating so that branch was never taken.

Atm I'm getting:

Nov 02 21:05:23 - credentialsd[87249]: 2026-11-02T20:05:23.751585Z  WARN credentialsd::credential_service::hybrid: Hybrid error, reissuing QR err=NonTerminatingCancellation
Nov 02 21:05:23 - credentialsd[87249]: 2026-11-02T20:05:23.751922Z  WARN credentialsd::credential_service::hybrid: Hybrid error, reissuing QR err=NonTerminatingCancellation

@michaelbeaumont
michaelbeaumont marked this pull request as ready for review November 2, 2026 21:01

@iinuwa iinuwa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

Left a nit to fix. Also, could you change the commit message to daemon: Fix hybrid cancellation handling and add a CHANGELOG entry?

@michaelbeaumont
michaelbeaumont force-pushed the fix/non-terminating-cancel branch from 8e0a2c4 to fb2402e Compare November 2, 2026 22:02
We get `false` from `is_ceremony_terminating` so that branch was never taken.
@michaelbeaumont
michaelbeaumont force-pushed the fix/non-terminating-cancel branch from fb2402e to e6fd116 Compare November 2, 2026 22:04

@iinuwa iinuwa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@iinuwa
iinuwa merged commit 78a411d into linux-credentials:main Nov 2, 2026
1 check passed
@michaelbeaumont
michaelbeaumont deleted the fix/non-terminating-cancel branch November 2, 2026 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants