Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/commitlog/CommitLog.java
src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8eea3586
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8eea3586
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8eea3586
Branch: refs/heads/trunk
Commit: 8eea35863bd1e2bafdaabfb586348a034ae56ada
Parents: 2047b2a 77c66bf
Author: Joshua McKenzie <[email protected]>
Authored: Wed Mar 11 11:23:09 2015 -0500
Committer: Joshua McKenzie <[email protected]>
Committed: Wed Mar 11 11:23:09 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/commitlog/CommitLog.java | 30 +++++++++++++++++++
.../db/commitlog/CommitLogArchiver.java | 6 ++--
.../cassandra/db/commitlog/CommitLogMBean.java | 31 ++++++++++++++++++++
4 files changed, 65 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8eea3586/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 29e7541,382b3dd..24a8bb7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,5 +1,44 @@@
+2.1.4
+ * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
+ * cassandra-stress reports per-operation statistics, plus misc
(CASSANDRA-8769)
+ * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
+ * Use long for key count in cfstats (CASSANDRA-8913)
+ * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
+ * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
+ * Make EstimatedHistogram#percentile() use ceil instead of floor
(CASSANDRA-8883)
+ * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
+ * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
+ * Pick sstables for validation as late as possible inc repairs
(CASSANDRA-8366)
+ * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
+ * Fix parallelism adjustment in range and secondary index queries
+ when the first fetch does not satisfy the limit (CASSANDRA-8856)
+ * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
+ * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
+ * Fix CommitLog.forceRecycleAllSegments() memory access error
(CASSANDRA-8812)
+ * Improve assertions in Memory (CASSANDRA-8792)
+ * Fix SSTableRewriter cleanup (CASSANDRA-8802)
+ * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
+ * 'nodetool info' prints exception against older node (CASSANDRA-8796)
+ * Ensure SSTableReader.last corresponds exactly with the file end
(CASSANDRA-8750)
+ * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
+ * Enforce SSTableReader.first/last (CASSANDRA-8744)
+ * Cleanup SegmentedFile API (CASSANDRA-8749)
+ * Avoid overlap with early compaction replacement (CASSANDRA-8683)
+ * Safer Resource Management++ (CASSANDRA-8707)
+ * Write partition size estimates into a system table (CASSANDRA-7688)
+ * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
+ (CASSANDRA-8154)
+ * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
+ * IndexSummaryBuilder utilises offheap memory, and shares data between
+ each IndexSummary opened from it (CASSANDRA-8757)
+ * markCompacting only succeeds if the exact SSTableReader instances being
+ marked are in the live set (CASSANDRA-8689)
+ * cassandra-stress support for varint (CASSANDRA-8882)
+ * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
+ * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
+Merged from 2.0:
2.0.14:
+ * Expose commit log archive status via JMX (CASSANDRA-8734)
* Provide better exceptions for invalid replication strategy parameters
(CASSANDRA-8909)
* Fix regression in mixed single and multi-column relation support for
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8eea3586/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 9b51a33,a3ce804..40b90ff
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -311,9 -299,50 +311,39 @@@ public class CommitLog implements Commi
return metrics.totalCommitLogSize.value();
}
+ @Override
+ public String getArchiveCommand()
+ {
+ return archiver.archiveCommand;
+ }
+
+ @Override
+ public String getRestoreCommand()
+ {
+ return archiver.restoreCommand;
+ }
+
+ @Override
+ public String getRestoreDirectories()
+ {
+ return archiver.restoreDirectories;
+ }
+
+ @Override
+ public long getRestorePointInTime()
+ {
+ return archiver.restorePointInTime;
+ }
+
+ @Override
+ public String getRestorePrecision()
+ {
+ return archiver.precision.toString();
+ }
+
- /**
- * Fetches a new segment file from the allocator and activates it.
- *
- * @return the newly activated segment
- */
- private void activateNextSegment()
- {
- activeSegment = allocator.fetchSegment();
- logger.debug("Active segment is now {}", activeSegment);
- }
-
public List<String> getActiveSegmentNames()
{
- List<String> segmentNames = new ArrayList<String>();
+ List<String> segmentNames = new ArrayList<>();
for (CommitLogSegment segment : allocator.getActiveSegments())
segmentNames.add(segment.getName());
return segmentNames;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8eea3586/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index 6cba603,fd03624..602cf94
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@@ -52,10 -52,10 +52,10 @@@ public class CommitLogArchive
}
public final Map<String, Future<?>> archivePending = new
ConcurrentHashMap<String, Future<?>>();
- public final ExecutorService executor = new
JMXEnabledThreadPoolExecutor("commitlog_archiver");
+ private final ExecutorService executor = new
JMXEnabledThreadPoolExecutor("CommitLogArchiver");
- private final String archiveCommand;
- private final String restoreCommand;
- private final String restoreDirectories;
+ final String archiveCommand;
+ final String restoreCommand;
+ final String restoreDirectories;
public final long restorePointInTime;
public final TimeUnit precision;
