You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/10/23 16:57:43 UTC
git commit: remove vestiges of STREAM stage, take 2 patch by jbellis;
reviewed by yukim for CASSANDRA-4764
Updated Branches:
refs/heads/trunk 796df645c -> fb15aa9f6
remove vestiges of STREAM stage, take 2
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/fb15aa9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb15aa9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb15aa9f
Branch: refs/heads/trunk
Commit: fb15aa9f635f837093812fb0640dc53199f7270e
Parents: 796df64
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Oct 23 09:57:40 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Oct 23 09:57:40 2012 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/concurrent/Stage.java | 2 --
.../apache/cassandra/concurrent/StageManager.java | 1 -
.../org/apache/cassandra/net/MessagingService.java | 4 ++--
.../apache/cassandra/service/StorageService.java | 11 ++---------
4 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb15aa9f/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/fb15aa9f/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/fb15aa9f/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 677e17d..42ad356 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -132,8 +132,8 @@ public final class MessagingService implements MessagingServiceMBean
put(Verb.TRUNCATE, Stage.MUTATION);
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.STREAM_REPLY, Stage.MISC); // actually handled by FileStreamTask and streamExecutors
+ put(Verb.STREAM_REQUEST, Stage.MISC);
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/fb15aa9f/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;