Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/commitlog/CommitLog.java
src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c38ea0b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c38ea0b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c38ea0b1
Branch: refs/heads/trunk
Commit: c38ea0b1b2d07feed7ba4f90daac0569ac0b2f19
Parents: 39deb31 8eea358
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Wed Mar 11 11:25:48 2015 -0500
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Wed Mar 11 11:25:48 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/c38ea0b1/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38ea0b1/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 4c8e4bb,40b90ff..0ffa575
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -292,6 -291,56 +292,36 @@@ public class CommitLog implements Commi
}
}
+ @Override
- public long getCompletedTasks()
- {
- return metrics.completedTasks.value();
- }
-
- @Override
- public long getPendingTasks()
- {
- return metrics.pendingTasks.value();
- }
-
- /**
- * @return the total size occupied by commitlog segments expressed in
bytes. (used by MBean)
- */
- public long getTotalCommitlogSize()
- {
- 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();
+ }
+
public List<String> getActiveSegmentNames()
{
List<String> segmentNames = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38ea0b1/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38ea0b1/src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java
index 150ec20,9f3eb9b..ecb1980
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java
@@@ -24,6 -24,58 +24,37 @@@ import java.util.List
public interface CommitLogMBean
{
/**
- * Get the number of completed tasks
- * @see org.apache.cassandra.metrics.CommitLogMetrics#completedTasks
- */
- @Deprecated
- public long getCompletedTasks();
-
- /**
- * Get the number of tasks waiting to be executed
- * @see org.apache.cassandra.metrics.CommitLogMetrics#pendingTasks
- */
- @Deprecated
- public long getPendingTasks();
-
- /**
- * Get the current size used by all the commitlog segments.
- * @see org.apache.cassandra.metrics.CommitLogMetrics#totalCommitLogSize
- */
- @Deprecated
- public long getTotalCommitlogSize();
-
- /**
+ * Command to execute to archive a commitlog segment. Blank to disabled.
+ */
+ public String getArchiveCommand();
+
+ /**
+ * Command to execute to make an archived commitlog live again
+ */
+ public String getRestoreCommand();
+
+ /**
+ * Directory to scan the recovery files in
+ */
+ public String getRestoreDirectories();
+
+ /**
+ * Restore mutations created up to and including this timestamp in GMT
+ * Format: yyyy:MM:dd HH:mm:ss (2012:04:31 20:43:12)
+ *
+ * Recovery will continue through the segment when the first
client-supplied
+ * timestamp greater than this time is encountered, but only mutations
less than
+ * or equal to this timestamp will be applied.
+ */
+ public long getRestorePointInTime();
+
+ /**
+ * get precision of the timestamp used in the restore (MILLISECONDS,
MICROSECONDS, ...)
+ * to determine if passed the restore point in time.
+ */
+ public String getRestorePrecision();
+
+ /**
* Recover a single file.
*/
public void recover(String path) throws IOException;
