Updated Branches:
refs/heads/cassandra-1.2 b36a8081c -> 9ccaaadec
refs/heads/trunk 118cd0d99 -> 049352f9b
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/HintedHandOffManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/049352f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049352f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/049352f9
Branch: refs/heads/trunk
Commit: 049352f9bf28a9fea79e420593281d31a1fd0cf4
Parents: 118cd0d 9ccaaad
Author: Brandon Williams <[email protected]>
Authored: Wed Jan 9 11:45:43 2013 -0600
Committer: Brandon Williams <[email protected]>
Committed: Wed Jan 9 11:45:43 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 +
doc/cql3/CQL.textile | 4 +-
.../apache/cassandra/db/HintedHandOffManager.java | 33 ++++++++++++++-
.../cassandra/db/HintedHandOffManagerMBean.java | 3 +
src/java/org/apache/cassandra/tools/NodeCmd.java | 8 ++++
src/java/org/apache/cassandra/tools/NodeProbe.java | 25 +++++++++++
.../org/apache/cassandra/tools/SSTableExport.java | 2 +-
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 13 +++++-
8 files changed, 85 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/049352f9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 17382d5,2346993..dd3826c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
+1.3
+ * make index_interval configurable per columnfamily (CASSANDRA-3961)
+ * add default_tim_to_live (CASSANDRA-3974)
+ * add memtable_flush_period_in_ms (CASSANDRA-4237)
+ * replace supercolumns internally by composites (CASSANDRA-3237)
+
+
1.2.1
+ * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
* disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
* add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and
CompactionManagerMBean (CASSANDRA-5044)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/049352f9/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 3d726a0,8ca0281..2a1f5e9
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -303,7 -313,14 +313,15 @@@ public class HintedHandOffManager imple
while (true)
{
+ // check if hints delivery has been paused during the process
+ if (hintedHandOffPaused)
+ {
+ logger.debug("Hints delivery process is paused, aborting");
+ break;
+ }
+
- QueryFilter filter = QueryFilter.getSliceFilter(epkey, new
QueryPath(SystemTable.HINTS_CF), startColumn, ByteBufferUtil.EMPTY_BYTE_BUFFER,
false, pageSize);
+ QueryFilter filter = QueryFilter.getSliceFilter(epkey,
SystemTable.HINTS_CF, startColumn, ByteBufferUtil.EMPTY_BYTE_BUFFER, false,
pageSize);
++
ColumnFamily hintsPage =
ColumnFamilyStore.removeDeleted(hintStore.getColumnFamily(filter),
(int)(System.currentTimeMillis() / 1000));
if (pagingFinished(hintsPage, startColumn))
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/049352f9/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
