You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/07/14 21:06:36 UTC
[05/23] storm git commit: Remove (now) dead comment and code
Remove (now) dead comment and code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/27a92e2a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/27a92e2a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/27a92e2a
Branch: refs/heads/0.9.x-branch
Commit: 27a92e2aa3488c0203f500306e0583ff9e7e1e82
Parents: 679e42b
Author: Enno Shioji <es...@gmail.com>
Authored: Fri May 29 10:32:16 2015 +0100
Committer: Enno Shioji <es...@gmail.com>
Committed: Fri May 29 10:32:16 2015 +0100
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 5 -----
.../src/jvm/backtype/storm/messaging/netty/Client.java | 10 ----------
2 files changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/27a92e2a/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 8407010..ab72c29 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -91,11 +91,6 @@ public class Config extends HashMap<String, Object> {
public static final Object STORM_NETTY_MESSAGE_BATCH_SIZE_SCHEMA = ConfigValidation.IntegerValidator;
/**
- * We check with this interval that whether the Netty channel is writable and try to write pending messages
- */
- public static final String STORM_NETTY_FLUSH_CHECK_INTERVAL_MS = "storm.messaging.netty.flush.check.interval.ms";
- public static final Object STORM_NETTY_FLUSH_CHECK_INTERVAL_MS_SCHEMA = ConfigValidation.IntegerValidator;
-
/**
* The delegate for serializing metadata, should be used for serialized objects stored in zookeeper and on disk.
* This is NOT used for compressing serialized tuples sent between topologies.
http://git-wip-us.apache.org/repos/asf/storm/blob/27a92e2a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index 4bbe989..f2953fc 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -60,16 +60,12 @@ import static com.google.common.base.Preconditions.checkState;
* - Connecting and reconnecting are performed asynchronously.
* - Note: The current implementation drops any messages that are being enqueued for sending if the connection to
* the remote destination is currently unavailable.
- * - A background flusher thread is run in the background. It will, at fixed intervals, check for any pending messages
- * (i.e. messages buffered in memory) and flush them to the remote destination iff background flushing is currently
- * enabled.
*/
public class Client extends ConnectionWithStatus implements IStatefulObject {
private static final Logger LOG = LoggerFactory.getLogger(Client.class);
private static final String PREFIX = "Netty-Client-";
private static final long NO_DELAY_MS = 0L;
- private static final long MINIMUM_INITIAL_DELAY_MS = 30000L;
private final StormBoundedExponentialBackoffRetry retryPolicy;
private final ClientBootstrap bootstrap;
@@ -126,17 +122,14 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
private final int messageBatchSize;
private final ListeningScheduledExecutorService scheduler;
- protected final Map stormConf;
@SuppressWarnings("rawtypes")
Client(Map stormConf, ChannelFactory factory, ScheduledExecutorService scheduler, String host, int port) {
closing = false;
- this.stormConf = stormConf;
this.scheduler = MoreExecutors.listeningDecorator(scheduler);
int bufferSize = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
LOG.info("creating Netty Client, connecting to {}:{}, bufferSize: {}", host, port, bufferSize);
messageBatchSize = Utils.getInt(stormConf.get(Config.STORM_NETTY_MESSAGE_BATCH_SIZE), 262144);
- int flushCheckIntervalMs = Utils.getInt(stormConf.get(Config.STORM_NETTY_FLUSH_CHECK_INTERVAL_MS), 10);
maxReconnectionAttempts = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MAX_RETRIES));
int minWaitMs = Utils.getInt(stormConf.get(Config.STORM_MESSAGING_NETTY_MIN_SLEEP_MS));
@@ -148,9 +141,6 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
dstAddress = new InetSocketAddress(host, port);
dstAddressPrefixedName = prefixedName(dstAddress);
scheduleConnect(NO_DELAY_MS);
-
- // Launch background flushing thread
- long initialDelayMs = Math.min(MINIMUM_INITIAL_DELAY_MS, maxWaitMs * maxReconnectionAttempts);
}
private ClientBootstrap createClientBootstrap(ChannelFactory factory, int bufferSize) {