watch-dog: fix worker-thread watch-dog threads using main-thread config by adisuissa · Pull Request #43522 · envoyproxy/envoy

adisuissa · 2026-02-17T16:22:00Z

Commit Message: watch-dog: fix worker-thread watch-dog threads using main-thread config
Additional Description:
In PR #30896 the watchdog instantiation was refactored, and a bug was introduced where both the main thread's and the worker threads' watch-dogs are configured using the main-thread's config.
This PR fixes the issue by passing the correct configuration.

Risk Level: Medium - may change the behavior of systems where worker-threads' watch-dogs will trigger.

Testing: Added unit and integration tests.
Docs Changes: N/A
Release Notes: Added.
Platform Specific Features: N/A
Runtime guard: Added envoy.restart_features.worker_threads_watchdog_fix that can temporarily disable the fix.

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

repokitteh-read-only · 2026-02-17T16:22:06Z

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #43522 was opened by adisuissa.

see: more, trace.

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

…read_fix Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

…read_fix Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

repokitteh-read-only · 2026-02-18T19:31:04Z

CC @envoyproxy/runtime-guard-changes: FYI only for changes made to (source/common/runtime/runtime_features.cc).

🐱

Caused by: #43522 was ready_for_review by adisuissa.

see: more, trace.

adisuissa · 2026-02-20T18:45:38Z

/assign-from @envoyproxy/senior-maintainers

repokitteh-read-only · 2026-02-20T18:45:45Z

@envoyproxy/senior-maintainers assignee is @RyanTheOptimist

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T18:46:16Z

/assing-from @envoyproxy/envoy-maintainers

adisuissa · 2026-02-20T18:48:46Z

/assign-from @envoyproxy/envoy-maintainers

repokitteh-read-only · 2026-02-20T18:48:52Z

@envoyproxy/envoy-maintainers assignee is @RyanTheOptimist

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T18:49:11Z

/assign-from @envoyproxy/envoy-maintainers

repokitteh-read-only · 2026-02-20T18:49:18Z

@envoyproxy/envoy-maintainers assignee is @jwendell

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T18:49:31Z

/assign-from @envoyproxy/envoy-maintainers

repokitteh-read-only · 2026-02-20T18:49:37Z

@envoyproxy/envoy-maintainers assignee is @yanavlasov

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T18:50:07Z

Seems really challenging to get a non-Googler c++ maintainer these days.
/assign-from @envoyproxy/envoy-maintainers

repokitteh-read-only · 2026-02-20T18:50:14Z

@envoyproxy/envoy-maintainers assignee is @adisuissa

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T18:50:25Z

/assign-from @envoyproxy/envoy-maintainers

repokitteh-read-only · 2026-02-20T18:50:31Z

@envoyproxy/envoy-maintainers assignee is @mathetake

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T19:02:06Z

Core code changes require a senior-maintainer review.
/assign-from @envoyproxy/senior-maintainers

repokitteh-read-only · 2026-02-20T19:02:13Z

@envoyproxy/senior-maintainers assignee is @phlax

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T19:02:27Z

/assign-from @envoyproxy/senior-maintainers

repokitteh-read-only · 2026-02-20T19:02:34Z

@envoyproxy/senior-maintainers assignee is @phlax

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

adisuissa · 2026-02-20T19:02:46Z

/assign-from @envoyproxy/senior-maintainers

repokitteh-read-only · 2026-02-20T19:02:53Z

@envoyproxy/senior-maintainers assignee is @yanavlasov

🐱

Caused by: a #43522 (comment) was created by @adisuissa.

see: more, trace.

KBaichoo

Wow, nice find

RyanTheOptimist

Nice!

