You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2012/08/30 14:48:36 UTC
[3/3] git commit: Fix writing sstables to wrong directory when
compacting
Fix writing sstables to wrong directory when compacting
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e6167da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e6167da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e6167da
Branch: refs/heads/trunk
Commit: 4e6167da57915e803946f35f039d7a33680f4693
Parents: 0525ae2
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Aug 29 10:20:11 2012 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 30 07:19:01 2012 -0500
----------------------------------------------------------------------
.../cassandra/db/compaction/CompactionTask.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e6167da/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 4d2a90f..ff08b61 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -155,7 +155,7 @@ public class CompactionTask extends AbstractCompactionTask
return;
}
- SSTableWriter writer = cfs.createCompactionWriter(keysPerSSTable, dataDirectory, toCompact);
+ SSTableWriter writer = cfs.createCompactionWriter(keysPerSSTable, cfs.directories.getLocationForDisk(dataDirectory), toCompact);
writers.add(writer);
while (nni.hasNext())
{
@@ -187,7 +187,7 @@ public class CompactionTask extends AbstractCompactionTask
sstables.add(toIndex);
if (nni.hasNext())
{
- writer = cfs.createCompactionWriter(keysPerSSTable, dataDirectory, toCompact);
+ writer = cfs.createCompactionWriter(keysPerSSTable, cfs.directories.getLocationForDisk(dataDirectory), toCompact);
writers.add(writer);
cachedKeys = new HashMap<DecoratedKey, RowIndexEntry>();
}