Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08081663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08081663 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08081663 Branch: refs/heads/trunk Commit: 0808166375ba3fc08f09d1a7637de3cb0094ddcd Parents: 4191967 d002c7e Author: Brandon Williams <[email protected]> Authored: Sat Sep 13 18:04:41 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Sat Sep 13 18:04:41 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 33 ++++++++++++---- .../org/apache/cassandra/tools/NodeTool.java | 40 ++++++++++++++++---- 3 files changed, 59 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08081663/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 488f4fd,6e029ab..c35e5b2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ +3.0 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173) * Add human readable option to nodetool commands (CASSANDRA-5433) * Don't try to set repairedAt on old sstables (CASSANDRA-7913) * Add metrics for tracking PreparedStatement use (CASSANDRA-7719) http://git-wip-us.apache.org/repos/asf/cassandra/blob/08081663/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08081663/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 8f0dcef,e7d1404..0bfbc13 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@@ -1892,11 -1909,15 +1909,16 @@@ public class NodeToo { ownerships = probe.effectiveOwnership(keyspace); hasEffectiveOwns = true; - } catch (IllegalStateException e) + } + catch (IllegalStateException e) { ownerships = probe.getOwnership(); - System.out.printf("Note: Ownership information does not include topology; for complete information, specify a keyspace%n"); + errors.append("Note: " + e.getMessage() + "%n"); + } + catch (IllegalArgumentException ex) + { + System.out.printf("%nError: " + ex.getMessage() + "%n"); + return; } Map<String, SetHostStat> dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships);
