Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
conf/cassandra.yaml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1559b497
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1559b497
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1559b497
Branch: refs/heads/trunk
Commit: 1559b49713e40d306a2afeae821bc8a6c6e6f685
Parents: 3d9d517 3b36864
Author: Brandon Williams <[email protected]>
Authored: Tue Jan 22 19:26:20 2013 -0600
Committer: Brandon Williams <[email protected]>
Committed: Tue Jan 22 19:26:20 2013 -0600
----------------------------------------------------------------------
conf/cassandra.yaml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1559b497/conf/cassandra.yaml
----------------------------------------------------------------------
diff --cc conf/cassandra.yaml
index cfe01a6,aa4db1c..bfc65d8
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -39,14 -24,11 +39,15 @@@ initial_token
# See http://wiki.apache.org/cassandra/HintedHandoff
hinted_handoff_enabled: true
# this defines the maximum amount of time a dead host will have hints
- # generated. After it has been dead this long, hints will be dropped.
+ # generated. After it has been dead this long, new hints for it will not be
+ # created until it has been seen alive and gone down again.
-max_hint_window_in_ms: 3600000 # one hour
-# Sleep this long after delivering each hint
-hinted_handoff_throttle_delay_in_ms: 1
+max_hint_window_in_ms: 10800000 # 3 hours
+# throttle in KB's per second, per delivery thread
+hinted_handoff_throttle_in_kb: 1024
+# Number of threads with which to deliver hints;
+# Consider increasing this number when you have multi-dc deployments, since
+# cross-dc handoff tends to be slower
+max_hints_delivery_threads: 2
# The following setting populates the page cache on memtable flush and
compaction
# WARNING: Enable this setting only when the whole node's data fits in memory.
