Skip to content

mobile: removing guarddog and watchdog#30896

Merged
alyssawilk merged 1 commit into
envoyproxy:mainfrom
alyssawilk:strip_guarddog
Nov 28, 2023
Merged

mobile: removing guarddog and watchdog#30896
alyssawilk merged 1 commit into
envoyproxy:mainfrom
alyssawilk:strip_guarddog

Conversation

@alyssawilk
Copy link
Copy Markdown
Contributor

@alyssawilk alyssawilk commented Nov 15, 2023

Risk Level: low (refactor for Envoy)
Testing: n/a
Docs Changes: n/a
Release Notes: n/a

@repokitteh-read-only
Copy link
Copy Markdown

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: #30896 was opened by alyssawilk.

see: more, trace.

@alyssawilk alyssawilk force-pushed the strip_guarddog branch 4 times, most recently from 719955d to 3ea00c5 Compare November 16, 2023 18:52
@alyssawilk
Copy link
Copy Markdown
Contributor Author

/retest

@alyssawilk alyssawilk force-pushed the strip_guarddog branch 2 times, most recently from 6070d23 to 71e619a Compare November 20, 2023 19:23
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk alyssawilk marked this pull request as ready for review November 27, 2023 19:30
Comment thread source/server/server.cc
"main_thread", *dispatcher_);
WatchDogSharedPtr watchdog;
if (main_thread_guard_dog_) {
watchdog = main_thread_guard_dog_->createWatchDog(api_->threadFactory().currentThreadId(),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just for my own understanding, I get why on L823, the watch dog is optional on the listener since EM doesn't use traditional listeners. But I'm not clear on why we want to make the watch dog optional for the main thread?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

android already kills stuck apps - I don't think we need envoy internal handling for this

@alyssawilk alyssawilk merged commit 9c5feb6 into envoyproxy:main Nov 28, 2023
@alyssawilk alyssawilk deleted the strip_guarddog branch March 19, 2024 19:46
RyanTheOptimist pushed a commit that referenced this pull request Feb 27, 2026
…ig (#43522)

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](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>
bmjask pushed a commit to bmjask/envoy that referenced this pull request Mar 14, 2026
…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>
bvandewalle pushed a commit to bvandewalle/envoy that referenced this pull request Mar 17, 2026
…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>
fishcakez pushed a commit to fishcakez/envoy that referenced this pull request Mar 25, 2026
…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>
krinkinmu pushed a commit to grnmeira/envoy that referenced this pull request Apr 20, 2026
…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>
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.

3 participants