Commit Graph

489 Commits

Author SHA1 Message Date
Jay Zhuang c0e7110f97 Add timeUnit Days for cassandra-stress
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13029
2016-12-12 06:22:37 -08:00
Stefania Alborghetti 12c63cf4a4 Fix inconsistencies in cassandra-stress load balancing policy
patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-12919
2016-11-24 08:56:04 +08:00
Alwyn d582d03408 Fix cassandra-stress truncate option
Patch by Alwyn Davis; reviewed by tjake for CASSANDRA-12695
2016-11-07 14:09:06 -05:00
Ben Slater 7c759e2c32 Add sequence distribution type to cassandra stress: fix problem with setSeed()
Patch by Ben Slater; reviewed by Stefania Alborghetti for CASSANDRA-12490
2016-10-24 11:09:04 +08:00
Guy Bolton King cbc792531f Show the correct value for JMX port in cassandra-stress settings
Patch by Guy Bolton King; reviewed by tjake for CASSANDRA-12759
2016-10-10 09:54:14 -04:00
T Jake Luciani 1bc736d935 Fix cassandra-stress to Use single seed in UUID generation
Patch by Chris Splinter; reviewed by tjake for CASSANDRA-12729
2016-10-10 09:50:29 -04:00
Alex Petrov 47c473ae3c CQLSSTableWriter does not allow Update statement
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-12450
2016-10-07 12:11:32 +08:00
Aleksey Yeschenko 8c95d376dc Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 16:22:06 +01:00
Denis Ranger db869bc774 Make stress use client mode to avoid checking commit log size on startup
Patch by Denis Ranger; Reviewed by Paulo Motta for CASSANDRA-12478
2016-10-04 16:10:52 +01:00
Yuki Morishita cf5cd158e9 Fix DatabaseDescriptorRefTest
patch by yukim; reviewed by Alex Petrov for CASSANDRA-12677
2016-09-30 09:57:37 -05:00
Jeremiah D Jordan 8206839328 DatabaseDescriptor should set some defaults to prevent NPE's.
Set Disk Optimization Strategy and Partitioner in DD.clientInitialization.

