This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d75c438b21678eda3bf8ba3890fd7f61b9673548
Merge: 70e6f29 b9b2e8e
Author: Aleksey Yeshchenko <alek...@apple.com>
AuthorDate: Fri Feb 15 10:05:14 2019 +0000
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 3 +
.../apache/cassandra/tools/nodetool/Status.java | 111 ++++++++-------------
2 files changed, 45 insertions(+), 69 deletions(-)
diff --cc CHANGES.txt
index 1394ea8,2f9813e..0c856c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,353 -1,11 +1,356 @@@
+4.0
+ * SSL Cert Hot Reloading should check for sanity of the new
keystore/truststore before loading it (CASSANDRA-14991)
+ * Avoid leaking threads when failing anticompactions and rate limit
anticompactions (CASSANDRA-15002)
+ * Validate token() arguments early instead of throwing NPE at execution
(CASSANDRA-14989)
+ * Add a new tool to dump audit logs (CASSANDRA-14885)
+ * Fix generating javadoc with Java11 (CASSANDRA-14988)
+ * Only cancel conflicting compactions when starting anticompactions and sub
range compactions (CASSANDRA-14935)
+ * Use a stub IndexRegistry for non-daemon use cases (CASSANDRA-14938)
+ * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
+ * Make antiCompactGroup throw exception on error and anticompaction non
cancellable
+ again (CASSANDRA-14936)
+ * Catch empty/invalid bounds in SelectStatement (CASSANDRA-14849)
+ * Auto-expand replication_factor for NetworkTopologyStrategy
(CASSANDRA-14303)
+ * Transient Replication: support EACH_QUORUM (CASSANDRA-14727)
+ * BufferPool: allocating thread for new chunks should acquire directly
(CASSANDRA-14832)
+ * Send correct messaging version in internode messaging handshake's third
message (CASSANDRA-14896)
+ * Make Read and Write Latency columns consistent for proxyhistograms and
tablehistograms (CASSANDRA-11939)
+ * Make protocol checksum type option case insensitive (CASSANDRA-14716)
+ * Forbid re-adding static columns as regular and vice versa (CASSANDRA-14913)
+ * Audit log allows system keyspaces to be audited via configuration options
(CASSANDRA-14498)
+ * Lower default chunk_length_in_kb from 64kb to 16kb (CASSANDRA-13241)
+ * Startup checker should wait for count rather than percentage
(CASSANDRA-14297)
+ * Fix incorrect sorting of replicas in
SimpleStrategy.calculateNaturalReplicas (CASSANDRA-14862)
+ * Partitioned outbound internode TCP connections can occur when nodes
restart (CASSANDRA-14358)
+ * Don't write to system_distributed.repair_history, system_traces.sessions,
system_traces.events in mixed version 3.X/4.0 clusters (CASSANDRA-14841)
+ * Avoid running query to self through messaging service (CASSANDRA-14807)
+ * Allow using custom script for chronicle queue BinLog archival
(CASSANDRA-14373)
+ * Transient->Full range movements mishandle consistency level upgrade
(CASSANDRA-14759)
+ * ReplicaCollection follow-up (CASSANDRA-14726)
+ * Transient node receives full data requests (CASSANDRA-14762)
+ * Enable snapshot artifacts publish (CASSANDRA-12704)
+ * Introduce RangesAtEndpoint.unwrap to simplify
StreamSession.addTransferRanges (CASSANDRA-14770)
+ * LOCAL_QUORUM may speculate to non-local nodes, resulting in Timeout
instead of Unavailable (CASSANDRA-14735)
+ * Avoid creating empty compaction tasks after truncate (CASSANDRA-14780)
+ * Fail incremental repair prepare phase if it encounters sstables from
un-finalized sessions (CASSANDRA-14763)
+ * Add a check for receiving digest response from transient node
(CASSANDRA-14750)
+ * Fail query on transient replica if coordinator only expects full data
(CASSANDRA-14704)
+ * Remove mentions of transient replication from repair path (CASSANDRA-14698)
+ * Fix handleRepairStatusChangedNotification to remove first then add
(CASSANDRA-14720)
+ * Allow transient node to serve as a repair coordinator (CASSANDRA-14693)
+ * DecayingEstimatedHistogramReservoir.EstimatedHistogramReservoirSnapshot
returns wrong value for size() and incorrectly calculates count
(CASSANDRA-14696)
+ * AbstractReplicaCollection equals and hash code should throw due to
conflict between order sensitive/insensitive uses (CASSANDRA-14700)
+ * Detect inconsistencies in repaired data on the read path (CASSANDRA-14145)
+ * Add checksumming to the native protocol (CASSANDRA-13304)
+ * Make AuthCache more easily extendable (CASSANDRA-14662)
+ * Extend RolesCache to include detailed role info (CASSANDRA-14497)
+ * Add fqltool compare (CASSANDRA-14619)
+ * Add fqltool replay (CASSANDRA-14618)
+ * Log keyspace in full query log (CASSANDRA-14656)
+ * Transient Replication and Cheap Quorums (CASSANDRA-14404)
+ * Log server-generated timestamp and nowInSeconds used by queries in FQL
(CASSANDRA-14675)
+ * Add diagnostic events for read repairs (CASSANDRA-14668)
+ * Use consistent nowInSeconds and timestamps values within a request
(CASSANDRA-14671)
+ * Add sampler for query time and expose with nodetool (CASSANDRA-14436)
+ * Clean up Message.Request implementations (CASSANDRA-14677)
+ * Disable old native protocol versions on demand (CASANDRA-14659)
+ * Allow specifying now-in-seconds in native protocol (CASSANDRA-14664)
+ * Improve BTree build performance by avoiding data copy (CASSANDRA-9989)
+ * Make monotonic read / read repair configurable (CASSANDRA-14635)
+ * Refactor CompactionStrategyManager (CASSANDRA-14621)
+ * Flush netty client messages immediately by default (CASSANDRA-13651)
+ * Improve read repair blocking behavior (CASSANDRA-10726)
+ * Add a virtual table to expose settings (CASSANDRA-14573)
+ * Fix up chunk cache handling of metrics (CASSANDRA-14628)
+ * Extend IAuthenticator to accept peer SSL certificates (CASSANDRA-14652)
+ * Incomplete handling of exceptions when decoding incoming messages
(CASSANDRA-14574)
+ * Add diagnostic events for user audit logging (CASSANDRA-13668)
+ * Allow retrieving diagnostic events via JMX (CASSANDRA-14435)
+ * Add base classes for diagnostic events (CASSANDRA-13457)
+ * Clear view system metadata when dropping keyspace (CASSANDRA-14646)
+ * Allocate ReentrantLock on-demand in java11 AtomicBTreePartitionerBase
(CASSANDRA-14637)
+ * Make all existing virtual tables use LocalPartitioner (CASSANDRA-14640)
+ * Revert 4.0 GC alg back to CMS (CASANDRA-14636)
+ * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627)
+ * Update netty to 4.1.128 (CASSANDRA-14633)
+ * Add a virtual table to expose thread pools (CASSANDRA-14523)
+ * Add a virtual table to expose caches (CASSANDRA-14538, CASSANDRA-14626)
+ * Fix toDate function for timestamp arguments (CASSANDRA-14502)
+ * Revert running dtests by default in circleci (CASSANDRA-14614)
+ * Stream entire SSTables when possible (CASSANDRA-14556)
+ * Cell reconciliation should not depend on nowInSec (CASSANDRA-14592)
+ * Add experimental support for Java 11 (CASSANDRA-9608)
+ * Make PeriodicCommitLogService.blockWhenSyncLagsNanos configurable
(CASSANDRA-14580)
+ * Improve logging in MessageInHandler's constructor (CASSANDRA-14576)
+ * Set broadcast address in internode messaging handshake (CASSANDRA-14579)
+ * Wait for schema agreement prior to building MVs (CASSANDRA-14571)
+ * Make all DDL statements idempotent and not dependent on global state
(CASSANDRA-13426)
+ * Bump the hints messaging version to match the current one (CASSANDRA-14536)
+ * OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind
errors in CircleCI (CASSANDRA-14546)
+ * Report why native_transport_port fails to bind (CASSANDRA-14544)
+ * Optimize internode messaging protocol (CASSANDRA-14485)
+ * Internode messaging handshake sends wrong messaging version number
(CASSANDRA-14540)
+ * Add a virtual table to expose active client connections (CASSANDRA-14458)
+ * Clean up and refactor client metrics (CASSANDRA-14524)
+ * Nodetool import row cache invalidation races with adding sstables to
tracker (CASSANDRA-14529)
+ * Fix assertions in LWTs after TableMetadata was made immutable
(CASSANDRA-14356)
+ * Abort compactions quicker (CASSANDRA-14397)
+ * Support light-weight transactions in cassandra-stress (CASSANDRA-13529)
+ * Make AsyncOneResponse use the correct timeout (CASSANDRA-14509)
+ * Add option to sanity check tombstones on reads/compactions
(CASSANDRA-14467)
+ * Add a virtual table to expose all running sstable tasks (CASSANDRA-14457)
+ * Let nodetool import take a list of directories (CASSANDRA-14442)
+ * Avoid unneeded memory allocations / cpu for disabled log levels
(CASSANDRA-14488)
+ * Implement virtual keyspace interface (CASSANDRA-7622)
+ * nodetool import cleanup and improvements (CASSANDRA-14417)
+ * Bump jackson version to >= 2.9.5 (CASSANDRA-14427)
+ * Allow nodetool toppartitions without specifying table (CASSANDRA-14360)
+ * Audit logging for database activity (CASSANDRA-12151)
+ * Clean up build artifacts in docs container (CASSANDRA-14432)
+ * Minor network authz improvements (Cassandra-14413)
+ * Automatic sstable upgrades (CASSANDRA-14197)
+ * Replace deprecated junit.framework.Assert usages with org.junit.Assert
(CASSANDRA-14431)
+ * Cassandra-stress throws NPE if insert section isn't specified in user
profile (CASSSANDRA-14426)
+ * List clients by protocol versions `nodetool clientstats --by-protocol`
(CASSANDRA-14335)
+ * Improve LatencyMetrics performance by reducing write path processing
(CASSANDRA-14281)
+ * Add network authz (CASSANDRA-13985)
+ * Use the correct IP/Port for Streaming when localAddress is left unbound
(CASSANDRA-14389)
+ * nodetool listsnapshots is missing local system keyspace snapshots
(CASSANDRA-14381)
+ * Remove StreamCoordinator.streamExecutor thread pool (CASSANDRA-14402)
+ * Rename nodetool --with-port to --print-port to disambiguate from --port
(CASSANDRA-14392)
+ * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398)
+ * Add ability to load new SSTables from a separate directory (CASSANDRA-6719)
+ * Eliminate background repair and probablistic read_repair_chance table
options
+ (CASSANDRA-13910)
+ * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
+ * Use standard Amazon naming for datacenter and rack in Ec2Snitch
(CASSANDRA-7839)
+ * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
+ * Abstract write path for pluggable storage (CASSANDRA-14118)
+ * nodetool describecluster should be more informative (CASSANDRA-13853)
+ * Compaction performance improvements (CASSANDRA-14261)
+ * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
+ * Add options to nodetool tablestats to sort and limit output
(CASSANDRA-13889)
+ * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
+ * Add support for hybrid MIN(), MAX() speculative retry policies
+ (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
+ * Fix some regressions caused by 14058 (CASSANDRA-14353)
+ * Abstract repair for pluggable storage (CASSANDRA-14116)
+ * Add meaningful toString() impls (CASSANDRA-13653)
+ * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
+ * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
+ * Add coordinator write metric per CF (CASSANDRA-14232)
+ * Correct and clarify SSLFactory.getSslContext method and call sites
(CASSANDRA-14314)
+ * Handle static and partition deletion properly on
ThrottledUnfilteredIterator (CASSANDRA-14315)
+ * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
+ * Add ability to specify driver name and version (CASSANDRA-14275)
+ * Abstract streaming for pluggable storage (CASSANDRA-14115)
+ * Forced incremental repairs should promote sstables if they can
(CASSANDRA-14294)
+ * Use Murmur3 for validation compactions (CASSANDRA-14002)
+ * Comma at the end of the seed list is interpretated as localhost
(CASSANDRA-14285)
+ * Refactor read executor and response resolver, abstract read repair
(CASSANDRA-14058)
+ * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
+ * Add a few options to nodetool verify (CASSANDRA-14201)
+ * CVE-2017-5929 Security vulnerability and redefine default log rotation
policy (CASSANDRA-14183)
+ * Use JVM default SSL validation algorithm instead of custom default
(CASSANDRA-13259)
+ * Better document in code InetAddressAndPort usage post 7544, incorporate
port into UUIDGen node (CASSANDRA-14226)
+ * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
+ * Make it possible to change neverPurgeTombstones during runtime
(CASSANDRA-14214)
+ * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
+ * Add nodetool clientlist (CASSANDRA-13665)
+ * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
+ * Non-disruptive seed node list reload (CASSANDRA-14190)
+ * Nodetool tablehistograms to print statics for all the tables
(CASSANDRA-14185)
+ * Migrate dtests to use pytest and python3 (CASSANDRA-14134)
+ * Allow storage port to be configurable per node (CASSANDRA-7544)
+ * Make sub-range selection for non-frozen collections return null instead of
empty (CASSANDRA-14182)
+ * BloomFilter serialization format should not change byte ordering
(CASSANDRA-9067)
+ * Remove unused on-heap BloomFilter implementation (CASSANDRA-14152)
+ * Delete temp test files on exit (CASSANDRA-14153)
+ * Make PartitionUpdate and Mutation immutable (CASSANDRA-13867)
+ * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066)
+ * Fix cassandra-stress startup failure (CASSANDRA-14106)
+ * Remove initialDirectories from CFS (CASSANDRA-13928)
+ * Fix trivial log format error (CASSANDRA-14015)
+ * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
+ * Add option to optimise merkle tree comparison across replicas
(CASSANDRA-3200)
+ * Remove unused and deprecated methods from AbstractCompactionStrategy
(CASSANDRA-14081)
+ * Fix Distribution.average in cassandra-stress (CASSANDRA-14090)
+ * Support a means of logging all queries as they were invoked
(CASSANDRA-13983)
+ * Presize collections (CASSANDRA-13760)
+ * Add GroupCommitLogService (CASSANDRA-13530)
+ * Parallelize initial materialized view build (CASSANDRA-12245)
+ * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt
(CASSANDRA-13965)
+ * Make LWTs send resultset metadata on every request (CASSANDRA-13992)
+ * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild
(CASSANDRA-13963)
+ * Introduce leaf-only iterator (CASSANDRA-9988)
+ * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997)
+ * Allow only one concurrent call to StatusLogger (CASSANDRA-12182)
+ * Refactoring to specialised functional interfaces (CASSANDRA-13982)
+ * Speculative retry should allow more friendly params (CASSANDRA-13876)
+ * Throw exception if we send/receive repair messages to incompatible nodes
(CASSANDRA-13944)
+ * Replace usages of MessageDigest with Guava's Hasher (CASSANDRA-13291)
+ * Add nodetool cmd to print hinted handoff window (CASSANDRA-13728)
+ * Fix some alerts raised by static analysis (CASSANDRA-13799)
+ * Checksum sstable metadata (CASSANDRA-13321, CASSANDRA-13593)
+ * Add result set metadata to prepared statement MD5 hash calculation
(CASSANDRA-10786)
+ * Refactor GcCompactionTest to avoid boxing (CASSANDRA-13941)
+ * Expose recent histograms in JmxHistograms (CASSANDRA-13642)
+ * Fix buffer length comparison when decompressing in netty-based streaming
(CASSANDRA-13899)
+ * Properly close StreamCompressionInputStream to release any ByteBuf
(CASSANDRA-13906)
+ * Add SERIAL and LOCAL_SERIAL support for cassandra-stress (CASSANDRA-13925)
+ * LCS needlessly checks for L0 STCS candidates multiple times
(CASSANDRA-12961)
+ * Correctly close netty channels when a stream session ends (CASSANDRA-13905)
+ * Update lz4 to 1.4.0 (CASSANDRA-13741)
+ * Optimize Paxos prepare and propose stage for local requests
(CASSANDRA-13862)
+ * Throttle base partitions during MV repair streaming to prevent OOM
(CASSANDRA-13299)
+ * Use compaction threshold for STCS in L0 (CASSANDRA-13861)
+ * Fix problem with min_compress_ratio: 1 and disallow ratio < 1
(CASSANDRA-13703)
+ * Add extra information to SASI timeout exception (CASSANDRA-13677)
+ * Add incremental repair support for --hosts, --force, and subrange repair
(CASSANDRA-13818)
+ * Rework CompactionStrategyManager.getScanners synchronization
(CASSANDRA-13786)
+ * Add additional unit tests for batch behavior, TTLs, Timestamps
(CASSANDRA-13846)
+ * Add keyspace and table name in schema validation exception
(CASSANDRA-13845)
+ * Emit metrics whenever we hit tombstone failures and warn thresholds
(CASSANDRA-13771)
+ * Make netty EventLoopGroups daemon threads (CASSANDRA-13837)
+ * Race condition when closing stream sessions (CASSANDRA-13852)
+ * NettyFactoryTest is failing in trunk on macOS (CASSANDRA-13831)
+ * Allow changing log levels via nodetool for related classes
(CASSANDRA-12696)
+ * Add stress profile yaml with LWT (CASSANDRA-7960)
+ * Reduce memory copies and object creations when acting on ByteBufs
(CASSANDRA-13789)
+ * Simplify mx4j configuration (Cassandra-13578)
+ * Fix trigger example on 4.0 (CASSANDRA-13796)
+ * Force minumum timeout value (CASSANDRA-9375)
+ * Use netty for streaming (CASSANDRA-12229)
+ * Use netty for internode messaging (CASSANDRA-8457)
+ * Add bytes repaired/unrepaired to nodetool tablestats (CASSANDRA-13774)
+ * Don't delete incremental repair sessions if they still have sstables
(CASSANDRA-13758)
+ * Fix pending repair manager index out of bounds check (CASSANDRA-13769)
+ * Don't use RangeFetchMapCalculator when RF=1 (CASSANDRA-13576)
+ * Don't optimise trivial ranges in RangeFetchMapCalculator (CASSANDRA-13664)
+ * Use an ExecutorService for repair commands instead of new
Thread(..).start() (CASSANDRA-13594)
+ * Fix race / ref leak in anticompaction (CASSANDRA-13688)
+ * Expose tasks queue length via JMX (CASSANDRA-12758)
+ * Fix race / ref leak in PendingRepairManager (CASSANDRA-13751)
+ * Enable ppc64le runtime as unsupported architecture (CASSANDRA-13615)
+ * Improve sstablemetadata output (CASSANDRA-11483)
+ * Support for migrating legacy users to roles has been dropped
(CASSANDRA-13371)
+ * Introduce error metrics for repair (CASSANDRA-13387)
+ * Refactoring to primitive functional interfaces in AuthCache
(CASSANDRA-13732)
+ * Update metrics to 3.1.5 (CASSANDRA-13648)
+ * batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699)
+ * Avoid always rebuilding secondary indexes at startup (CASSANDRA-13725)
+ * Upgrade JMH from 1.13 to 1.19 (CASSANDRA-13727)
+ * Upgrade SLF4J from 1.7.7 to 1.7.25 (CASSANDRA-12996)
+ * Default for start_native_transport now true if not set in config
(CASSANDRA-13656)
+ * Don't add localhost to the graph when calculating where to stream from
(CASSANDRA-13583)
+ * Make CDC availability more deterministic via hard-linking (CASSANDRA-12148)
+ * Allow skipping equality-restricted clustering columns in ORDER BY clause
(CASSANDRA-10271)
+ * Use common nowInSec for validation compactions (CASSANDRA-13671)
+ * Improve handling of IR prepare failures (CASSANDRA-13672)
+ * Send IR coordinator messages synchronously (CASSANDRA-13673)
+ * Flush system.repair table before IR finalize promise (CASSANDRA-13660)
+ * Fix column filter creation for wildcard queries (CASSANDRA-13650)
+ * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool
setbatchlogreplaythrottle' (CASSANDRA-13614)
+ * fix race condition in PendingRepairManager (CASSANDRA-13659)
+ * Allow noop incremental repair state transitions (CASSANDRA-13658)
+ * Run repair with down replicas (CASSANDRA-10446)
+ * Added started & completed repair metrics (CASSANDRA-13598)
+ * Added started & completed repair metrics (CASSANDRA-13598)
+ * Improve secondary index (re)build failure and concurrency handling
(CASSANDRA-10130)
+ * Improve calculation of available disk space for compaction
(CASSANDRA-13068)
+ * Change the accessibility of RowCacheSerializer for third party row cache
plugins (CASSANDRA-13579)
+ * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570)
+ * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585)
+ * Fix Randomness of stress values (CASSANDRA-12744)
+ * Allow selecting Map values and Set elements (CASSANDRA-7396)
+ * Fast and garbage-free Streaming Histogram (CASSANDRA-13444)
+ * Update repairTime for keyspaces on completion (CASSANDRA-13539)
+ * Add configurable upper bound for validation executor threads
(CASSANDRA-13521)
+ * Bring back maxHintTTL propery (CASSANDRA-12982)
+ * Add testing guidelines (CASSANDRA-13497)
+ * Add more repair metrics (CASSANDRA-13531)
+ * RangeStreamer should be smarter when picking endpoints for streaming
(CASSANDRA-4650)
+ * Avoid rewrapping an exception thrown for cache load functions
(CASSANDRA-13367)
+ * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
+ * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
+ * Fix incorrect cqlsh results when selecting same columns multiple times
(CASSANDRA-13262)
+ * Fix WriteResponseHandlerTest is sensitive to test execution order
(CASSANDRA-13421)
+ * Improve incremental repair logging (CASSANDRA-13468)
+ * Start compaction when incremental repair finishes (CASSANDRA-13454)
+ * Add repair streaming preview (CASSANDRA-13257)
+ * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
+ * Change protocol to allow sending key space independent of query string
(CASSANDRA-10145)
+ * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661)
+ * Take number of files in L0 in account when estimating remaining compaction
tasks (CASSANDRA-13354)
+ * Skip building views during base table streams on range movements
(CASSANDRA-13065)
+ * Improve error messages for +/- operations on maps and tuples
(CASSANDRA-13197)
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
+ * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
+ * Make it possible to monitor an ideal consistency level separate from
actual consistency level (CASSANDRA-13289)
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
+ * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
+ * Upgrade snappy-java to 1.1.2.6 (CASSANDRA-13336)
+ * Incremental repair not streaming correct sstables (CASSANDRA-13328)
+ * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
+ * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID
functions (CASSANDRA-13132)
+ * Remove config option index_interval (CASSANDRA-10671)
+ * Reduce lock contention for collection types and serializers
(CASSANDRA-13271)
+ * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
+ * Avoid synchronized on prepareForRepair in ActiveRepairService
(CASSANDRA-9292)
+ * Adds the ability to use uncompressed chunks in compressed files
(CASSANDRA-10520)
+ * Don't flush sstables when streaming for incremental repair
(CASSANDRA-13226)
+ * Remove unused method (CASSANDRA-13227)
+ * Fix minor bugs related to #9143 (CASSANDRA-13217)
+ * Output warning if user increases RF (CASSANDRA-13079)
+ * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
+ * Add support for + and - operations on dates (CASSANDRA-11936)
+ * Fix consistency of incrementally repaired data (CASSANDRA-9143)
+ * Increase commitlog version (CASSANDRA-13161)
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace
(CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter
(CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * Require forceful decommission if number of nodes is less than replication
factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Log message size in trace message in OutboundTcpConnection
(CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes
(CASSANDRA-12969)
+ * cqlsh auto completion: refactor definition of compaction strategy options
(CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Add histogram for delay to deliver hints (CASSANDRA-13234)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
+ * Trivial format error in StorageProxy (CASSANDRA-13551)
+ * Nodetool repair can hang forever if we lose the notification for the
repair completing/failing (CASSANDRA-13480)
+ * Anticompaction can cause noisy log messages (CASSANDRA-13684)
+ * Switch to client init for sstabledump (CASSANDRA-13683)
+ * CQLSH: Don't pause when capturing data (CASSANDRA-13743)
+ * nodetool clearsnapshot requires --all to clear all snapshots
(CASSANDRA-13391)
+ * Correctly count range tombstones in traces and tombstone thresholds
(CASSANDRA-8527)
+ * cqlshrc.sample uses incorrect option for time formatting (CASSANDRA-14243)
+
+
3.11.5
+ Merged from 3.0:
+ * Improve `nodetool status -r` speed (CASSANDRA-14847)
+ * Improve merkle tree size and time on heap (CASSANDRA-14096)
* Add missing commands to nodetool_completion (CASSANDRA-14916)
* Anti-compaction temporarily corrupts sstable state for readers
(CASSANDRA-15004)
- Merged from 2.2:
- * Multi-version in-JVM dtests (CASSANDRA-14937)
3.11.4
diff --cc src/java/org/apache/cassandra/tools/nodetool/Status.java
index b80940f,24c5c74..21868e7
--- a/src/java/org/apache/cassandra/tools/nodetool/Status.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Status.java
@@@ -25,18 -25,19 +25,22 @@@ import java.net.InetAddress
import java.net.UnknownHostException;
import java.text.DecimalFormat;
import java.util.Collection;
+ import java.util.HashSet;
import java.util.List;
import java.util.Map;
+ import java.util.Set;
import java.util.SortedMap;
++import java.util.function.ToIntFunction;
import org.apache.cassandra.locator.EndpointSnitchInfoMBean;
+import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.tools.NodeProbe;
import org.apache.cassandra.tools.NodeTool;
import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
import com.google.common.collect.ArrayListMultimap;
++@SuppressWarnings("UseOfSystemOutOrSystemErr")
@Command(name = "status", description = "Print cluster information (state,
load, IDs, ...)")
public class Status extends NodeToolCmd
{
@@@ -68,147 -68,78 +71,136 @@@
StringBuilder errors = new StringBuilder();
- Map<InetAddress, Float> ownerships = null;
- boolean hasEffectiveOwns = false;
- try
- {
- ownerships = probe.effectiveOwnership(keyspace);
- hasEffectiveOwns = true;
- }
- catch (IllegalStateException e)
+ if (printPort)
{
- ownerships = probe.getOwnership();
- errors.append("Note: ").append(e.getMessage()).append("%n");
- }
- catch (IllegalArgumentException ex)
- {
- System.out.printf("%nError: %s%n", ex.getMessage());
- System.exit(1);
- }
+ Map<String, Float> ownerships = null;
+ boolean hasEffectiveOwns = false;
+ try
+ {
+ ownerships = probe.effectiveOwnershipWithPort(keyspace);
+ hasEffectiveOwns = true;
+ }
+ catch (IllegalStateException e)
+ {
+ ownerships = probe.getOwnershipWithPort();
+ errors.append("Note: ").append(e.getMessage()).append("%n");
+ }
+ catch (IllegalArgumentException ex)
+ {
+ System.out.printf("%nError: %s%n", ex.getMessage());
+ System.exit(1);
+ }
- SortedMap<String, SetHostStat> dcs = NodeTool.getOwnershipByDc(probe,
resolveIp, tokensToEndpoints, ownerships);
+ SortedMap<String, SetHostStatWithPort> dcs =
NodeTool.getOwnershipByDcWithPort(probe, resolveIp, tokensToEndpoints,
ownerships);
- // More tokens than nodes (aka vnodes)?
- if (dcs.values().size() < tokensToEndpoints.keySet().size())
- isTokenPerNode = false;
+ // More tokens than nodes (aka vnodes)?
+ if (dcs.size() < tokensToEndpoints.size())
+ isTokenPerNode = false;
- findMaxAddressLengthWithPort(dcs);
- int maxAddressLength = computeMaxAddressLength(dcs);
++ int maxAddressLength = findMaxAddressLength(dcs, s ->
s.ipOrDns().length());
- // Datacenters
- for (Map.Entry<String, SetHostStat> dc : dcs.entrySet())
- {
- String dcHeader = String.format("Datacenter: %s%n", dc.getKey());
- System.out.print(dcHeader);
- for (int i = 0; i < (dcHeader.length() - 1); i++)
System.out.print('=');
- System.out.println();
+ // Datacenters
+ for (Map.Entry<String, SetHostStatWithPort> dc : dcs.entrySet())
+ {
+ String dcHeader = String.format("Datacenter: %s%n",
dc.getKey());
- System.out.printf(dcHeader);
++ System.out.print(dcHeader);
+ for (int i = 0; i < (dcHeader.length() - 1); i++)
System.out.print('=');
+ System.out.println();
- // Legend
- System.out.println("Status=Up/Down");
- System.out.println("|/ State=Normal/Leaving/Joining/Moving");
+ // Legend
+ System.out.println("Status=Up/Down");
+ System.out.println("|/ State=Normal/Leaving/Joining/Moving");
- printNodesHeader(hasEffectiveOwns, isTokenPerNode);
- printNodesHeader(hasEffectiveOwns, isTokenPerNode,
maxAddressLength);
++ printNodesHeader(hasEffectiveOwns, isTokenPerNode,
maxAddressLength);
- ArrayListMultimap<InetAddress, HostStat> hostToTokens =
ArrayListMultimap.create();
- for (HostStat stat : dc.getValue())
- hostToTokens.put(stat.endpoint, stat);
+ ArrayListMultimap<InetAddressAndPort, HostStatWithPort>
hostToTokens = ArrayListMultimap.create();
+ for (HostStatWithPort stat : dc.getValue())
+ hostToTokens.put(stat.endpoint, stat);
- for (InetAddress endpoint : hostToTokens.keySet())
- {
- Float owns = ownerships.get(endpoint);
- List<HostStat> tokens = hostToTokens.get(endpoint);
- printNode(endpoint.getHostAddress(), owns, tokens,
hasEffectiveOwns, isTokenPerNode, maxAddressLength);
+ for (InetAddressAndPort endpoint : hostToTokens.keySet())
+ {
+ Float owns = ownerships.get(endpoint.toString());
+ List<HostStatWithPort> tokens =
hostToTokens.get(endpoint);
- printNodeWithPort(endpoint.toString(), owns, tokens,
hasEffectiveOwns, isTokenPerNode);
++ printNodeWithPort(endpoint.toString(), owns, tokens,
hasEffectiveOwns, isTokenPerNode, maxAddressLength);
+ }
}
+
- System.out.printf("%n" + errors.toString());
++ System.out.printf("%n" + errors);
}
+ else
+ {
+ Map<InetAddress, Float> ownerships = null;
+ boolean hasEffectiveOwns = false;
+ try
+ {
+ ownerships = probe.effectiveOwnership(keyspace);
+ hasEffectiveOwns = true;
+ }
+ catch (IllegalStateException e)
+ {
+ ownerships = probe.getOwnership();
+ errors.append("Note: ").append(e.getMessage()).append("%n");
+ }
+ catch (IllegalArgumentException ex)
+ {
+ System.out.printf("%nError: %s%n", ex.getMessage());
+ System.exit(1);
+ }
+
+ SortedMap<String, SetHostStat> dcs =
NodeTool.getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships);
- System.out.printf("%n" + errors);
+ // More tokens than nodes (aka vnodes)?
+ if (dcs.values().size() < tokensToEndpoints.keySet().size())
+ isTokenPerNode = false;
+
- findMaxAddressLength(dcs);
++ int maxAddressLength = findMaxAddressLength(dcs, s ->
s.ipOrDns().length());
+
+ // Datacenters
+ for (Map.Entry<String, SetHostStat> dc : dcs.entrySet())
+ {
+ String dcHeader = String.format("Datacenter: %s%n",
dc.getKey());
- System.out.printf(dcHeader);
++ System.out.print(dcHeader);
+ for (int i = 0; i < (dcHeader.length() - 1); i++)
System.out.print('=');
+ System.out.println();
+
+ // Legend
+ System.out.println("Status=Up/Down");
+ System.out.println("|/ State=Normal/Leaving/Joining/Moving");
+
- printNodesHeader(hasEffectiveOwns, isTokenPerNode);
++ printNodesHeader(hasEffectiveOwns, isTokenPerNode,
maxAddressLength);
+
+ ArrayListMultimap<InetAddress, HostStat> hostToTokens =
ArrayListMultimap.create();
+ for (HostStat stat : dc.getValue())
+ hostToTokens.put(stat.endpoint, stat);
+
+ for (InetAddress endpoint : hostToTokens.keySet())
+ {
+ Float owns = ownerships.get(endpoint);
+ List<HostStat> tokens = hostToTokens.get(endpoint);
- printNode(endpoint.getHostAddress(), owns, tokens,
hasEffectiveOwns, isTokenPerNode);
++ printNode(endpoint.getHostAddress(), owns, tokens,
hasEffectiveOwns, isTokenPerNode, maxAddressLength);
+ }
+ }
- System.out.printf("%n" + errors.toString());
++ System.out.printf("%n" + errors);
+ }
}
- private void findMaxAddressLength(Map<String, SetHostStat> dcs)
- private int computeMaxAddressLength(Map<String, SetHostStat> dcs)
++ private <T extends Iterable<U>, U> int findMaxAddressLength(Map<String,
T> dcs, ToIntFunction<U> computeLength)
{
- maxAddressLength = 0;
- for (Map.Entry<String, SetHostStat> dc : dcs.entrySet())
- {
- for (HostStat stat : dc.getValue())
- {
- maxAddressLength = Math.max(maxAddressLength,
stat.ipOrDns().length());
- }
- }
- }
+ int maxAddressLength = 0;
- private void findMaxAddressLengthWithPort(Map<String,
SetHostStatWithPort> dcs)
- {
- maxAddressLength = 0;
- for (Map.Entry<String, SetHostStatWithPort> dc : dcs.entrySet())
- {
- for (HostStatWithPort stat : dc.getValue())
- {
- maxAddressLength = Math.max(maxAddressLength,
stat.ipOrDns().length());
- }
- }
- Set<InetAddress> seenHosts = new HashSet<>();
- for (SetHostStat stats : dcs.values())
- for (HostStat stat : stats)
- if (seenHosts.add(stat.endpoint))
- maxAddressLength = Math.max(maxAddressLength,
stat.ipOrDns().length());
++ Set<U> seenHosts = new HashSet<>();
++ for (T stats : dcs.values())
++ for (U stat : stats)
++ if (seenHosts.add(stat))
++ maxAddressLength = Math.max(maxAddressLength,
computeLength.applyAsInt(stat));
+
+ return maxAddressLength;
}
- private void printNodesHeader(boolean hasEffectiveOwns, boolean
isTokenPerNode)
+ private void printNodesHeader(boolean hasEffectiveOwns, boolean
isTokenPerNode, int maxAddressLength)
{
- String fmt = getFormat(hasEffectiveOwns, isTokenPerNode);
+ String fmt = getFormat(hasEffectiveOwns, isTokenPerNode,
maxAddressLength);
String owns = hasEffectiveOwns ? "Owns (effective)" : "Owns";
if (isTokenPerNode)
@@@ -217,10 -148,11 +209,11 @@@
System.out.printf(fmt, "-", "-", "Address", "Load", "Tokens",
owns, "Host ID", "Rack");
}
- private void printNode(String endpoint, Float owns, List<HostStat>
tokens, boolean hasEffectiveOwns, boolean isTokenPerNode)
- private void printNode(String endpoint, Float owns, List<HostStat>
tokens, boolean hasEffectiveOwns,
++ private void printNode(String endpoint, Float owns, String epDns, String
token, int size, boolean hasEffectiveOwns,
+ boolean isTokenPerNode, int maxAddressLength)
{
String status, state, load, strOwns, hostID, rack, fmt;
- fmt = getFormat(hasEffectiveOwns, isTokenPerNode);
+ fmt = getFormat(hasEffectiveOwns, isTokenPerNode, maxAddressLength);
if (liveNodes.contains(endpoint)) status = "U";
else if (unreachableNodes.contains(endpoint)) status = "D";
else status = "?";
@@@ -229,7 -161,7 +222,7 @@@
else if (movingNodes.contains(endpoint)) state = "M";
else state = "N";
-- load = loadMap.containsKey(endpoint) ? loadMap.get(endpoint) : "?";
++ load = loadMap.getOrDefault(endpoint, "?");
strOwns = owns != null && hasEffectiveOwns ? new
DecimalFormat("##0.0%").format(owns) : "?";
hostID = hostIDMap.get(endpoint);
@@@ -241,47 -173,14 +234,27 @@@
throw new RuntimeException(e);
}
-- String endpointDns = tokens.get(0).ipOrDns();
if (isTokenPerNode)
-- System.out.printf(fmt, status, state, endpointDns, load, strOwns,
hostID, tokens.get(0).token, rack);
++ System.out.printf(fmt, status, state, epDns, load, strOwns,
hostID, token, rack);
else
-- System.out.printf(fmt, status, state, endpointDns, load,
tokens.size(), strOwns, hostID, rack);
++ System.out.printf(fmt, status, state, epDns, load, size, strOwns,
hostID, rack);
+ }
+
- private void printNodeWithPort(String endpoint, Float owns,
List<HostStatWithPort> tokens, boolean hasEffectiveOwns, boolean isTokenPerNode)
++ private void printNode(String endpoint, Float owns, List<HostStat>
tokens, boolean hasEffectiveOwns,
++ boolean isTokenPerNode, int maxAddressLength)
+ {
- String status, state, load, strOwns, hostID, rack, fmt;
- fmt = getFormat(hasEffectiveOwns, isTokenPerNode);
- if (liveNodes.contains(endpoint)) status = "U";
- else if (unreachableNodes.contains(endpoint)) status = "D";
- else status = "?";
- if (joiningNodes.contains(endpoint)) state = "J";
- else if (leavingNodes.contains(endpoint)) state = "L";
- else if (movingNodes.contains(endpoint)) state = "M";
- else state = "N";
-
- load = loadMap.containsKey(endpoint) ? loadMap.get(endpoint) : "?";
- strOwns = owns != null && hasEffectiveOwns ? new
DecimalFormat("##0.0%").format(owns) : "?";
- hostID = hostIDMap.get(endpoint);
-
- try
- {
- rack = epSnitchInfo.getRack(endpoint);
- } catch (UnknownHostException e)
- {
- throw new RuntimeException(e);
- }
++ printNode(endpoint, owns, tokens.get(0).ipOrDns(),
tokens.get(0).token, tokens.size(), hasEffectiveOwns,
++ isTokenPerNode, maxAddressLength);
++ }
+
- String endpointDns = tokens.get(0).ipOrDns();
- if (isTokenPerNode)
- System.out.printf(fmt, status, state, endpointDns, load, strOwns,
hostID, tokens.get(0).token, rack);
- else
- System.out.printf(fmt, status, state, endpointDns, load,
tokens.size(), strOwns, hostID, rack);
++ private void printNodeWithPort(String endpoint, Float owns,
List<HostStatWithPort> tokens, boolean hasEffectiveOwns,
++ boolean isTokenPerNode, int
maxAddressLength)
++ {
++ printNode(endpoint, owns, tokens.get(0).ipOrDns(),
tokens.get(0).token, tokens.size(), hasEffectiveOwns,
++ isTokenPerNode, maxAddressLength);
}
- private String getFormat(
- boolean hasEffectiveOwns,
- boolean isTokenPerNode)
+ private String getFormat(boolean hasEffectiveOwns, boolean
isTokenPerNode, int maxAddressLength)
{
if (format == null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
