diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-25 21:10:29 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-10-25 21:10:29 +0200 |
| commit | 008da5cd644abef8523232ccd9f89d2ad9c37df7 (patch) | |
| tree | 578eee70c991fc4c7144d82ebe3ce648342b927a /container-core | |
| parent | abda874e57a7e0ca1d2bfd458f28392378cf1519 (diff) | |
Really deactivate watchdog for real
Diffstat (limited to 'container-core')
3 files changed, 5 insertions, 10 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java b/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java index 97b8304babc..42f9294fbf9 100644 --- a/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java +++ b/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java @@ -14,22 +14,15 @@ import com.yahoo.container.core.DiagnosticsConfig; * @deprecated this is not in use and will be removed in the next major release */ @Deprecated +// TODO: Remove on Vespa 7 public class FreezeDetector extends AbstractComponent { private final Timer timeoutWatchdog; private final Watchdog watchdog; public FreezeDetector(DiagnosticsConfig diagnosticsConfig) { - if (diagnosticsConfig.disabled()) { - timeoutWatchdog = null; - watchdog = null; - } else { - timeoutWatchdog = new Timer("TimeoutWatchdog", true); - watchdog = new Watchdog(diagnosticsConfig.timeoutfraction(), - diagnosticsConfig.minimumqps(), - diagnosticsConfig.shutdown()); - timeoutWatchdog.schedule(watchdog, 10L * 1000L, 100L); - } + timeoutWatchdog = null; + watchdog = null; } public void register(ThreadLocalDirectory<TimeoutRate, Boolean> timeouts) { diff --git a/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java b/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java index 79e52b49183..e8c4a67967c 100644 --- a/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java +++ b/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java @@ -7,6 +7,7 @@ package com.yahoo.container.protect; * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @deprecated this is not in use and will be removed in the next major release */ +// TODO: Remove on Vespa 7 @Deprecated public final class TimeoutRate { diff --git a/container-core/src/main/java/com/yahoo/container/protect/Watchdog.java b/container-core/src/main/java/com/yahoo/container/protect/Watchdog.java index b86da523a0a..0857bc4ebd2 100644 --- a/container-core/src/main/java/com/yahoo/container/protect/Watchdog.java +++ b/container-core/src/main/java/com/yahoo/container/protect/Watchdog.java @@ -18,6 +18,7 @@ import com.yahoo.protect.Process; * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @deprecated this is not in use and will be removed in the next major release */ +// TODO: Remove on Vespa 7 @Deprecated class Watchdog extends TimerTask { |