Commit Graph

17711 Commits

Author SHA1 Message Date
Paulo Motta 9dd2b5ea0f Fix cqlshlib tests on Windows
patch by Paulo Motta; reviewed by Jim Witschey for CASSANDRA-10541
2015-12-18 22:46:31 +00:00
ZhaoYang b03ce9fd47 Add new types to Stress
patch by ZhaoYang; reviewed by Benjamin Lerer for CASSANDRA-9556
2015-12-16 15:06:06 +01:00
Aleksey Yeschenko 57d558fc1e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-15 21:37:09 +00:00
Stefania Alborghetti 124f1bd261 (cqlsh) further optimise COPY FROM
patch by Stefania Alborghetti; reviewed by Adam Holmberg for
CASSANDRA-9302
2015-12-15 21:03:31 +00:00
T Jake Luciani de55c39cd2 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-15 14:16:55 -05:00
T Jake Luciani 994250c8d3 stableloader will fail if there are collections in the schema tables
Fix and new testcase

Patch by tjake; reviewed by Aleksey Yeschenko for CASSANDRA-10700
2015-12-15 14:15:12 -05:00
Marcus Eriksson 85c724183a Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-15 10:06:44 +01:00
Branimir Lambov cee35e42d0 Allow CREATE TABLE WITH ID
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-9179
2015-12-15 09:58:42 +01:00
Benjamin Lerer 263763ab9b Merge branch cassandra-2.1 into cassandra-2.2 2015-12-14 10:28:05 +01:00
Benjamin Lerer 9b30d6572f Make Stress compiles within eclipse
patch by Benjamin Lerer; reviewed by Jake Luciani for CASSANDRA-10807
2015-12-14 10:22:30 +01:00
Robert Stupp 6ff7c9ce98 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-11 16:51:04 -06:00
Robert Stupp dff2214595 Cassandra Daemon should print JVM arguments
patch by Robert Stupp; reviewed by Michael Shuler for CASSANDRA-10764
2015-12-11 16:50:34 -06:00
Paulo Motta 94c361d1a7 Add property to allow listening on broadcast_address (CASSANDRA-9748)
patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-9748
2015-12-11 17:56:45 +01:00
Marcus Eriksson f166749495 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-11 17:32:31 +01:00
Carl Yeksigian fc7075a418 Allow cancellation of index summary redistribution
Patch by Carl Yeksigian; reviewed by marcuse for CASSANDRA-8805
2015-12-11 17:20:18 +01:00
Stefania Alborghetti 7dd6b7de28 Fix 2 cqlshlib tests
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
2015-12-11 11:50:17 +01:00
Sylvain Lebresne 1425f311db Merge commit '95dab2730da5a046ffdd550e72c66d1847cf9d8f' into cassandra-2.2 2015-12-11 11:49:37 +01:00
Stefania Alborghetti 95dab2730d Rename copy.py to copyutil.py in cqlshlib
explanation

patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
2015-12-11 11:48:15 +01:00
Sylvain Lebresne b4d3ac40b3 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-11 10:25:19 +01:00
Carl Yeksigian 9135340a13 Warn if system_traces not available for CASSANDRA-9628 2015-12-11 10:23:14 +01:00
Artem Aliev 4f3e47bf9e Fix regression in split size on CqlInputFormat
Patch by aaliev; reviewed by jmckenzie for CASSANDRA-10835
2015-12-10 12:33:58 -05:00
Stefan Podkowinski c8493c41ec Explicitly handle SSL handshake errors during connect()
patch by Stefan Podkowinski; reviewed by aweisberg for CASSANDRA-10816

