You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/19 17:22:54 UTC
[1/7] git commit: Allow cache-keys-to-save to be set at runtime patch
by Chris Burroughs; reviewed by jbellis for CASSANDRA-5980
Updated Branches:
refs/heads/cassandra-2.0 c2a36e760 -> cef6552c2
refs/heads/trunk e1a910930 -> ec7a3e594
Allow cache-keys-to-save to be set at runtime
patch by Chris Burroughs; reviewed by jbellis for CASSANDRA-5980
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df046d6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df046d6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df046d6b
Branch: refs/heads/cassandra-2.0
Commit: df046d6b4262c3a879b60d1b6f082aea792e09a0
Parents: 9375363
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:18:07 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:18:07 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++
.../cassandra/config/DatabaseDescriptor.java | 10 +++++
.../apache/cassandra/service/CacheService.java | 42 ++++++++++++++++----
.../cassandra/service/CacheServiceMBean.java | 6 +++
.../org/apache/cassandra/tools/NodeCmd.java | 8 +++-
.../org/apache/cassandra/tools/NodeProbe.java | 16 ++++++++
.../apache/cassandra/tools/NodeToolHelp.yaml | 3 ++
7 files changed, 80 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f853cce..27e6f24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.11
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
+
+
1.2.10
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 8e3cbe2..22de2d6 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1251,6 +1251,11 @@ public class DatabaseDescriptor
return conf.key_cache_keys_to_save;
}
+ public static void setKeyCacheKeysToSave(int keyCacheKeysToSave)
+ {
+ conf.key_cache_keys_to_save = keyCacheKeysToSave;
+ }
+
public static long getRowCacheSizeInMB()
{
return conf.row_cache_size_in_mb;
@@ -1271,6 +1276,11 @@ public class DatabaseDescriptor
return conf.row_cache_keys_to_save;
}
+ public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+ {
+ conf.row_cache_keys_to_save = rowCacheKeysToSave;
+ }
+
public static IRowCacheProvider getRowCacheProvider()
{
return rowCacheProvider;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java
index 34864f2..5d3dc72 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -207,13 +207,13 @@ public class CacheService implements CacheServiceMBean
return DatabaseDescriptor.getRowCacheSavePeriod();
}
- public void setRowCacheSavePeriodInSeconds(int rcspis)
+ public void setRowCacheSavePeriodInSeconds(int seconds)
{
- if (rcspis < 0)
+ if (seconds < 0)
throw new RuntimeException("RowCacheSavePeriodInSeconds must be non-negative.");
- DatabaseDescriptor.setRowCacheSavePeriod(rcspis);
- rowCache.scheduleSaving(rcspis, DatabaseDescriptor.getRowCacheKeysToSave());
+ DatabaseDescriptor.setRowCacheSavePeriod(seconds);
+ rowCache.scheduleSaving(seconds, DatabaseDescriptor.getRowCacheKeysToSave());
}
public int getKeyCacheSavePeriodInSeconds()
@@ -221,13 +221,39 @@ public class CacheService implements CacheServiceMBean
return DatabaseDescriptor.getKeyCacheSavePeriod();
}
- public void setKeyCacheSavePeriodInSeconds(int kcspis)
+ public void setKeyCacheSavePeriodInSeconds(int seconds)
{
- if (kcspis < 0)
+ if (seconds < 0)
throw new RuntimeException("KeyCacheSavePeriodInSeconds must be non-negative.");
- DatabaseDescriptor.setKeyCacheSavePeriod(kcspis);
- keyCache.scheduleSaving(kcspis, DatabaseDescriptor.getKeyCacheKeysToSave());
+ DatabaseDescriptor.setKeyCacheSavePeriod(seconds);
+ keyCache.scheduleSaving(seconds, DatabaseDescriptor.getKeyCacheKeysToSave());
+ }
+
+ public int getRowCacheKeysToSave()
+ {
+ return DatabaseDescriptor.getRowCacheKeysToSave();
+ }
+
+ public void setRowCacheKeysToSave(int count)
+ {
+ if (count < 0)
+ throw new RuntimeException("RowCacheKeysToSave must be non-negative.");
+ DatabaseDescriptor.setRowCacheKeysToSave(count);
+ rowCache.scheduleSaving(getRowCacheSavePeriodInSeconds(), count);
+ }
+
+ public int getKeyCacheKeysToSave()
+ {
+ return DatabaseDescriptor.getKeyCacheKeysToSave();
+ }
+
+ public void setKeyCacheKeysToSave(int count)
+ {
+ if (count < 0)
+ throw new RuntimeException("KeyCacheKeysToSave must be non-negative.");
+ DatabaseDescriptor.setKeyCacheKeysToSave(count);
+ keyCache.scheduleSaving(getKeyCacheSavePeriodInSeconds(), count);
}
public void invalidateKeyCache()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CacheServiceMBean.java b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
index 8b8adf2..0225db2 100644
--- a/src/java/org/apache/cassandra/service/CacheServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
@@ -27,6 +27,12 @@ public interface CacheServiceMBean
public int getKeyCacheSavePeriodInSeconds();
public void setKeyCacheSavePeriodInSeconds(int kcspis);
+ public int getRowCacheKeysToSave();
+ public void setRowCacheKeysToSave(int rckts);
+
+ public int getKeyCacheKeysToSave();
+ public void setKeyCacheKeysToSave(int kckts);
+
/**
* invalidate the key cache; for use after invalidating row cache
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/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 7a770bb..26cc50e 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -164,7 +164,8 @@ public class NodeCmd
RESETLOCALSCHEMA,
PREDICTCONSISTENCY,
ENABLEBACKUP,
- DISABLEBACKUP
+ DISABLEBACKUP,
+ SETCACHEKEYSTOSAVE
}
@@ -1271,6 +1272,11 @@ public class NodeCmd
probe.setCacheCapacities(Integer.parseInt(arguments[0]), Integer.parseInt(arguments[1]));
break;
+ case SETCACHEKEYSTOSAVE :
+ if (arguments.length != 2) { badUse("setcachekeystosave requires key-cache-keys-to-save, and row-cache-keys-to-save args."); }
+ probe.setCacheKeysToSave(Integer.parseInt(arguments[0]), Integer.parseInt(arguments[1]));
+ break;
+
case SETCOMPACTIONTHRESHOLD :
if (arguments.length != 4) { badUse("setcompactionthreshold requires ks, cf, min, and max threshold args."); }
int minthreshold = Integer.parseInt(arguments[2]);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/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 e7cf592..7829b60 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -526,6 +526,22 @@ public class NodeProbe
}
}
+ public void setCacheKeysToSave(int keyCacheKeysToSave, int rowCacheKeysToSave)
+ {
+ try
+ {
+ String keyCachePath = "org.apache.cassandra.db:type=Caches";
+ CacheServiceMBean cacheMBean = JMX.newMBeanProxy(mbeanServerConn, new ObjectName(keyCachePath), CacheServiceMBean.class);
+ cacheMBean.setKeyCacheKeysToSave(keyCacheKeysToSave);
+ cacheMBean.setRowCacheKeysToSave(rowCacheKeysToSave);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
public List<InetAddress> getEndpoints(String keyspace, String cf, String key)
{
return ssProxy.getNaturalEndpoints(keyspace, cf, key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/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 b540b2c..6feb7b4 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -185,6 +185,9 @@ commands:
- name: setcachecapacity <key-cache-capacity> <row-cache-capacity>
help: |
Set global key and row cache capacities (in MB units).
+ - name: setcachekeystosave <key-cache-keys-to-save> <row-cache-keys-to-save>
+ help: |
+ Set number of keys saved by each cache for faster post-restart warmup. 0 to disable.
- name: getendpoints <keyspace> <cf> <key>
help: |
Print the end points that owns the key
[2/7] git commit: Allow cache-keys-to-save to be set at runtime patch
by Chris Burroughs; reviewed by jbellis for CASSANDRA-5980
Posted by jb...@apache.org.
Allow cache-keys-to-save to be set at runtime
patch by Chris Burroughs; reviewed by jbellis for CASSANDRA-5980
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df046d6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df046d6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df046d6b
Branch: refs/heads/trunk
Commit: df046d6b4262c3a879b60d1b6f082aea792e09a0
Parents: 9375363
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:18:07 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:18:07 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++
.../cassandra/config/DatabaseDescriptor.java | 10 +++++
.../apache/cassandra/service/CacheService.java | 42 ++++++++++++++++----
.../cassandra/service/CacheServiceMBean.java | 6 +++
.../org/apache/cassandra/tools/NodeCmd.java | 8 +++-
.../org/apache/cassandra/tools/NodeProbe.java | 16 ++++++++
.../apache/cassandra/tools/NodeToolHelp.yaml | 3 ++
7 files changed, 80 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f853cce..27e6f24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.11
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
+
+
1.2.10
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 8e3cbe2..22de2d6 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1251,6 +1251,11 @@ public class DatabaseDescriptor
return conf.key_cache_keys_to_save;
}
+ public static void setKeyCacheKeysToSave(int keyCacheKeysToSave)
+ {
+ conf.key_cache_keys_to_save = keyCacheKeysToSave;
+ }
+
public static long getRowCacheSizeInMB()
{
return conf.row_cache_size_in_mb;
@@ -1271,6 +1276,11 @@ public class DatabaseDescriptor
return conf.row_cache_keys_to_save;
}
+ public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+ {
+ conf.row_cache_keys_to_save = rowCacheKeysToSave;
+ }
+
public static IRowCacheProvider getRowCacheProvider()
{
return rowCacheProvider;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java
index 34864f2..5d3dc72 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -207,13 +207,13 @@ public class CacheService implements CacheServiceMBean
return DatabaseDescriptor.getRowCacheSavePeriod();
}
- public void setRowCacheSavePeriodInSeconds(int rcspis)
+ public void setRowCacheSavePeriodInSeconds(int seconds)
{
- if (rcspis < 0)
+ if (seconds < 0)
throw new RuntimeException("RowCacheSavePeriodInSeconds must be non-negative.");
- DatabaseDescriptor.setRowCacheSavePeriod(rcspis);
- rowCache.scheduleSaving(rcspis, DatabaseDescriptor.getRowCacheKeysToSave());
+ DatabaseDescriptor.setRowCacheSavePeriod(seconds);
+ rowCache.scheduleSaving(seconds, DatabaseDescriptor.getRowCacheKeysToSave());
}
public int getKeyCacheSavePeriodInSeconds()
@@ -221,13 +221,39 @@ public class CacheService implements CacheServiceMBean
return DatabaseDescriptor.getKeyCacheSavePeriod();
}
- public void setKeyCacheSavePeriodInSeconds(int kcspis)
+ public void setKeyCacheSavePeriodInSeconds(int seconds)
{
- if (kcspis < 0)
+ if (seconds < 0)
throw new RuntimeException("KeyCacheSavePeriodInSeconds must be non-negative.");
- DatabaseDescriptor.setKeyCacheSavePeriod(kcspis);
- keyCache.scheduleSaving(kcspis, DatabaseDescriptor.getKeyCacheKeysToSave());
+ DatabaseDescriptor.setKeyCacheSavePeriod(seconds);
+ keyCache.scheduleSaving(seconds, DatabaseDescriptor.getKeyCacheKeysToSave());
+ }
+
+ public int getRowCacheKeysToSave()
+ {
+ return DatabaseDescriptor.getRowCacheKeysToSave();
+ }
+
+ public void setRowCacheKeysToSave(int count)
+ {
+ if (count < 0)
+ throw new RuntimeException("RowCacheKeysToSave must be non-negative.");
+ DatabaseDescriptor.setRowCacheKeysToSave(count);
+ rowCache.scheduleSaving(getRowCacheSavePeriodInSeconds(), count);
+ }
+
+ public int getKeyCacheKeysToSave()
+ {
+ return DatabaseDescriptor.getKeyCacheKeysToSave();
+ }
+
+ public void setKeyCacheKeysToSave(int count)
+ {
+ if (count < 0)
+ throw new RuntimeException("KeyCacheKeysToSave must be non-negative.");
+ DatabaseDescriptor.setKeyCacheKeysToSave(count);
+ keyCache.scheduleSaving(getKeyCacheSavePeriodInSeconds(), count);
}
public void invalidateKeyCache()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CacheServiceMBean.java b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
index 8b8adf2..0225db2 100644
--- a/src/java/org/apache/cassandra/service/CacheServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
@@ -27,6 +27,12 @@ public interface CacheServiceMBean
public int getKeyCacheSavePeriodInSeconds();
public void setKeyCacheSavePeriodInSeconds(int kcspis);
+ public int getRowCacheKeysToSave();
+ public void setRowCacheKeysToSave(int rckts);
+
+ public int getKeyCacheKeysToSave();
+ public void setKeyCacheKeysToSave(int kckts);
+
/**
* invalidate the key cache; for use after invalidating row cache
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/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 7a770bb..26cc50e 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -164,7 +164,8 @@ public class NodeCmd
RESETLOCALSCHEMA,
PREDICTCONSISTENCY,
ENABLEBACKUP,
- DISABLEBACKUP
+ DISABLEBACKUP,
+ SETCACHEKEYSTOSAVE
}
@@ -1271,6 +1272,11 @@ public class NodeCmd
probe.setCacheCapacities(Integer.parseInt(arguments[0]), Integer.parseInt(arguments[1]));
break;
+ case SETCACHEKEYSTOSAVE :
+ if (arguments.length != 2) { badUse("setcachekeystosave requires key-cache-keys-to-save, and row-cache-keys-to-save args."); }
+ probe.setCacheKeysToSave(Integer.parseInt(arguments[0]), Integer.parseInt(arguments[1]));
+ break;
+
case SETCOMPACTIONTHRESHOLD :
if (arguments.length != 4) { badUse("setcompactionthreshold requires ks, cf, min, and max threshold args."); }
int minthreshold = Integer.parseInt(arguments[2]);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/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 e7cf592..7829b60 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -526,6 +526,22 @@ public class NodeProbe
}
}
+ public void setCacheKeysToSave(int keyCacheKeysToSave, int rowCacheKeysToSave)
+ {
+ try
+ {
+ String keyCachePath = "org.apache.cassandra.db:type=Caches";
+ CacheServiceMBean cacheMBean = JMX.newMBeanProxy(mbeanServerConn, new ObjectName(keyCachePath), CacheServiceMBean.class);
+ cacheMBean.setKeyCacheKeysToSave(keyCacheKeysToSave);
+ cacheMBean.setRowCacheKeysToSave(rowCacheKeysToSave);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
public List<InetAddress> getEndpoints(String keyspace, String cf, String key)
{
return ssProxy.getNaturalEndpoints(keyspace, cf, key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/df046d6b/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 b540b2c..6feb7b4 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -185,6 +185,9 @@ commands:
- name: setcachecapacity <key-cache-capacity> <row-cache-capacity>
help: |
Set global key and row cache capacities (in MB units).
+ - name: setcachekeystosave <key-cache-keys-to-save> <row-cache-keys-to-save>
+ help: |
+ Set number of keys saved by each cache for faster post-restart warmup. 0 to disable.
- name: getendpoints <keyspace> <cf> <key>
help: |
Print the end points that owns the key
[3/7] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7b71f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7b71f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7b71f6
Branch: refs/heads/trunk
Commit: fb7b71f6b1b8b8581f64ee86de5fdc2c7eabe590
Parents: 7453e6f df046d6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:21:05 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:21:05 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/config/DatabaseDescriptor.java | 10 +++++
.../apache/cassandra/service/CacheService.java | 42 ++++++++++++++++----
.../cassandra/service/CacheServiceMBean.java | 6 +++
.../org/apache/cassandra/tools/NodeCmd.java | 8 +++-
.../org/apache/cassandra/tools/NodeProbe.java | 16 ++++++++
.../apache/cassandra/tools/NodeToolHelp.yaml | 3 ++
7 files changed, 78 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fcc33f2,27e6f24..ae6eedc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,8 +1,39 @@@
-1.2.11
+2.0.2
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
++Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
-1.2.10
+2.0.1
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index b3eeca6,22de2d6..42459e4
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1207,11 -1276,16 +1212,16 @@@ public class DatabaseDescripto
return conf.row_cache_keys_to_save;
}
- public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+ public static IAllocator getoffHeapMemoryAllocator()
{
- conf.row_cache_keys_to_save = rowCacheKeysToSave;
+ return memoryAllocator;
}
- public static IRowCacheProvider getRowCacheProvider()
++ public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+ {
- return rowCacheProvider;
++ conf.row_cache_keys_to_save = rowCacheKeysToSave;
+ }
+
public static int getStreamingSocketTimeout()
{
return conf.streaming_socket_timeout_in_ms;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/service/CacheServiceMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 2d31232,26cc50e..1ae5de8
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -162,8 -162,10 +162,9 @@@ public class NodeCm
RANGEKEYSAMPLE,
REBUILD_INDEX,
RESETLOCALSCHEMA,
- PREDICTCONSISTENCY,
ENABLEBACKUP,
- DISABLEBACKUP
+ DISABLEBACKUP,
+ SETCACHEKEYSTOSAVE
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
[7/7] git commit: Merge remote-tracking branch 'origin/trunk' into
trunk
Posted by jb...@apache.org.
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec7a3e59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec7a3e59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec7a3e59
Branch: refs/heads/trunk
Commit: ec7a3e594e99c5ae85739737f8c07d2d5786e37a
Parents: 636598d e1a9109
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:22:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:22:40 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/7] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7b71f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7b71f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7b71f6
Branch: refs/heads/cassandra-2.0
Commit: fb7b71f6b1b8b8581f64ee86de5fdc2c7eabe590
Parents: 7453e6f df046d6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:21:05 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:21:05 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/config/DatabaseDescriptor.java | 10 +++++
.../apache/cassandra/service/CacheService.java | 42 ++++++++++++++++----
.../cassandra/service/CacheServiceMBean.java | 6 +++
.../org/apache/cassandra/tools/NodeCmd.java | 8 +++-
.../org/apache/cassandra/tools/NodeProbe.java | 16 ++++++++
.../apache/cassandra/tools/NodeToolHelp.yaml | 3 ++
7 files changed, 78 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fcc33f2,27e6f24..ae6eedc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,8 +1,39 @@@
-1.2.11
+2.0.2
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
++Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
-1.2.10
+2.0.1
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index b3eeca6,22de2d6..42459e4
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1207,11 -1276,16 +1212,16 @@@ public class DatabaseDescripto
return conf.row_cache_keys_to_save;
}
- public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+ public static IAllocator getoffHeapMemoryAllocator()
{
- conf.row_cache_keys_to_save = rowCacheKeysToSave;
+ return memoryAllocator;
}
- public static IRowCacheProvider getRowCacheProvider()
++ public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+ {
- return rowCacheProvider;
++ conf.row_cache_keys_to_save = rowCacheKeysToSave;
+ }
+
public static int getStreamingSocketTimeout()
{
return conf.streaming_socket_timeout_in_ms;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/service/CacheServiceMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 2d31232,26cc50e..1ae5de8
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -162,8 -162,10 +162,9 @@@ public class NodeCm
RANGEKEYSAMPLE,
REBUILD_INDEX,
RESETLOCALSCHEMA,
- PREDICTCONSISTENCY,
ENABLEBACKUP,
- DISABLEBACKUP
+ DISABLEBACKUP,
+ SETCACHEKEYSTOSAVE
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
[5/7] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/636598d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/636598d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/636598d3
Branch: refs/heads/trunk
Commit: 636598d3424b9eb7aeb2166193d5793d40d44925
Parents: 2315686 fb7b71f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:22:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:22:01 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/config/DatabaseDescriptor.java | 10 +++++
.../apache/cassandra/service/CacheService.java | 42 ++++++++++++++++----
.../cassandra/service/CacheServiceMBean.java | 6 +++
.../org/apache/cassandra/tools/NodeCmd.java | 8 +++-
.../org/apache/cassandra/tools/NodeProbe.java | 16 ++++++++
.../apache/cassandra/tools/NodeToolHelp.yaml | 3 ++
7 files changed, 78 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/636598d3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fe652f6,ae6eedc..942063e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,15 @@@
+2.1
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+
+
2.0.2
* Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
2.0.1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/636598d3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
[6/7] git commit: Merge remote-tracking branch 'origin/cassandra-2.0'
into cassandra-2.0
Posted by jb...@apache.org.
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cef6552c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cef6552c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cef6552c
Branch: refs/heads/cassandra-2.0
Commit: cef6552c26d79baff1ecfcc4a9f556681c0cb15f
Parents: fb7b71f c2a36e7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 10:22:30 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 10:22:30 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------