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

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Ariel Weisberg 2019-02-13 12:58:47 -05:00
parent 92f9568de6 4013eacd9d
commit 2a7091616e
2 changed files with 77 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -343,6 +343,10 @@
* 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
* Add missing commands to nodetool_completion (CASSANDRA-14916)
* Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)

82
debian/nodetool-completion vendored
View File

@ -53,24 +53,44 @@ have nodetool && have cqlsh &&
_get_comp_words_by_ref cur prev
local shopt='
cfstats
compactionstats
bootstrap
clientstats
compactionhistory
compactionstats
decommission
describecluster
disableauditlog
disablebackup
disablebinary
disablefullquerylog
disablegossip
disablehandoff
disablehintsfordc
disableoldprotocolversions
drain
enableauditlog
enablebackup
enablebinary
enablefullquerylog
enablegossip
enablehandoff
enablehintsfordc
enableoldprotocolversions
failuredetector
gcstats
getbatchlogreplaythrottle
getcompactionthroughput
getconcurrentcompactors
getconcurrentviewbuilders
getinterdcstreamthroughput
getlogginglevels
getmaxhintwindow
getseeds
getstreamthroughput
gettimeout
gettraceprobability
gossipinfo
handoffwindow
help
invalidatecountercache
invalidatekeycache
@ -80,20 +100,38 @@ have nodetool && have cqlsh &&
pausehandoff
proxyhistograms
rangekeysample
refreshsizeestimates
reloadlocalschema
reloadseeds
reloadssl
reloadtriggers
repair_admin
replaybatchlog
resetfullquerylog
resetlocalschema
resumehandoff
ring
setbatchlogreplaythrottle
setconcurrentcompactors
setconcurrentviewbuilders
sethintedhandoffthrottlekb
setinterdcstreamthroughput
setlogginglevel
setmaxhintwindow
settimeout
status
statusbackup
statusbinary
statusgossip
statushandoff
stopdaemon
tablestats
tpstats
version
'
local lngopt='
cfhistograms
assassinate
cleanup
clearsnapshot
compact
@ -101,15 +139,20 @@ have nodetool && have cqlsh &&
disableautocompaction
enableautocompaction
flush
garbagecollect
getcompactionthreshold
getendpoints
getreplicas
getsstables
import
info
move
netstats
profileload
rebuild
rebuild_index
refresh
relocatesstables
removenode
repair
scrub
@ -120,28 +163,41 @@ have nodetool && have cqlsh &&
setstreamthroughput
settraceprobability
snapshot
statusautocompaction
stop
taketoken
tablehistograms
toppartitions
truncatehints
upgradesstables
'
verify
viewbuildstatus
'
local optwks='
cfhistograms
cleanup
clearsnapshot
compact
describering
flush
garbagecollect
getcompactionthreshold
getendpoints
getreplicas
getsstables
import
profileload
rebuild_index
refresh
relocatesstables
repair
scrub
setcompactionthreshold
snapshot
statusautocompaction
tablehistograms
toppartitions
verify
viewbuildstatus
'
local optwcfs='
@ -150,9 +206,17 @@ have nodetool && have cqlsh &&
disableautocompaction
enableautocompaction
flush
garbagecollect
getreplicas
import
profileload
relocatesstables
repair
scrub
statusautocompaction
toppartitions
upgradesstables
verify
'
if [[ $COMP_CWORD -eq 1 ]] ; then
@ -174,14 +238,14 @@ have nodetool && have cqlsh &&
return 0
;;
stop)
COMPREPLY=( $(compgen -W "COMPACTION VALIDATION CLEANUP SCRUB INDEX_BUILD" -- "${cur}") )
COMPREPLY=( $(compgen -W "COMPACTION VALIDATION CLEANUP SCRUB VERIFY INDEX_BUILD" -- "${cur}") )
return 0
;;
info)
COMPREPLY=( $(compgen -W "-T --tokens" -- "${cur}") )
return 0
;;
rebuild)
rebuild|disablehintsfordc|enablehintsfordc)
show_datacenters "${cur}"
return 0
;;
@ -194,7 +258,7 @@ have nodetool && have cqlsh &&
fi
elif [[ $COMP_CWORD -eq 3 ]] ; then
case "${COMP_WORDS[1]}" in
cfhistograms|cleanup|compact|flush|getcompactionthreshold|getendpoints|getsstables|rebuild_index|refresh|repair|scrub|setcompactionthreshold)
cleanup|compact|flush|garbagecollect|getcompactionthreshold|getendpoints|getreplicas|getsstables|import|profileload|rebuild_index|refresh|relocatesstables|repair|scrub|setcompactionthreshold|statusautocompaction|tablehistograms|toppartitions|verify)
show_cfs ${prev} ${cur}
return 0
;;