Updated Branches: refs/heads/trunk 8f3d9b837 -> 69ad77d8c
remove vestiges of STREAM stage patch by jbellis; reviewed by yukim for CASSANDRA-4764 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69ad77d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69ad77d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69ad77d8 Branch: refs/heads/trunk Commit: 69ad77d8c6a1e2c78255d54477798d5619a3a84d Parents: 8f3d9b8 Author: Jonathan Ellis <[email protected]> Authored: Mon Oct 22 16:27:47 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Oct 22 16:27:47 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/concurrent/Stage.java | 2 -- .../apache/cassandra/concurrent/StageManager.java | 1 - .../org/apache/cassandra/net/MessagingService.java | 1 - .../apache/cassandra/service/StorageService.java | 11 ++--------- 4 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69ad77d8/src/java/org/apache/cassandra/concurrent/Stage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/concurrent/Stage.java b/src/java/org/apache/cassandra/concurrent/Stage.java index 062bbe6..f2907e2 100644 --- a/src/java/org/apache/cassandra/concurrent/Stage.java +++ b/src/java/org/apache/cassandra/concurrent/Stage.java @@ -21,7 +21,6 @@ public enum Stage { READ, MUTATION, - STREAM, GOSSIP, REQUEST_RESPONSE, ANTI_ENTROPY, @@ -41,7 +40,6 @@ public enum Stage case MIGRATION: case MISC: case TRACING: - case STREAM: case INTERNAL_RESPONSE: return "internal"; case MUTATION: http://git-wip-us.apache.org/repos/asf/cassandra/blob/69ad77d8/src/java/org/apache/cassandra/concurrent/StageManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/concurrent/StageManager.java b/src/java/org/apache/cassandra/concurrent/StageManager.java index 8359346..7ca45f4 100644 --- a/src/java/org/apache/cassandra/concurrent/StageManager.java +++ b/src/java/org/apache/cassandra/concurrent/StageManager.java @@ -51,7 +51,6 @@ public class StageManager stages.put(Stage.INTERNAL_RESPONSE, multiThreadedStage(Stage.INTERNAL_RESPONSE, Runtime.getRuntime().availableProcessors())); stages.put(Stage.REPLICATE_ON_WRITE, multiThreadedConfigurableStage(Stage.REPLICATE_ON_WRITE, getConcurrentReplicators(), MAX_REPLICATE_ON_WRITE_TASKS)); // the rest are all single-threaded - stages.put(Stage.STREAM, new JMXEnabledThreadPoolExecutor(Stage.STREAM)); stages.put(Stage.GOSSIP, new JMXEnabledThreadPoolExecutor(Stage.GOSSIP)); stages.put(Stage.ANTI_ENTROPY, new JMXEnabledThreadPoolExecutor(Stage.ANTI_ENTROPY)); stages.put(Stage.MIGRATION, new JMXEnabledThreadPoolExecutor(Stage.MIGRATION)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69ad77d8/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index 06a0270..41a42ec 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -133,7 +133,6 @@ public final class MessagingService implements MessagingServiceMBean put(Verb.READ, Stage.READ); put(Verb.REQUEST_RESPONSE, Stage.REQUEST_RESPONSE); put(Verb.STREAM_REPLY, Stage.MISC); // TODO does this really belong on misc? I've just copied old behavior here - put(Verb.STREAM_REQUEST, Stage.STREAM); put(Verb.RANGE_SLICE, Stage.READ); put(Verb.BOOTSTRAP_TOKEN, Stage.MISC); put(Verb.TREE_REQUEST, Stage.ANTI_ENTROPY); http://git-wip-us.apache.org/repos/asf/cassandra/blob/69ad77d8/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 4cc8581..58ce112 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3352,15 +3352,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe } }; - StageManager.getStage(Stage.STREAM).execute(new Runnable() - { - public void run() - { - // TODO each call to transferRanges re-flushes, this is potentially a lot of waste - StreamOut.transferRanges(newEndpoint, Table.open(table), ranges, callback, - OperationType.UNBOOTSTRAP); - } - }); + // TODO each call to transferRanges re-flushes, this is potentially a lot of waste + StreamOut.transferRanges(newEndpoint, Table.open(table), ranges, callback, OperationType.UNBOOTSTRAP); } } return latch;
