You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/02 20:14:41 UTC
[2/2] git commit: Use java.io.tmpdir as default output location for
BulkRecordWriter Patch by Erik Forsberg,
reviewed by brandonwilliams for CASSANDRA-3840
Use java.io.tmpdir as default output location for BulkRecordWriter
Patch by Erik Forsberg, reviewed by brandonwilliams for CASSANDRA-3840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d768e11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d768e11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d768e11
Branch: refs/heads/cassandra-1.1
Commit: 0d768e11b5522fdf6bcd12619cc88eaf112d0e72
Parents: ea3b8da
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 2 10:00:19 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 2 13:06:03 2012 -0600
----------------------------------------------------------------------
.../apache/cassandra/hadoop/BulkRecordWriter.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d768e11/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
index d270136..c8a3a4f 100644
--- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
@@ -91,9 +91,9 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
private String getOutputLocation() throws IOException
{
- String dir = conf.get(OUTPUT_LOCATION, conf.get("mapred.local.dir"));
+ String dir = conf.get(OUTPUT_LOCATION, System.getProperty("java.io.tmpdir"));
if (dir == null)
- throw new IOException("Output directory not defined, if hadoop is not setting mapred.local.dir then define " + OUTPUT_LOCATION);
+ throw new IOException("Output directory not defined, if hadoop is not setting java.io.tmpdir then define " + OUTPUT_LOCATION);
return dir;
}