Updated Branches: refs/heads/cassandra-1.1 f57f1c07c -> 67b340bec refs/heads/trunk 2914f15a0 -> 78b074bc4
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78b074bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78b074bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78b074bc Branch: refs/heads/trunk Commit: 78b074bc4b36c9779aeea38b8f873b31716e3014 Parents: 2914f15 67b340b Author: Brandon Williams <[email protected]> Authored: Mon Apr 16 11:51:23 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Apr 16 11:51:23 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableLoader.java | 34 +++++++++++--- .../apache/cassandra/streaming/FileStreamTask.java | 6 +- .../org/apache/cassandra/tools/BulkLoader.java | 6 +++ 3 files changed, 35 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b074bc/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b074bc/src/java/org/apache/cassandra/streaming/FileStreamTask.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/FileStreamTask.java index a40ba80,5b62af6..583ea6c --- a/src/java/org/apache/cassandra/streaming/FileStreamTask.java +++ b/src/java/org/apache/cassandra/streaming/FileStreamTask.java @@@ -43,11 -44,10 +43,10 @@@ import org.slf4j.LoggerFactory public class FileStreamTask extends WrappedRunnable { - private static Logger logger = LoggerFactory.getLogger(FileStreamTask.class); + private static final Logger logger = LoggerFactory.getLogger(FileStreamTask.class); public static final int CHUNK_SIZE = 64 * 1024; - // around 10 minutes at the default rpctimeout - public static final int MAX_CONNECT_ATTEMPTS = 8; + public static final int MAX_CONNECT_ATTEMPTS = 4; protected final StreamHeader header; protected final InetAddress to; http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b074bc/src/java/org/apache/cassandra/tools/BulkLoader.java ----------------------------------------------------------------------