Any IOException before this patch has just been logged to debug and
retried in case of outgoing connections. Any issues with SSL
certificates would only be reported in case the log level is set to
debug, which won't be the case on most clusters. The existing retry
loop for the outgoing connect() call would also not make much sense
in case of SSL handshake errors and cause unnecessary load while
constantly running into the same handshake error again.
2015-12-10 17:29:50 +01:00
Marcus Olsson 879c49bb7d 9474 2.2 2015-12-04 14:22:36 -05:00
Joshua McKenzie 1a00f001fa Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-04 14:22:02 -05:00
Marcus Olsson f6deca3db2 Disable reloading of GossipingPropertyFileSnitch
Patch by molsson; reviewed by pmotta for CASSANDRA-9474
2015-12-04 14:21:15 -05:00
Joshua McKenzie c8136b98f2 10585-2.2 patch 2015-12-04 13:18:10 -05:00
Joshua McKenzie d1e93e97e6 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-04 13:17:48 -05:00
Ivan Burmistrov acdbba7957 Fix SSTablesPerReadHistogram when row cache hit
Patch by iburmistrov; reviewed by cyeksigian for CASSANDRA-10585
2015-12-04 13:15:54 -05:00
Joel Knighton a4c767efb5 Add stats back to nodetool tpstats output
Patch by jknighton; reviewed by pmotta for CASSANDRA-10018
2015-12-04 13:07:37 -05:00
Benjamin Lerer 7e3e1191b9 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-03 21:30:45 +01:00
Benjamin Lerer b876424228 Fix stress profile parsing on Windows
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-10808
2015-12-03 21:25:42 +01:00
Sam Tunnicliffe 15f03ab446 Always verify expected tables in pseudo-system keyspaces at startup
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10761
2015-12-03 11:44:25 +00:00
Tyler Hobbs e491f05b71 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 15:32:16 -06:00
Tyler Hobbs b85da71961 Increase unit test timeout from 1m to 4m
The new timeout matches what we've been using in CI for some time now.
2015-12-02 15:31:10 -06:00
T Jake Luciani 16045358a4 bump 2.2 versions 2015-12-02 10:53:01 -05:00
T Jake Luciani 73a1c2c1fa Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 10:51:15 -05:00
T Jake Luciani a6619e56b1 bump 2.1 versions 2015-12-02 10:50:22 -05:00
Yuki Morishita 9751eb5c32 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 08:49:32 -06:00
Yuki Morishita 1538c09214 Fix incremental repair hang when replica is down
patch by yukim; reviewed by marcuse for CASSANDRA-10288
2015-12-02 08:41:11 -06:00
Marcus Eriksson 882df8a217 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 15:06:43 +01:00
Branimir Lambov 0b26ca6874 Avoid writing range tombstones after END_OF_ROW marker.
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-10791
2015-12-02 14:59:11 +01:00
Sam Tunnicliffe 29ed6fe2ed Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 13:14:53 +00:00
Paulo Motta 51753263a4 Revert changes to names of public methods on Gossiper
Patch and review by Paulo Motta and Stefania Alborghetti to
follow up CASSANDRA-10243
2015-12-02 13:05:37 +00:00
Marcus Eriksson 9f19dd4e4e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 08:53:33 +01:00
Marcus Eriksson dbfeeac177 Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
2015-12-02 08:37:08 +01:00
Ariel Weisberg a320737b18 Fix integer overflow in DataOutputBuffer doubling and test as best as possible given that allocating 2 gigs in a unit test is problematic.
Patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-10592
2015-12-01 22:34:28 -05:00
Yuki Morishita 2491ede351 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-01 13:05:36 -06:00
Stefania 1b81ad19d3 Fix completion problems in cqlsh
Patch by stefania; reviewed by pmotta for CASSANDRA-10753
2015-12-01 13:52:09 -05:00
Paulo Motta 5ba69a3259 Add proper error handling to stream receiver
patch by Paulo Motta; reviewed by yukim for CASSANDRA-10774
2015-12-01 11:53:35 -06:00
Robert Stupp 8738087edd fix: show CQL help in cqlsh in web browser
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
2015-12-01 10:39:05 +01:00