This is an automated email from the ASF dual-hosted git repository.
GGraziadei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 807939a63 Formally mark Pacemaker subsystem and configs for removal
(#9171)
807939a63 is described below
commit 807939a63b51d4ec9cee1945a491dedf665d6bef
Author: Mohit Nehete <[email protected]>
AuthorDate: Sun Oct 18 02:24:05 2026 +0530
Formally mark Pacemaker subsystem and configs for removal (#9171)
---
storm-client/src/jvm/org/apache/storm/Config.java | 10 +++++-----
.../jvm/org/apache/storm/cluster/PaceMakerStateStorage.java | 2 +-
.../org/apache/storm/cluster/PaceMakerStateStorageFactory.java | 2 +-
.../src/jvm/org/apache/storm/pacemaker/PacemakerClient.java | 2 +-
.../jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java | 2 +-
.../jvm/org/apache/storm/pacemaker/PacemakerClientPool.java | 2 +-
.../apache/storm/pacemaker/PacemakerConnectionException.java | 2 +-
.../jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java | 2 +-
.../jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java | 2 +-
.../apache/storm/pacemaker/codec/ThriftNettyClientCodec.java | 2 +-
storm-server/src/main/java/org/apache/storm/DaemonConfig.java | 4 ++--
.../java/org/apache/storm/pacemaker/IServerMessageHandler.java | 2 +-
.../src/main/java/org/apache/storm/pacemaker/Pacemaker.java | 2 +-
.../main/java/org/apache/storm/pacemaker/PacemakerServer.java | 2 +-
.../apache/storm/pacemaker/codec/PacemakerServerHandler.java | 2 +-
.../apache/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 9fec88235..557872754 100644
--- a/storm-client/src/jvm/org/apache/storm/Config.java
+++ b/storm-client/src/jvm/org/apache/storm/Config.java
@@ -1124,7 +1124,7 @@ public class Config extends HashMap<String, Object> {
* Use the default heartbeat path (workers heartbeat to their
supervisor, which reports them to Nimbus) instead.
*/
@IsStringList
- @Deprecated
+ @Deprecated(since = "3.1.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 heartbeats.
@@ -1134,7 +1134,7 @@ public class Config extends HashMap<String, Object> {
*/
@IsNumber
@IsPositiveNumber
- @Deprecated
+ @Deprecated(since = "3.1.0", forRemoval = true)
public static final String PACEMAKER_PORT = "pacemaker.port";
/**
* The maximum number of threads that should be used by the Pacemaker
client.
@@ -1146,7 +1146,7 @@ public class Config extends HashMap<String, Object> {
*/
@IsNumber
@IsPositiveNumber
- @Deprecated
+ @Deprecated(since = "3.1.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 the pacemaker server and client use. The
@@ -1158,7 +1158,7 @@ public class Config extends HashMap<String, Object> {
* Use the default heartbeat path (workers heartbeat to their
supervisor, which reports them to Nimbus) instead.
*/
@CustomValidator(validatorClass =
ConfigValidation.PacemakerAuthTypeValidator.class)
- @Deprecated
+ @Deprecated(since = "3.1.0", forRemoval = true)
public static final String PACEMAKER_AUTH_METHOD = "pacemaker.auth.method";
/**
* Pacemaker Thrift Max Message Size (bytes).
@@ -1168,7 +1168,7 @@ public class Config extends HashMap<String, Object> {
*/
@IsInteger
@IsPositiveNumber
- @Deprecated
+ @Deprecated(since = "3.1.0", forRemoval = true)
public static final String PACEMAKER_THRIFT_MESSAGE_SIZE_MAX =
"pacemaker.thrift.message.size.max";
/**
* Max no.of seconds group mapping service will cache user groups
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 effaeea11..c9763859b 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorage.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 6b8e3bf32..c947b7163 100644
---
a/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
+++
b/storm-client/src/jvm/org/apache/storm/cluster/PaceMakerStateStorageFactory.java
@@ -29,7 +29,7 @@ import org.apache.storm.utils.Utils;
* 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
+@Deprecated(since = "3.1.0", forRemoval = true)
public class PaceMakerStateStorageFactory implements StateStorageFactory {
@Override
public IStateStorage mkStore(Map<String, Object> config, Map<String,
Object> authConf, ClusterStateContext context) {
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 b4a4b66b3..cdb51d911 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 c3e183cd8..7fc935dab 100644
---
a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java
+++
b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientHandler.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 43c6c1f7c..1634cbaa2 100644
--- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
+++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClientPool.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 3390cc5a8..d64dfef67 100644
---
a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java
+++
b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerConnectionException.java
@@ -19,7 +19,7 @@ package org.apache.storm.pacemaker;
* 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
+@Deprecated(since = "3.1.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 b66420e5c..35bdd9a67 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
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 d029888f1..e12597af8 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
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.0", forRemoval = true)
public class ThriftEncoder extends MessageToMessageEncoder<Object> {
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 55f94d5da..93f17308a 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
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.0", forRemoval = true)
public class ThriftNettyClientCodec extends ChannelInitializer<Channel> {
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 e535baf1b..0151c3d3d 100644
--- a/storm-server/src/main/java/org/apache/storm/DaemonConfig.java
+++ b/storm-server/src/main/java/org/apache/storm/DaemonConfig.java
@@ -688,7 +688,7 @@ public class DaemonConfig implements Validated {
*/
@IsNumber
@IsPositiveNumber
- @Deprecated
+ @Deprecated(since = "3.1.0", forRemoval = true)
public static final String PACEMAKER_MAX_THREADS = "pacemaker.max.threads";
/**
@@ -698,7 +698,7 @@ public class DaemonConfig implements Validated {
* Use the default heartbeat path (workers heartbeat to their
supervisor, which reports them to Nimbus) instead.
*/
@IsStringOrStringList
- @Deprecated
+ @Deprecated(since = "3.1.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 dac6d4442..f0b653176 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 @@ import org.apache.storm.generated.HBMessage;
* 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
+@Deprecated(since = "3.1.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 a7809c407..6667c0636 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 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 123f77aac..5d71fdf8e 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 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 7bd8b1a82..fa7242c31 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 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.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 2b93372f6..5d92e6d7a 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 @@ import org.slf4j.LoggerFactory;
* 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
+@Deprecated(since = "3.1.0", forRemoval = true)
public class ThriftNettyServerCodec extends ChannelInitializer<Channel> {
public static final String SASL_HANDLER = "sasl-handler";