patch by Jeremiah Jordan; reviewed by Yuki Morishita for CASSANDRA-12667
2016-09-20 08:19:48 -05:00
Christopher Batey f42e235b1e Fix cassandra-stress graph option
Patch by Christopher Batey; reviewed by Joel Knighton for CASSANDRA-12237
2016-09-16 12:22:52 +02:00
Jeremiah D Jordan 0026e4eeec Put CQLSSTableWriter back to the old interface/behavior before CASSANDRA-11844
Patch by Jeremiah Jordan; reviewed by Jake Luciani for CASSANDRA-12551
2016-09-12 11:48:45 -04:00
nitsanw e73633cd81 Fix Cassandra Stress reporting thread model and precision
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12585
2016-09-07 10:14:20 -04:00
Dave Brosius 3c95d4731c use StringBuilder correctly 2016-09-04 12:19:16 -04:00
Ben Slater 11aeeea2cb fix errors in cassandra-stress print settings output
patch by bslater reviewed by dbrosius for CASSANDRA-12473
2016-09-03 23:05:35 -04:00
Chris Batey 03a3f9552c add Serializable to Stress settings for daemon mode
patch by cbatey reviewed by dbrosius for CASSANDRA-12564
2016-08-31 19:55:15 -04:00
Ben Slater df0cd441e2 post-fix for: Provide option for cassandra-stress to dump all settings
patch by Ben Slater; reviewed by Robert Stupp for CASSANDRA-11914
2016-08-25 13:02:03 +02:00
Ben Slater e4f6045806 Add sequence distribution type to cassandra stress
patch by Ben Slater; reviewed by Stefania Alborghetti for CASSANDRA-12490
2016-08-24 09:45:41 +08:00
Robert Stupp 9797511c56 Let DatabaseDescriptor not implicitly startup services
patch by Robert Stupp; reviewed by Blake Eggleston for CASSANDRA-9054
2016-08-18 11:44:03 +10:00
Ben Slater 938faa2169 Cassandra-stress should dump all settings on startup
Patch by Ben Slater; reviewed by tjake for CASSANDRA-11914
2016-08-08 11:07:05 -04:00
Robert Stupp 54836ec0c5 Make 'static final boolean' easier to optimize for Hotspot
patch by Robert Stupp; reviewed by Branimir Lambov for CASSANDRA-12343
2016-08-04 15:09:03 +02:00
Chris Batey eaf4b91ae3 Add version command to cassandra stress
Patch by Chris Batey; reviewed by tjake for CASSANDRA-12258
2016-08-01 12:25:23 -04:00
T Jake Luciani 47d3b7e7a0 compaction stress tool
patch by tjake; reviewed by Marcus Eriksson for CASSANDRA-11844
2016-08-01 11:06:52 -04:00
Dave Brosius 087264f29c imports cleanup 2016-07-16 12:40:05 -04:00
T Jake Luciani ab2f744042 Merge branch 'cassandra-3.9' into trunk 2016-07-08 10:45:46 -04:00
nitsanw c1dcc9ce46 Fix hdr logging for single operation workloads
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12145
2016-07-08 10:38:40 -04:00
Dave Brosius d019136ee4 use platform agnostic new line chars (%n) 2016-07-07 23:24:00 -04:00
Christopher Batey b73f581355 Add basic testing support for the Cassandra Stress tool
Patch by Christopher Batey; reviewed by Joel Knighton for CASSANDRA-11638
2016-07-04 14:48:52 +01:00
nitsanw 89f275c658 Introduce HdrHistogram and response/service/wait separation to stress tool
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-11853
2016-05-27 11:59:55 -04:00
T Jake Luciani 050516c534 Merge branch 'cassandra-3.7' into trunk 2016-05-18 09:12:53 -04:00
T Jake Luciani ad546832ff Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-18 09:12:31 -04:00
T Jake Luciani f73b48502d Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-18 09:10:06 -04:00
T Jake Luciani 89344f182a Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-18 09:09:43 -04:00
Eduard Tudenhoefner 9359af2ea5 CASSANDRA-10828: Allow usage of multiplier in start value of population sequence 2016-05-18 09:09:06 -04:00
Giampaolo Trapasso adbef79823 cassandra-stress should support case sensitive schemas
patch by Giampaolo Trapasso; reviewed by tjake for CASSANDRA-11546
2016-05-06 09:52:55 -04:00
Giampaolo Trapasso ff4d0f9abe Add units to stress output
Patch by Giampaolo Trapasso; reviewed by Tyler Hobbs for CASSANDRA-11352
2016-04-29 11:01:24 -05:00
Christopher Batey ba926ff6d8 (stress) Add datacenter option to -node options
patch by Christopher Batey; reviewed by Aleksey Yeschenko for
CASSANDRA-11591
2016-04-18 17:15:15 +01:00
T Jake Luciani fb13df431b Merge branch 'cassandra-3.0' into trunk 2016-04-18 10:01:29 -04:00
mck 99ea2ee716 CASSANDRA-11410 – Option to specify ProtocolVersion in cassandra-stress
Patch by mck; reviewed by tjake for CASSANDRA-11410
2016-04-18 09:58:31 -04:00
T Jake Luciani 7e5c6b597a Merge branch 'cassandra-3.5' into trunk 2016-03-31 10:18:19 -04:00
T Jake Luciani b80a31d7e0 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-31 10:18:02 -04:00
T Jake Luciani 067c8dfbe4 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-31 10:15:40 -04:00
Stefan Podkowinski 106750c78e Add cassandra-stress keystore option (CASSANDRA-9325)
* Prevents stress tool from checking keystore at .conf/keystore even if not needed
 * Adds keystore -transport option in case client verification is used on server

Patch by Stefan Podkowinski; reviewed by T Jake Luciani for CASSANDRA-9325
2016-03-31 10:09:24 -04:00
Cheng Ren 5beedbc662 cassandra-stress: cannot handle "value-less" tables
patch by Cheng Ren reviewed by Robert Stupp for CASSANDRA-7739
2016-03-28 19:30:22 +02:00
Stefania Alborghetti 7043744085 Make Stress exit with non-zero status after failure
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-10340
2016-03-17 15:38:46 +01:00
Stefania Alborghetti f27ab2908a Establish and implement canonical bulk reading workload(s)
patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-10331
2016-03-10 10:23:51 -05:00
Stefania Alborghetti 232e12b94c Establish and implement canonical bulk reading workload(s)
patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-10331
2016-03-10 10:22:17 -05:00
Robert Stupp b51f9495e5 Merge branch 'cassandra-3.0' into trunk 2016-02-04 19:33:21 +01:00
Robert Stupp f34036265e Hadoop integration is incompatible with Cassandra Driver 3.0.0
patch by Robert Stupp; reviewed by Jeremiah Jordan for CASSANDRA-11001
2016-02-04 19:30:50 +01:00
Dave Brosius bcbb53b7de close log file stream 2015-12-30 21:28:54 -05:00
Dave Brosius 4675b2089f avoid thread count Pattern matching if not running multiple thread counts 2015-12-27 15:13:41 -05:00
Robert Stupp 0f5e780781 Minor code improvements
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-10750
2015-12-18 09:14:57 -08:00
Benjamin Lerer abf7df3bd6 Merge branch cassandra-3.0 into trunk 2015-12-16 15:21:07 +01:00
Benjamin Lerer 363e7bd716 Merge branch cassandra-2.2 into cassandra-3.0 2015-12-16 15:19:20 +01: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
Benjamin Lerer 9bfe613579 Merge branch 'cassandra-3.0' into trunk 2015-12-14 10:37:39 +01:00
Benjamin Lerer 94e8d62cf8 Merge branch cassandra-2.2 into cassandra-3.0 2015-12-14 10:29:17 +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
Benjamin Lerer 4ca7a8cfdc Merge branch 'cassandra-3.1' into trunk 2015-12-03 21:39:34 +01:00
Benjamin Lerer 4b01e8fc5c Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-03 21:36:33 +01: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
T Jake Luciani c92dab5222 Merge branch 'cassandra-3.1' into trunk 2015-12-01 11:24:38 -05:00
T Jake Luciani 2af4fba7e5 improve error message for cassandra-stress schema errors
patch by tjake; reviewed by Jim Witschey for CASSANDRA-9984
2015-12-01 10:38:21 -05:00
T Jake Luciani d58a50b8cc Merge branch 'cassandra-3.1' into trunk 2015-11-25 09:04:55 -05:00
Ariel Weisberg a0076e70ee For CASSANDRA-7217, have stress calculate maximum # of pending requests based on thread count and allow manually specifying max pending requests per connection as well as # of connections
patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-7217
2015-11-25 09:02:02 -05:00
Robert Stupp 0010fce6d2 Merge branch 'cassandra-3.1' into trunk 2015-11-16 17:42:42 +01:00
Ryan McGuire e4467a0f6d Provide graphing tool w/cassandra-stress
Patch by rmcguire; reviewed by jmckenzie for CASSANDRA-7918
2015-10-21 15:40:26 -04:00
T Jake Luciani 16b9f8bba4 Choose better poolingOptions for protocol v4 in cassandra-stress
Patch by tjake; reviewed by Alan Boudreault for CASSANDRA-10182
2015-08-27 16:00:18 -04:00
Benedict Elliott Smith 342e33ffb1 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-23 11:30:57 +01:00
Benedict Elliott Smith a6d6540446 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-08-23 11:30:43 +01:00
phact 5bee617fea Support BigDecimal in cassanra-stress
patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048
2015-08-23 11:27:16 +01:00
Sam Tunnicliffe 06c130e3cb Move 2i metadata out of system_schema.columns and ColumnDefinition
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko and Robert Stupp
for CASSANDRA-6717
2015-08-18 14:59:44 +01:00
Benedict Elliott Smith 019471a567 sysexit on cassandra-stress main thread error
patch by benedict; reviewed by ryan for CASSANDRA-9864
2015-07-22 23:38:51 +01:00
T Jake Luciani 5e89136d10 Allow extra schema definitions in cassandra-stress yaml
Patch by tjake; reviewed by benedict for CASSANDRA-9850
2015-07-21 11:28:38 -04:00
T Jake Luciani f708c1e416 Fix default ratio in stress (ninja) 2015-07-02 10:52:27 -04:00
T Jake Luciani 6d29ed0662 New option for cassandra-stress to leave a ratio of columns null
Patch by tjake; reviewed by Jim Witschey for (CASSANDRA-9522)
2015-07-01 17:01:44 -04:00
T Jake Luciani 9a71238706 Merge branch 'cassandra-2.2' into trunk 2015-06-25 14:35:10 -04:00
Andrew Tolbert 26bd5124ef Optimize stress driver config for 2.2
Patch by Andrew Tolbert; reviewed by tjake for CASSANDRA-9558
2015-06-25 14:28:31 -04:00
Josh McKenzie bc9b0be321 Merge branch 'cassandra-2.2' into trunk 2015-06-24 12:13:15 -04:00
Stefania Alborghetti 01115f72fc 2.2 commit for CASSANDRA-9160 2015-06-24 12:11:46 -04:00
Stefania Alborghetti f797bfa4da Migrate CQL tests from dtest to unit tests
Patch by stefania; reviewed by jmckenzie for CASSANDRA-9160
2015-06-24 12:10:29 -04:00
Josh McKenzie 115ed236aa Merge branch 'cassandra-2.2' into trunk 2015-06-22 17:27:46 -04:00
Josh McKenzie d6d32d26ff Change Windows Kernel default timer resolution
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9634
2015-06-22 17:27:08 -04:00
Chris Burroughs 8c19fd638d undeprecate cache recentHitRate metrics
patch by Chris Burroughs; reviewed by benedict for CASSANDRA-6591
2015-06-12 12:22:30 +01:00
stefania 17dd4ccc78 Remove FileCacheService, instead pooling buffers
patch by stefania and benedict for CASSANDRA-8897
2015-06-09 10:08:24 +01:00
Dave Brosius e994805749 simplify throws clauses wrt Thrift 2015-05-17 15:39:03 -04:00
T Jake Luciani a16c4fe0a5 Remove thrift schema creation when native driver is used
Patch by tjake; reviewed by Aleksey Yeschenko for CASSANDRA-9374
2015-05-15 09:40:03 -04:00
T Jake Luciani d26bfe9a4d fix stress to not use thrift unless requested 2015-05-12 15:37:45 -04:00
T Jake Luciani 5893472e7e Merge branch 'cassandra-2.1' into trunk 2015-05-12 14:55:07 -04:00
T Jake Luciani 8b5434f3df Add missing consistency levels to cassandra-stress
Patch by Mario Lazaro; reviewed by tjake for CASSANDRA-9361
2015-05-12 14:53:10 -04:00
Dave Brosius 2da468d9bb Merge branch 'cassandra-2.1' into trunk 2015-05-08 16:09:04 -04:00
Dave Brosius def6b5fa19 fixup last fix for bad lock guard 2015-05-08 16:08:36 -04:00
Dave Brosius 81c93084ba Merge branch 'cassandra-2.1' into trunk 2015-05-08 15:59:37 -04:00
Dave Brosius b66475c4e0 make sure lock gets unlocked 2015-05-08 15:58:54 -04:00
Dave Brosius 2096bcefd5 remove dead collections 2015-05-04 21:58:52 -04:00
Benedict Elliott Smith ed08402999 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java
	tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
