diff --git a/conf/defaults.yaml b/conf/defaults.yaml index 939d79b1e5c..219aff24dbc 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -82,8 +82,7 @@ nimbus.thrift.tls.client.auth.required: true topology.worker.nimbus.thrift.client.use.tls: false nimbus.childopts: "-Xmx1024m" nimbus.task.timeout.secs: 30 -# Deprecated since 3.1.0 and unused; supervisor liveness is tracked via ephemeral ZooKeeper nodes, so Nimbus does not time supervisors out. Scheduled for removal in a future release. -nimbus.supervisor.timeout.secs: 60 + nimbus.monitor.freq.secs: 10 nimbus.cleanup.inbox.freq.secs: 600 nimbus.inbox.jar.expiration.secs: 3600 diff --git a/storm-server/src/main/java/org/apache/storm/DaemonConfig.java b/storm-server/src/main/java/org/apache/storm/DaemonConfig.java index e535baf1baa..37ac619fb93 100644 --- a/storm-server/src/main/java/org/apache/storm/DaemonConfig.java +++ b/storm-server/src/main/java/org/apache/storm/DaemonConfig.java @@ -279,19 +279,7 @@ public class DaemonConfig implements Validated { @IsInteger public static final String NIMBUS_INBOX_JAR_EXPIRATION_SECS = "nimbus.inbox.jar.expiration.secs"; - /** - * How long before a supervisor can go without heartbeating before nimbus considers it dead and stops assigning new work to it. - * - * @deprecated Unused. Supervisor liveness is tracked via an ephemeral ZooKeeper node (see - * {@code StormClusterState#supervisorHeartbeat}); when a supervisor dies its ZooKeeper session - * expires and the node disappears, so Nimbus detects the loss directly rather than by timing out - * heartbeats. No code reads this value. It is scheduled for removal; retained for now only for - * backward compatibility. - */ - @Deprecated(forRemoval = true, since = "3.1.0") - @IsInteger - @IsPositiveNumber - public static final String NIMBUS_SUPERVISOR_TIMEOUT_SECS = "nimbus.supervisor.timeout.secs"; + /** * A special timeout used when a task is initially launched. During launch, this is the timeout used until the first heartbeat,