You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/02/03 15:18:54 UTC
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/trunk c4339cd3b -> 2cecf05c4
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cecf05c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cecf05c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cecf05c
Branch: refs/heads/trunk
Commit: 2cecf05c40c4b77c910e9da65405a49db4920c29
Parents: c4339cd 29915e8
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Feb 3 17:17:31 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Feb 3 17:17:31 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 50 +++++++++------
src/java/org/apache/cassandra/db/Memtable.java | 16 +++--
.../db/compaction/AbstractCompactionTask.java | 6 ++
.../cassandra/db/compaction/CompactionTask.java | 19 ++----
.../cassandra/io/util/DiskAwareRunnable.java | 16 +++--
.../org/apache/cassandra/streaming/StreamIn.java | 4 +-
7 files changed, 66 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cecf05c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 47bd73f,6b3a705..7e782c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,8 -6,8 +13,9 @@@
* cli: remove default username and password (CASSANDRA-5208)
* configure populate_io_cache_on_flush per-CF (CASSANDRA-4694)
* allow configuration of internode socket buffer (CASSANDRA-3378)
+ * Make sstable directory picking blacklist-aware again (CASSANDRA-5193)
+
1.2.1
* stream undelivered hints on decommission (CASSANDRA-5128)
* GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cecf05c/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cecf05c/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 9db0a1a,1b1599b..28d957d
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -103,10 -94,10 +94,10 @@@ public class CompactionTask extends Abs
{
// The collection of sstables passed may be empty (but not null); even if
// it is not empty, it may compact down to nothing if all rows are deleted.
- assert sstables != null && dataDirectory != null;
+ assert sstables != null && sstableDirectory != null;
if (DatabaseDescriptor.isSnapshotBeforeCompaction())
- cfs.snapshotWithoutFlush(System.currentTimeMillis() + "-compact-" + cfs.columnFamily);
+ cfs.snapshotWithoutFlush(System.currentTimeMillis() + "-compact-" + cfs.name);
// sanity check: all sstables must belong to the same cfs
for (SSTableReader sstable : toCompact)