2015-05-04 18:03:43 +01:00
Benedict Elliott Smith 3bee990ca2 cassandra-stress supports validation operations over user profiles
patch by benedict; reviewed by snazy for CASSANDRA-8773
2015-05-04 18:01:38 +01:00
Dave Brosius 87ef146b4c use short circuiting ops 2015-04-01 19:16:40 -04:00
Benedict Elliott Smith 6ad51477b0 Merge branch 'cassandra-2.1' into trunk 2015-03-24 13:42:53 +00:00
Benedict Elliott Smith 6b979f3191 permit n=1 in cassandra-stress 2015-03-24 13:42:48 +00:00
Dave Brosius b274aa1c7f use short-circuiting ops 2015-03-15 19:20:01 -04:00
T Jake Luciani f843b42e87 Merge branch 'cassandra-2.1' into trunk 2015-03-11 12:59:55 -04:00
T Jake Luciani 4646014851 Fix cassandra-stress so it respects the CL passed in user mode
patch by tjake; reviewed by benedict for CASSANDRA-8948
2015-03-11 12:47:08 -04:00
Benedict Elliott Smith e585c339d0 Merge branch 'cassandra-2.1' into trunk 2015-03-10 17:43:17 +00:00
Benedict Elliott Smith 81fe1a2a86 ninja fix cassandra-stress rank latencies 2015-03-10 17:43:06 +00:00
Benedict Elliott Smith 97d65d6d36 include missing files 2015-03-10 17:13:46 +00:00
Benedict Elliott Smith b7563f823e include missing files 2015-03-10 17:12:31 +00:00
Benedict Elliott Smith a0586f6929 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
2015-03-10 14:26:30 +00:00
Benedict Elliott Smith 6bbfb5574e cassandra-stress prints per operation statistics, plus misc other stress updates
patch by anthony cozzie, reviewed by benedict for CASSANDRA-8769
2015-03-10 14:19:23 +00:00
T Jake Luciani b2d16f4cdd Merge branch 'cassandra-2.1' into trunk 2015-03-04 16:37:17 -05:00
T Jake Luciani 4176f9e78c make stress read-lookback optional 2015-03-04 16:36:33 -05:00
T Jake Luciani 4a1879c235 Merge branch 'cassandra-2.1' into trunk 2015-03-04 16:29:34 -05:00
T Jake Luciani 213b066957 ninja change stress read-lookback default to none 2015-03-04 16:28:56 -05:00
Benedict Elliott Smith a4221b7213 Merge branch 'cassandra-2.1' into trunk 2015-03-04 16:44:42 +00:00
Sebastian Estevez 7712e0ef07 cassandra-stress support for varint
patch by sebastian estevez; reviewed by benedict for CASSANDRA-8882
2015-03-04 16:44:14 +00:00
Dave Brosius dd825a5f06 Merge branch 'cassandra-2.1' into trunk 2015-03-03 21:54:03 -05:00
Dave Brosius 9499f7cb98 use long math for long results 2015-03-03 21:50:23 -05:00
Benedict Elliott Smith 62ee1473be Merge branch 'cassandra-2.1' into trunk 2015-02-11 16:39:14 +00:00
Benedict Elliott Smith f57ec8c464 ninja-fix literal escape string 2015-02-11 16:39:06 +00:00
Benedict Elliott Smith 827ad24389 Merge branch 'cassandra-2.1' into trunk 2015-02-11 16:12:14 +00:00
Benedict Elliott Smith c643bbc8d1 ninja fix whitespace parsing in cassandra-stress
patch by benedict; reviewed by jake for CASSANDRA-8648
2015-02-11 16:11:38 +00:00
Benedict Elliott Smith 24bc6a0386 Merge branch 'cassandra-2.1' into trunk 2015-01-28 22:51:01 +00:00
Benedict Elliott Smith 7cd1102606 Update tools/stress/README.txt
patch by ptnapoleon; reviewed by benedict for CASSANDRA-7933
2015-01-28 22:49:33 +00:00
Dave Brosius b30cdd9a7e import cleanups 2015-01-25 22:03:22 -05:00
Benedict Elliott Smith 184bb65fca Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
2015-01-21 16:52:20 +00:00
Benedict Elliott Smith 1435b9a87a Fix cassandra-stress user-mode truncation of partition generation
patch by benedict; reviewed by tjake for CASSANDRA-8608
2015-01-21 16:50:55 +00:00
T Jake Luciani 977cbddc44 Merge branch 'cassandra-2.1' into trunk 2014-12-22 09:01:01 -05:00
T Jake Luciani 29ff2d26f8 Cassandra stress user defined writes should populate sequentially
Patch by tjake; reviewed by Benedict for CASSANDRA-8524
2014-12-22 08:59:12 -05:00
Benedict Elliott Smith e6c5982fa3 Merge branch 'cassandra-2.1' into trunk 2014-12-17 09:28:17 +00:00
Benedict Elliott Smith f852401166 fix up misapply of CASSANDRA-7964 nits 2014-12-17 09:27:47 +00:00
T Jake Luciani dc1bc81f6a Merge branch 'cassandra-2.1' into trunk 2014-12-16 15:27:43 -05:00
T Jake Luciani 93f679e00f Add missing consistency levels to cassandra-stress
Patch by Liang Xie; Reviewed by tjake for CASSANDRA-8253
2014-12-16 15:24:40 -05:00
T Jake Luciani 9acf97a897 Merge branch 'cassandra-2.1' into trunk 2014-12-15 11:39:24 -05:00
T Jake Luciani f0767fdf49 avoid mixed case ks/table names in stress (ninja) 2014-12-15 11:39:00 -05:00
T Jake Luciani 088ffb2b50 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java
2014-12-15 10:51:30 -05:00
T Jake Luciani a78451e5c6 Add auth support to cassandra-stress
Path by Mike Adamson; reviewed by tjake for CASSANDRA-7985
2014-12-15 10:39:55 -05:00
Benedict Elliott Smith 5876d93424 Merge branch 'cassandra-2.1' into trunk 2014-12-12 15:07:34 +00:00
Benedict Elliott Smith 597a1d5db2 cassandra-stress simultaneous inserts over same seed
(take two)