…ig (envoyproxy#43522) Commit Message: watch-dog: fix worker-thread watch-dog threads using main-thread config Additional Description: In PR envoyproxy#30896 the watchdog instantiation was refactored, and a bug was introduced where both the main thread's and the worker threads' watch-dogs are configured [using the main-thread's config](https://github.com/envoyproxy/envoy/pull/30896/changes#diff-a39ff317d26d008f20bca53f5e3f4e171d169a5702f82409ca941bddaac46064L781-L784). This PR fixes the issue by passing the correct configuration. Risk Level: Medium - may change the behavior of systems where worker-threads' watch-dogs will trigger. Testing: Added unit and integration tests. Docs Changes: N/A Release Notes: Added. Platform Specific Features: N/A Runtime guard: Added `envoy.restart_features.worker_threads_watchdog_fix` that can temporarily disable the fix. --------- Signed-off-by: Adi Suissa-Peleg <adip@google.com> Signed-off-by: bjmask <11672696+bjmask@users.noreply.github.com>

…ig (envoyproxy#43522) Commit Message: watch-dog: fix worker-thread watch-dog threads using main-thread config Additional Description: In PR envoyproxy#30896 the watchdog instantiation was refactored, and a bug was introduced where both the main thread's and the worker threads' watch-dogs are configured [using the main-thread's config](https://github.com/envoyproxy/envoy/pull/30896/changes#diff-a39ff317d26d008f20bca53f5e3f4e171d169a5702f82409ca941bddaac46064L781-L784). This PR fixes the issue by passing the correct configuration. Risk Level: Medium - may change the behavior of systems where worker-threads' watch-dogs will trigger. Testing: Added unit and integration tests. Docs Changes: N/A Release Notes: Added. Platform Specific Features: N/A Runtime guard: Added `envoy.restart_features.worker_threads_watchdog_fix` that can temporarily disable the fix. --------- Signed-off-by: Adi Suissa-Peleg <adip@google.com>

watch-dog: fix worker-thread watch-dog threads using main-thread config

6ea8f98

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

adisuissa added 6 commits February 17, 2026 16:38

fixing envoy-mobile

9d6181c

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

EM format

832d5ce

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Merge remote-tracking branch 'upstream/main' into guard_dog_worker_th…

ed5edb6

…read_fix Signed-off-by: Adi Suissa-Peleg <adip@google.com>

fix timing issue

4802923

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Merge remote-tracking branch 'upstream/main' into guard_dog_worker_th…

e88791d

…read_fix Signed-off-by: Adi Suissa-Peleg <adip@google.com>

spellcheck

2fdde5c

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

adisuissa marked this pull request as ready for review February 18, 2026 19:30

adisuissa requested review from RyanTheOptimist, abeyad and danzh2010 as code owners February 18, 2026 19:30

repokitteh-read-only Bot assigned RyanTheOptimist Feb 20, 2026

adisuissa unassigned RyanTheOptimist Feb 20, 2026

repokitteh-read-only Bot assigned jwendell Feb 20, 2026

adisuissa unassigned jwendell Feb 20, 2026

repokitteh-read-only Bot assigned yanavlasov Feb 20, 2026

adisuissa unassigned yanavlasov Feb 20, 2026

repokitteh-read-only Bot assigned adisuissa Feb 20, 2026

adisuissa removed their assignment Feb 20, 2026

repokitteh-read-only Bot assigned mathetake Feb 20, 2026

mathetake approved these changes Feb 20, 2026

View reviewed changes

repokitteh-read-only Bot assigned phlax Feb 20, 2026

adisuissa unassigned phlax Feb 20, 2026

repokitteh-read-only Bot assigned phlax Feb 20, 2026

adisuissa unassigned phlax Feb 20, 2026

repokitteh-read-only Bot assigned yanavlasov Feb 20, 2026

KBaichoo approved these changes Feb 20, 2026

View reviewed changes

RyanTheOptimist approved these changes Feb 27, 2026

View reviewed changes

RyanTheOptimist merged commit be898bb into envoyproxy:main Feb 27, 2026
28 checks passed

Conversation

adisuissa commented Feb 17, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 17, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 18, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

adisuissa commented Feb 20, 2026

Uh oh!

repokitteh-read-only Bot commented Feb 20, 2026

Uh oh!

KBaichoo left a comment

Choose a reason for hiding this comment

Uh oh!

RyanTheOptimist left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants