You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/13 20:14:30 UTC
git commit: add nodetool enablebackup/disablebackup patch by
pmargolin reviewed by dbrosius for CASSANDRA-5556
Updated Branches:
refs/heads/cassandra-1.2 f91d320af -> 56927973f
add nodetool enablebackup/disablebackup
patch by pmargolin reviewed by dbrosius for CASSANDRA-5556
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56927973
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56927973
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56927973
Branch: refs/heads/cassandra-1.2
Commit: 56927973fea9112a5d3aa704e82af45af457772c
Parents: f91d320
Author: Dave Brosius <db...@apache.org>
Authored: Mon May 13 14:12:19 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Mon May 13 14:12:19 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
src/java/org/apache/cassandra/tools/NodeCmd.java | 7 ++++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++++
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 6 ++++++
4 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56927973/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69d8218..844fe3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
1.2.5
- * fix 2i updates with indentical values and timestamps (CASSANDRA-5540)
+ * fix 2i updates with identical values and timestamps (CASSANDRA-5540)
* fix compaction throttling bursty-ness (CASSANDRA-4316)
* reduce memory consumption of IndexSummary (CASSANDRA-5506)
* remove per-row column name bloom filters (CASSANDRA-5492)
@@ -23,6 +23,7 @@
* Add custom secondary index support to CQL3 (CASSANDRA-5484)
* Fix repair hanging silently on unexpected error (CASSANDRA-5229)
* Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432)
+ * Add nodetool enablebackup/disablebackup (CASSANDRA-5556)
Merged from 1.1
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
* Use allocator information to improve memtable memory usage estimate
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56927973/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index ed82e32..b2732a5 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -155,7 +155,9 @@ public class NodeCmd
RANGEKEYSAMPLE,
REBUILD_INDEX,
RESETLOCALSCHEMA,
- PREDICTCONSISTENCY
+ PREDICTCONSISTENCY,
+ ENABLEBACKUP,
+ DISABLEBACKUP
}
@@ -1069,6 +1071,9 @@ public class NodeCmd
case ENABLETHRIFT : probe.startThriftServer(); break;
case STATUSTHRIFT : nodeCmd.printIsThriftServerRunning(System.out); break;
case RESETLOCALSCHEMA: probe.resetLocalSchema(); break;
+ case ENABLEBACKUP : probe.setIncrementalBackupsEnabled(true); break;
+ case DISABLEBACKUP : probe.setIncrementalBackupsEnabled(false); break;
+
case STATUS :
if (arguments.length > 0) nodeCmd.printClusterStatus(System.out, arguments[0]);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56927973/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index e6eca7b..b2b9cf8 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -520,6 +520,10 @@ public class NodeProbe
cfsProxy.setCompactionThresholds(minimumCompactionThreshold, maximumCompactionThreshold);
}
+ public void setIncrementalBackupsEnabled(boolean enabled){
+ ssProxy.setIncrementalBackupsEnabled(enabled);
+ }
+
public void setCacheCapacities(int keyCacheCapacity, int rowCacheCapacity)
{
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56927973/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index d3e8436..f918804 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -82,6 +82,12 @@ commands:
- name: enablethrift
help: |
Reenable thrift server
+ - name: enablebackup
+ help: |
+ Enable incremental backup
+ - name: disablebackup
+ help: |
+ Disable incremental backup
- name: statusthrift
help: |
Status of thrift server