patch by benedict; reviewed by rstupp CASSANDRA-7964
2014-12-12 15:07:15 +00:00
Benedict Elliott Smith 36280a0783 Merge branch 'cassandra-2.1' into trunk 2014-12-12 14:10:04 +00:00
Benedict Elliott Smith 6c579a0102 cassandra-stress simultaneous inserts over same seed
patch by benedict; reviewed by rstupp CASSANDRA-7964
2014-12-12 14:09:37 +00:00
Benedict Elliott Smith add839d317 Merge branch 'cassandra-2.1' into trunk 2014-12-12 13:44:52 +00:00
Benedict Elliott Smith cdba5aac9b Reduce cassandra-stress sampling memory requirements
patch by benedict; reviewed by branimir for CASSANDRA-7926
2014-12-12 13:44:34 +00:00
T Jake Luciani 7d9acdb107 Merge branch 'cassandra-2.1' into trunk 2014-12-08 10:21:52 -05:00
T Jake Luciani c1610f6daf Add errors setting to stress help, ninja 2014-12-08 10:20:14 -05:00
T Jake Luciani 25314c2046 Merge branch 'cassandra-2.1' into trunk 2014-12-01 16:06:53 -05:00
T Jake Luciani 9c0f5753f3 Improve error message when stress is having GC issues (ninja) 2014-12-01 16:05:09 -05:00
Tyler Hobbs fb4356a36a Merge branch 'cassandra-2.1' into trunk
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/TypeParser.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
2014-11-11 13:33:31 -06:00
Tyler Hobbs ee55f361b7 Support for frozen collections
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7859
2014-11-11 12:40:48 -06:00
Jake Luciani 19c2d22e93 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	NEWS.txt
	build.xml
