natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 2.0

This commit is contained in:
Jonathan Ellis 2014-07-11 23:50:46 -05:00
parent 380583b5e5 a4544615df
commit 83ac8a631e
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -2,6 +2,7 @@
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
* Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
Merged from 2.0: Merged from 2.0:
* Fix range merging when DES scores are zero (CASSANDRA-7535)
* Warn when SSL certificates have expired (CASSANDRA-7528) * Warn when SSL certificates have expired (CASSANDRA-7528)
* Fix error when doing reversed queries with static columns (CASSANDRA-7490) * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
Merged from 1.2: Merged from 1.2:

0
examples/hadoop_cql3_word_count/bin/word_count Normal file → Executable file
View File

0
examples/hadoop_cql3_word_count/bin/word_count_counters Normal file → Executable file
View File

0
examples/hadoop_cql3_word_count/bin/word_count_setup Normal file → Executable file
View File

7
src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
View File

@ -45,6 +45,11 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa
private int UPDATE_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicUpdateInterval(); private int UPDATE_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicUpdateInterval();
private int RESET_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicResetInterval(); private int RESET_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicResetInterval();
private double BADNESS_THRESHOLD = DatabaseDescriptor.getDynamicBadnessThreshold(); private double BADNESS_THRESHOLD = DatabaseDescriptor.getDynamicBadnessThreshold();
// the score for a merged set of endpoints must be this much worse than the score for separate endpoints to
// warrant not merging two ranges into a single range
private double RANGE_MERGING_PREFERENCE = 1.5;
private String mbeanName; private String mbeanName;
private boolean registered = false; private boolean registered = false;
@ -320,7 +325,7 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa
if (maxMerged < 0 || maxL1 < 0 || maxL2 < 0) if (maxMerged < 0 || maxL1 < 0 || maxL2 < 0)
return true; return true;
return maxMerged < maxL1 + maxL2; return maxMerged <= (maxL1 + maxL2) * RANGE_MERGING_PREFERENCE;
} }
// Return the max score for the endpoint in the provided list, or -1.0 if no node have a score. // Return the max score for the endpoint in the provided list, or -1.0 if no node have a score.