Updated Branches: refs/heads/trunk 269c0cdac -> 8c99a3769
fix streaming to wrong directory Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c99a376 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c99a376 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c99a376 Branch: refs/heads/trunk Commit: 8c99a376980b90faf7b1ca1aa33d9fde0a356cda Parents: 269c0cd Author: Yuki Morishita <[email protected]> Authored: Mon Oct 22 16:46:31 2012 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Oct 22 16:46:43 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/streaming/StreamIn.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c99a376/src/java/org/apache/cassandra/streaming/StreamIn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamIn.java b/src/java/org/apache/cassandra/streaming/StreamIn.java index a0d605d..b8f6b90 100644 --- a/src/java/org/apache/cassandra/streaming/StreamIn.java +++ b/src/java/org/apache/cassandra/streaming/StreamIn.java @@ -83,7 +83,7 @@ public class StreamIn Directories.DataDirectory localDir = Directories.getLocationCapableOfSize(remote.size); if (localDir == null) throw new RuntimeException("Insufficient disk space to store " + remote.size + " bytes"); - Descriptor localdesc = Descriptor.fromFilename(cfStore.getTempSSTablePath(localDir.location)); + Descriptor localdesc = Descriptor.fromFilename(cfStore.getTempSSTablePath(cfStore.directories.getLocationForDisk(localDir.location))); return new PendingFile(localdesc, remote); }
