From 923fb872586633fd7bfdd6a9e44ab1c34bbe44e3 Mon Sep 17 00:00:00 2001 From: Rui Abreu Date: Wed, 11 Nov 2026 01:17:01 +0000 Subject: [PATCH] Fix the since value of the Pacemaker deprecations: 3.2.0, not 3.1.0 Pacemaker was first marked @Deprecated in #9084, after 3.1.0 had been released, so the 21 annotations from #9084 and #9171 should say since = "3.2.0". Co-Authored-By: Claude Sonnet 5.5 --- storm-client/src/jvm/org/apache/storm/Config.java | 10 +++++----- .../apache/storm/cluster/PaceMakerStateStorage.java | 2 +- .../storm/cluster/PaceMakerStateStorageFactory.java | 2 +- .../org/apache/storm/pacemaker/PacemakerClient.java | 2 +- .../apache/storm/pacemaker/PacemakerClientHandler.java | 2 +- .../apache/storm/pacemaker/PacemakerClientPool.java | 2 +- .../storm/pacemaker/PacemakerConnectionException.java | 2 +- .../apache/storm/pacemaker/codec/ThriftDecoder.java | 2 +- .../apache/storm/pacemaker/codec/ThriftEncoder.java | 2 +- .../storm/pacemaker/codec/ThriftNettyClientCodec.java | 2 +- .../src/main/java/org/apache/storm/DaemonConfig.java | 4 ++-- .../apache/storm/pacemaker/IServerMessageHandler.java | 2 +- .../java/org/apache/storm/pacemaker/Pacemaker.java | 2 +- .../org/apache/storm/pacemaker/PacemakerServer.java | 2 +- .../storm/pacemaker/codec/PacemakerServerHandler.java | 2 +- .../storm/pacemaker/codec/ThriftNettyServerCodec.java | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java index b25eea74b22..a843c9ad0e7 100644 --- a/storm-client/src/jvm/org/apache/storm/Config.java +++ b/storm-client/src/jvm/org/apache/storm/Config.java @@ -1420,7 +1420,7 @@ public class Config extends HashMap { * to Nimbus) instead. */ @IsStringList - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_SERVERS = "pacemaker.servers"; /** * The port Pacemaker should run on. Clients should connect to this port to submit or read @@ -1433,7 +1433,7 @@ public class Config extends HashMap { */ @IsNumber @IsPositiveNumber - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_PORT = "pacemaker.port"; /** * The maximum number of threads that should be used by the Pacemaker client. @@ -1447,7 +1447,7 @@ public class Config extends HashMap { */ @IsNumber @IsPositiveNumber - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_CLIENT_MAX_THREADS = "pacemaker.client.max.threads"; /** * This should be one of "DIGEST", "KERBEROS", or "NONE" Determines the mode of authentication @@ -1464,7 +1464,7 @@ public class Config extends HashMap { * to Nimbus) instead. */ @CustomValidator(validatorClass = ConfigValidation.PacemakerAuthTypeValidator.class) - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_AUTH_METHOD = "pacemaker.auth.method"; /** * Pacemaker Thrift Max Message Size (bytes). @@ -1476,7 +1476,7 @@ public class Config extends HashMap { */ @IsInteger @IsPositiveNumber - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_THRIFT_MESSAGE_SIZE_MAX = "pacemaker.thrift.message.size.max"; /** diff --git a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java index 96384c29009..ec8b061c8c2 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java @@ -46,7 +46,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PaceMakerStateStorage implements IStateStorage { private static final int maxRetries = 10; diff --git a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java index b16475428b8..0090135aadf 100644 --- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java +++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java @@ -31,7 +31,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PaceMakerStateStorageFactory implements StateStorageFactory { @Override public IStateStorage mkStore(Map config, Map authConf, diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java index 7afd1fefa97..f3235791da0 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java @@ -47,7 +47,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PacemakerClient implements ISaslClient { private static final Logger LOG = LoggerFactory.getLogger(PacemakerClient.class); diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java index 1627b56284a..2a20d8fc315 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java @@ -30,7 +30,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PacemakerClientHandler extends ChannelInboundHandlerAdapter { private static final Logger LOG = LoggerFactory.getLogger(PacemakerClientHandler.class); diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java index b3614922a09..648fc695723 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java @@ -32,7 +32,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PacemakerClientPool { private static final Logger LOG = LoggerFactory.getLogger(PacemakerClientPool.class); diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java index bff45a86a54..2a7860588d4 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java @@ -21,7 +21,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PacemakerConnectionException extends Exception { public PacemakerConnectionException(String err) { super(err); diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java index dc3d0568db5..32b7ae9f061 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java @@ -34,7 +34,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class ThriftDecoder extends ByteToMessageDecoder { private static final Logger LOG = LoggerFactory.getLogger(ThriftDecoder.class); diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java index 0566a2219f0..b47b9fd24d5 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java @@ -37,7 +37,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class ThriftEncoder extends MessageToMessageEncoder { private static final Logger LOG = LoggerFactory diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java index ae9f81db632..a15c2e0e0d0 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/codec/ThriftNettyClientCodec.java @@ -34,7 +34,7 @@ * them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class ThriftNettyClientCodec extends ChannelInitializer { public static final String SASL_HANDLER = "sasl-handler"; 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 60f9be9f88a..64490b88308 100644 --- a/storm-server/src/main/java/org/apache/storm/DaemonConfig.java +++ b/storm-server/src/main/java/org/apache/storm/DaemonConfig.java @@ -676,7 +676,7 @@ public class DaemonConfig implements Validated { */ @IsNumber @IsPositiveNumber - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_MAX_THREADS = "pacemaker.max.threads"; /** @@ -686,7 +686,7 @@ public class DaemonConfig implements Validated { * Use the default heartbeat path (workers heartbeat to their supervisor, which reports them to Nimbus) instead. */ @IsStringOrStringList - @Deprecated(since = "3.1.0", forRemoval = true) + @Deprecated(since = "3.2.0", forRemoval = true) public static final String PACEMAKER_CHILDOPTS = "pacemaker.childopts"; diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/IServerMessageHandler.java b/storm-server/src/main/java/org/apache/storm/pacemaker/IServerMessageHandler.java index f0b65317673..9eaf8e8f1b0 100644 --- a/storm-server/src/main/java/org/apache/storm/pacemaker/IServerMessageHandler.java +++ b/storm-server/src/main/java/org/apache/storm/pacemaker/IServerMessageHandler.java @@ -21,7 +21,7 @@ * Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public interface IServerMessageHandler { HBMessage handleMessage(HBMessage m, boolean authenticated); diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java b/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java index 6667c063684..0bae592c8ee 100644 --- a/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java +++ b/storm-server/src/main/java/org/apache/storm/pacemaker/Pacemaker.java @@ -40,7 +40,7 @@ * Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class Pacemaker implements IServerMessageHandler { private static final Logger LOG = LoggerFactory.getLogger(Pacemaker.class); diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java b/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java index 5d71fdf8ef1..4a39c246bc5 100644 --- a/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java +++ b/storm-server/src/main/java/org/apache/storm/pacemaker/PacemakerServer.java @@ -45,7 +45,7 @@ * Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) class PacemakerServer implements ISaslServer { private static final int FIVE_MB_IN_BYTES = 5 * 1024 * 1024; diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/codec/PacemakerServerHandler.java b/storm-server/src/main/java/org/apache/storm/pacemaker/codec/PacemakerServerHandler.java index fa7242c310b..52d708cf873 100644 --- a/storm-server/src/main/java/org/apache/storm/pacemaker/codec/PacemakerServerHandler.java +++ b/storm-server/src/main/java/org/apache/storm/pacemaker/codec/PacemakerServerHandler.java @@ -27,7 +27,7 @@ * Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class PacemakerServerHandler extends StormServerHandler { private static final Logger LOG = LoggerFactory.getLogger(PacemakerServerHandler.class); diff --git a/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java b/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java index 5d92e6d7abb..61b6f29ed37 100644 --- a/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java +++ b/storm-server/src/main/java/org/apache/storm/pacemaker/codec/ThriftNettyServerCodec.java @@ -35,7 +35,7 @@ * Use the default heartbeat path instead: workers heartbeat to their supervisor, which reports them to Nimbus over * Thrift, with the default ZooKeeper-based cluster state store ({@code org.apache.storm.cluster.ZKStateStorageFactory}). */ -@Deprecated(since = "3.1.0", forRemoval = true) +@Deprecated(since = "3.2.0", forRemoval = true) public class ThriftNettyServerCodec extends ChannelInitializer { public static final String SASL_HANDLER = "sasl-handler";