Updated Branches: refs/heads/cassandra-1.1 67b340bec -> 3f8372c1f refs/heads/trunk 78b074bc4 -> 95c105ba2
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/95c105ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95c105ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95c105ba Branch: refs/heads/trunk Commit: 95c105ba22677fbcfd06c973c2c04bd6ac4d892d Parents: 78b074b 3f8372c Author: Brandon Williams <[email protected]> Authored: Mon Apr 16 13:15:57 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Apr 16 13:15:57 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/BulkRecordWriter.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c105ba/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java index 550a1ba,e430e9b..17865b4 --- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java @@@ -52,11 -57,14 +54,14 @@@ implements org.apache.hadoop.mapred.Rec private final static String OUTPUT_LOCATION = "mapreduce.output.bulkoutputformat.localdir"; private final static String BUFFER_SIZE_IN_MB = "mapreduce.output.bulkoutputformat.buffersize"; private final static String STREAM_THROTTLE_MBITS = "mapreduce.output.bulkoutputformat.streamthrottlembits"; + private final static String MAX_FAILED_HOSTS = "mapreduce.output.bulkoutputformat.maxfailedhosts"; private final Configuration conf; + private final Logger logger = LoggerFactory.getLogger(BulkRecordWriter.class); private SSTableSimpleUnsortedWriter writer; private SSTableLoader loader; - private File outputdir; + private final File outputdir; private Progressable progress; + private int maxFailures; private enum CFType {