2014-11-05 16:04:24 -05:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -05:00
T Jake Luciani 030aa57cd2 Merge branch 'cassandra-2.1' into trunk 2014-10-29 21:23:38 -04:00
T Jake Luciani bb8cc62146 add jmxPort to stress args (ninja) 2014-10-29 21:23:07 -04:00
Jake Luciani 54e4247812 Merge branch 'cassandra-2.1' into trunk 2014-10-07 12:22:14 -04:00
Jake Luciani 67d476d7c3 Force exit vs trying to cleanup all threads for stress 2014-10-07 12:21:06 -04:00
Jake Luciani bc246e1326 Merge branch 'cassandra-2.1' into trunk 2014-10-06 10:38:03 -04:00
Jake Luciani a8052d7c81 Fix more stress bugs (ninja) 2014-10-06 10:36:41 -04:00
Jake Luciani 50c5da991c Merge branch 'cassandra-2.1' into trunk 2014-10-03 16:59:30 -04:00
Jake Luciani aca80da38c ninja add support for yaml profile as a url 2014-10-03 16:59:03 -04:00
Benedict Elliott Smith 7762518745 Merge branch 'cassandra-2.1' into trunk 2014-09-20 08:44:43 +01:00
Benedict Elliott Smith eecc034b68 ninja-fix stress: rate limit not honoured for warmup, and 'auto' rate mode optional with thread ranges 2014-09-20 08:44:37 +01:00
Benedict Elliott Smith 8215744ffb Merge branch 'cassandra-2.1' into trunk 2014-09-16 20:48:57 +01:00
Benedict Elliott Smith 109313c3ed cassandra-stress: fix support for NetworkTopologyStrategy
patch by benedict; reviewed by yukim for CASSANDRA-7945
2014-09-16 20:48:29 +01:00
Benedict Elliott Smith 7fc0e9efea Merge branch 'cassandra-2.1' into trunk 2014-09-16 06:29:00 +01:00
Benedict Elliott Smith 4efb6dc8c1 ninja fix cassandra-stress pre-2.1.1 compatibility 2014-09-16 06:28:01 +01:00
Dave Brosius ff6042968c use %n for newlines in printfs 2014-09-15 23:54:40 -04:00
Jake Luciani 7b5164f398 Merge branch 'cassandra-2.1' into trunk 2014-09-15 12:22:09 -04:00
Jake Luciani b3573f3d3b Better error checking of stress profile
patch by tjake; reviewed by belliottsmith for CASSANDRA-7716
2014-09-15 12:20:43 -04:00
Benedict Elliott Smith 969967cf9f Merge branch 'cassandra-2.1' into trunk 2014-09-15 16:56:50 +01:00
Benedict Elliott Smith 6bff5a3318 ninja-fix cassandra-stress totalGcStats metric 2014-09-15 16:56:45 +01:00
Benedict Elliott Smith 58985409c9 Merge branch 'cassandra-2.1' into trunk 2014-09-14 13:51:08 +01:00
Benedict Elliott Smith a6678a273d ninja fix rethrow InterruptedException in cassandra-stress Timing.snap 2014-09-14 13:50:38 +01:00
Benedict Elliott Smith 14b1c96072 Merge branch 'cassandra-2.1' into trunk 2014-09-14 09:13:44 +01:00
Benedict Elliott Smith eea042b0b0 cassandra-stress supports whitelist mode for node config
patch by benedict; reviewed by tjake for CASSANDRA-7658
2014-09-14 09:13:18 +01:00
Benedict Elliott Smith 477c54c03c Merge branch 'cassandra-2.1' into trunk 2014-09-14 09:09:57 +01:00
Benedict Elliott Smith 0e652e7548 GCInspector more closely tracks GC; cassandra-stress and nodetool report it
patch by benedict; reviewed by tjake
2014-09-14 09:09:37 +01:00
Brandon Williams 965f5227bb Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk 2014-09-12 12:16:58 -05:00
Brandon Williams 314b1f1770 Don't use _ as a reference 2014-09-12 12:16:47 -05:00
Benedict Elliott Smith 1963b7f032 Merge branch 'cassandra-2.1' into trunk 2014-09-11 12:36:08 +07:00
Benedict Elliott Smith 73b2dcc165 cassandra-stress: ninja fix profile param for user command to required, and print required fields first 2014-09-11 12:35:29 +07:00
Benedict Elliott Smith 51a6f0f7fa Merge branch 'cassandra-2.1' into trunk 2014-09-11 11:28:36 +07:00
Benedict Elliott Smith 530c9f52c3 cassandra-stress: merge 7468 into 2.1, and ninja-fix duration setting for user command 2014-09-11 11:27:34 +07:00
Dave Brosius 1198df4beb Merge branch 'cassandra-2.1' into trunk 2014-09-08 22:21:59 -04:00
Dave Brosius 4bdbdc1e39 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-08 22:21:13 -04:00
Dave Brosius 852f084f03 fix stress metrics format strings 2014-09-08 22:20:29 -04:00
Benedict Elliott Smith a44d641e8f fix merge of 7519 2014-09-08 08:06:36 +07:00
Benedict Elliott Smith eec381e0d6 fixup 2014-09-07 21:32:55 +07:00
Benedict Elliott Smith b170b3caa2 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/StressAction.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
2014-09-07 21:32:36 +07:00
Benedict Elliott Smith 77d0c17574 Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
2014-09-07 21:23:52 +07:00
Benedict Elliott Smith 0580fb2b77 Improve stress workload realism
patch by benedict; reviewed by tjake for CASSANDRA-7519
2014-09-07 21:19:58 +07:00
Dave Brosius 5cc7a11ab8 fix boxing confusion 2014-09-06 14:39:54 -04:00
Dave Brosius 182051c453 simplify/avoid possible npes 2014-09-06 14:22:08 -04:00
Jonathan Ellis f47863e13c fix warnings for _ as identifier
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7675
2014-08-04 07:28:58 -05:00
Benedict Elliott Smith c0fc698826 Merge branch 'cassandra-2.1' into trunk 2014-08-01 21:49:28 +01:00
Benedict Elliott Smith 24f6f038ef Fix serialization of command ratios in cassandra-stress/stressd
patch by rspitzer; reviewed by benedict for CASSANDRA-7559
2014-08-01 21:48:19 +01:00
Benedict Elliott Smith 63393eb248 Merge branch 'cassandra-2.1' into trunk 2014-08-01 21:39:56 +01:00
Benedict Elliott Smith a182ea00ba Fix column name serialization for cassandra-stress/stressd
patch by rspitzer; reviewed by benedict for CASSANDRA-7608
2014-08-01 21:37:55 +01:00
Jake Luciani e3fa11bf4a Merge branch 'cassandra-2.1' into trunk 2014-08-01 09:33:46 -04:00