natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,117 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

489 Commits

Author SHA1 Message Date
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
Jake Luciani 1921b98599 Make default stress batches logged 2014-08-01 09:32:31 -04:00
Jake Luciani 7633d92058 Merge branch 'cassandra-2.1' into trunk 2014-08-01 09:25:21 -04:00
Jake Luciani d667556d06 remove seed from stress profile. cleanup yamls. ninja 2014-08-01 09:23:02 -04:00
Benedict Elliott Smith 7ea7c5d9f0 Merge branch 'cassandra-2.1' into trunk 2014-07-23 15:29:36 +02:00
Benedict Elliott Smith fe1ed96d74 Add duration mode to cassandra-stress 
patch by Matt Kennedy and Benedict for CASSANDRA-7468
 2014-07-23 15:29:23 +02:00
Dave Brosius 453292f3c6 no need to enforce case, when using equalsIgnoreCase 2014-07-21 17:41:43 -04:00
Aleksey Yeschenko 111f0c0f91 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	debian/changelog
 2014-07-08 20:21:26 +03:00
Sylvain Lebresne 0bc98414ce Update versions and licenses for 2.1 RC3 release 2014-07-08 14:07:17 +02:00
Benedict Elliott Smith 047c04611b Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/Operation.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/ThriftInserter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterAdder.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterGetter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlInserter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlReader.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java
 2014-07-07 18:34:02 +01:00
Benedict Elliott Smith 75364296cb Introduce CQL support for stress tool 
patch by Jake Luciani and Benedict Elliott Smith
 2014-07-07 18:25:11 +01:00
Aleksey Yeschenko f20b097821 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	doc/cql/CQL.textile
	src/java/org/apache/cassandra/cql/CFPropDefs.java
 2014-07-03 21:41:28 +03:00
Aleksey Yeschenko 92cb551ae3 Remove left-over populate_io_cache_on_flush and replicate_on_write uses 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7493
 2014-07-03 21:35:39 +03:00
stinkymatt 2a3e2021f1 Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) 
patch by Matt Kennedy; reviewed by Benedict Elliott Smith for CASSANDRA-7416
 2014-06-23 21:41:19 +01:00
Sylvain Lebresne d8490ccea1 Merge branch 'cassandra-2.1' into trunk 2014-05-01 18:00:31 +02:00
Sylvain Lebresne 48727b4ccb Update versions and add licenses for 2.1-beta2 release 2014-05-01 16:40:15 +02:00
Dave Brosius 43f19eb576 trivial StringBuilder usage fixes 2014-04-30 18:15:43 -04:00
Jason Brown 5bbc54fe70 merged cassandra-2.1 to trunk (for CASSANDRA-7033) 2014-04-22 10:37:49 -07:00
Jason Brown a16adba9b8 fix cassandra stress errors on reads with native protocol 
patch by belliottsmith; reviewed by jasobrown for CASSANDRA-7033
 2014-04-22 10:09:58 -07:00
Aleksey Yeschenko 7358fe3180 Merge branch 'cassandra-2.1' into trunk 2014-03-26 22:04:58 +03:00
Benedict Elliott Smith ebaa755b1b Remove adjusted op rate from stress output 
patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-6921
 2014-03-26 22:04:06 +03:00
Aleksey Yeschenko 74290df23e Merge branch 'cassandra-2.1' into trunk 2014-03-21 04:08:14 +03:00
Benedict Elliott Smith 53e22120d0 Fix off-by-one error in stress 
patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-6883
 2014-03-21 04:07:08 +03:00
Sylvain Lebresne 49642e7bf8 Merge branch 'cassandra-2.1' into trunk 2014-03-20 18:25:45 +01:00
belliottsmith cbf304ebd0 Update native server to Netty 4 
patch by benedict; reviewed by slebresne for CASSANDRA-6236
 2014-03-20 18:23:53 +01:00
Pavel Yaskevich 7aaa390b94 Merge branch 'cassandra-2.1' into trunk 2014-03-13 18:04:24 -07:00
Pavel Yaskevich 89338a160b Add logging levels (minimal, normal or verbose) to stress tool 
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6849
 2014-03-13 18:01:29 -07:00
Pavel Yaskevich df43d4e73d Fix stress smart Thrift client to pick servers correctly 
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6848
 2014-03-13 17:52:24 -07:00
Pavel Yaskevich 46ed72d731 Merge branch 'cassandra-2.1' into trunk 2014-03-13 14:57:11 -07:00
Pavel Yaskevich 92381fd269 Fix help message for stress counter_write 
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6824
 2014-03-13 14:56:52 -07:00
Pavel Yaskevich 67feb71eef Merge branch cassandra-2.1 into trunk 2014-03-13 14:21:49 -07:00
Pavel Yaskevich 3e2c610577 Fix stress to do proper counter reads 
Patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6835
 2014-03-12 16:57:47 -07:00
Jonathan Ellis 5bc76b97e4 Merge branch 'cassandra-2.1' into trunk 2014-03-11 13:01:16 -05:00
Jonathan Ellis 8e360f80f4 Allow cassandra-stress to set compaction strategy options 
patch by Benedict Elliott Smith; reviewed by Russell Spitzer for CASSANDRA-6451
 2014-03-11 13:01:10 -05:00
Sylvain Lebresne 87318ef9f4 Merge branch 'cassandra-2.1' into trunk 2014-03-04 12:09:05 +01:00
Sylvain Lebresne ce94010b9b Update java-driver to 2.0 final for stress 
patch by djatnieks; reviewed by slebresne for CASSANDRA-6777
 2014-03-04 12:07:49 +01:00
Aleksey Yeschenko 2621707128 Remove CQL2 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5918
 2014-02-20 22:36:28 +03:00
Sylvain Lebresne 9f14856234 Versions and licenses in preparation for 2.1.0-beta1 release 2014-02-17 17:06:10 +01:00
belliottsmith c869087267 fix isDeterministic + CqlReader 2014-02-13 16:39:16 +00:00
Dave Brosius 4334f99f4b remove dead params 2014-02-12 21:13:12 -05:00
Dave Brosius 951fc85549 use long math for long results 2014-02-12 20:59:58 -05:00
belliottsmith 10b617364e Improvements and fixes to cassandra/stress 
Patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6691
 2014-02-12 17:25:07 -08:00
Sylvain Lebresne 0d0acac6c5 Fix stress 2014-02-12 18:27:32 +01:00
belliottsmith 84f2b8908e iss-6691 2014-02-12 11:36:35 +00:00
Dave Brosius 319877fda8 no need to call toString on a String 2014-02-08 20:55:59 -05:00
Aleksey Yeschenko 016a2b052b Switch stress to use ITransportFactory (trunk followup) 
patch by Sam Tunnicliffe; reviewed by Benedict Elliott Smith for
CASSANDRA-6641
 2014-01-31 11:57:55 -05:00
Dave Brosius af3ad31c30 make it clear that varargs in are in effect 2014-01-02 19:58:42 -05:00
Dave Brosius e603555636 warnings 2013-12-27 17:12:46 -05:00
Dave Brosius b2933717c4 fix typo 2013-12-27 16:53:03 -05:00
Dave Brosius 660902929a use %n for new line in printf 2013-12-26 18:44:57 -05:00
belliottsmith 2e1e98ad04 Improve Stress Tool 
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
 2013-12-23 18:05:43 -08:00
Sylvain Lebresne e50d6af12f Rename Column to Cell 2013-12-17 17:52:20 +01:00
Jonathan Ellis 5c21711e76 merge from 2.0 2013-11-03 00:08:41 -05:00
Jonathan Ellis ce206e2014 use StandardCharsets static fields 
patch by Blair Zajac; reviewed by jbellis for CASSANDRA-6290
 2013-11-03 00:06:34 -05:00
Aleksey Yeschenko 24e9d63109 Merge branch 'cassandra-2.0' into trunk 2013-10-12 23:56:22 +07:00
Aleksey Yeschenko 61dc59086b Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-12 23:51:29 +07:00
Aleksey Yeschenko 5fab1276ca stress: add username/password authentication support 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6068
 2013-10-12 23:49:47 +07:00
Brandon Williams a8a2ffb976 Revert metrics upgrade from stress. 
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6153
 2013-10-08 13:37:36 -05:00
Jonathan Ellis 3205e5dbbc Revert CASSANDRA-5838 2013-08-30 13:35:16 -05:00
Aleksey Yeschenko 5b5d41d4b8 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	tools/stress/src/org/apache/cassandra/stress/Session.java
	tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
 2013-08-30 03:03:29 +03:00
Aleksey Yeschenko bffd9ea8eb Upgrade Thrift to 0.9.1 
patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
 2013-08-30 02:57:12 +03:00
Jonathan Ellis a42d4cada7 Merge branch 'cassandra-2.0' into trunk 2013-08-27 22:45:37 -05:00
Jonathan Ellis 2383430dfd merge from 1.2 2013-08-27 22:45:25 -05:00
Jonathan Ellis 47b2cd6620 label 99.9th correctly 2013-08-27 22:44:16 -05:00
Dave Brosius 5dabd1cc0c fix latency displays caused by metrics-core now using nanoseconds 2013-08-16 08:37:39 -04:00
Dave Brosius c27a161920 update metrics-core to 3.0.1 
patch by dbrosius reviewed by jbellis for cassandra-5838
 2013-08-10 10:34:07 -04:00
Jason Brown be0523a240 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/StressAction.java
 2013-05-30 14:15:24 -07:00
Jason Brown 2f72f8bc57 Add a rate limit option to stress 
patch by jasobrown, reviewed by driftx for CASSANDRA-5004
 2013-05-30 14:13:16 -07:00
Jonathan Ellis 1d2c12242f use nanotime consistently for node-local timeouts 
patch by Mikhail Mazursky; reviewed by jbellis for CASSANDRA-5581
 2013-05-21 10:02:12 -05:00
Jonathan Ellis 6f467d920f clean up inputstreams in finally blocks 
patch by Mikhail Mazursky; reviewed by jbellis for CASSANDRA-5580
 2013-05-20 17:11:04 -05:00
Jonathan Ellis 2effc40edb replace Thread.sleep with Uninterruptibles.sleepUninterruptibly 
patch by Mikhail Mazursky; reviewed by jbellis for CASSANDRA-5557
 2013-05-13 11:26:23 -05:00
Sylvain Lebresne 1aa798f0c1 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/Session.java
 2013-03-06 09:09:49 +01:00
Sylvain Lebresne 06699d47b6 Add binary protocol to stress 
patch by slebresne; reviewed by yukim for CASSANDRA-4993
 2013-03-06 09:08:18 +01:00
Sylvain Lebresne 6190a711c6 Merge branch 'cassandra-1.2' into trunk 2013-02-19 00:02:19 +01:00
Sylvain Lebresne 4cd813632d Fix stress with CQL3 2013-02-19 00:01:41 +01:00
Brandon Williams c1e5b0ffaf Add aggregate statistics to cassandra-stress 
Patch by Ryan McGuire, reviewed by brandonwilliams for CASSANDRA-5243
 2013-02-12 15:12:59 -06:00
Sylvain Lebresne f8f80d3e50 Merge branch 'cassandra-1.2' into trunk 2012-12-07 10:14:16 +01:00
Sylvain Lebresne fc416fab0b Merge branch 'cassandra-1.2.0' into cassandra-1.2 2012-12-07 10:13:43 +01:00
Sylvain Lebresne 7442fc0209 Don't generate UUID based on other nodes' address 
patch by slebresne; reviewed by jbellis for CASSANDRA-5002
 2012-12-07 10:09:25 +01:00
Brandon Williams 94e37b4e41 stress formatting 2012-12-05 18:45:29 -06:00
Jonathan Ellis 6e61c4cddd r/m unused SSLTransportFactory.java (CustomTThreadPoolServer uses TSSLTransportFactory directly) 2012-12-05 13:29:23 -06:00
Jonathan Ellis c533b88851 r/m unused SSLTransportFactory.java (CustomTThreadPoolServer uses TSSLTransportFactory directly) 2012-12-05 13:29:18 -06:00
Jonathan Ellis b475602be8 add 95th and 99th percentile latency reporting to Stress 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5005
 2012-12-04 14:34:01 -06:00
Jonathan Ellis ae9faf080d cleanup 2012-12-04 14:34:00 -06:00
Jonathan Ellis 25bf3bf04e reduce object allocations done by inserter 2012-12-04 14:33:58 -06:00
Jonathan Ellis 85d9ce1ba0 add 95th and 99th percentile latency reporting to Stress 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5005
 2012-12-04 14:33:10 -06:00
Jonathan Ellis f07effb1c3 cleanup 2012-12-04 14:32:13 -06:00
Jonathan Ellis 7abc634d52 reduce object allocations done by inserter 2012-12-04 14:32:13 -06:00
Vijay Parthasarathy e3f48f2e34 client_encryption_options to use enabled 
Patch by aleksey reviewed by vijay for CASSANDRA-4994
 2012-11-27 00:35:52 -08:00
Vijay Parthasarathy 24cf1d1256 client_encryption_options to use enabled 
Patch by aleksey reviewed by vijay for CASSANDRA-4994
 2012-11-27 00:17:08 -08:00
Sylvain Lebresne e2df26b899 Fix stress for CQL3 
patch by slebresne; reviewed by jbellis for CASSANDRA-4979
 2012-11-21 17:24:36 +01:00
Vijay Parthasarathy f593717ace Fix for IDE alert on SSLTransportFactory 
patch by Vijay; reviewed by Jason Brown for CASSANDRA-4239
 2012-10-25 22:35:24 -07:00
Vijay Parthasarathy 8495560c2b Support client Thrift SSL socket 
patch by Jason Brown; reviewed by Vijay for CASSANDRA-4239
 2012-10-17 18:58:04 -07:00
Jonathan Ellis 6ca75ef9ba remove vestiges of Thrift unframed mode 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4729
 2012-09-27 15:25:07 -05:00
Pavel Yaskevich c5df208327 fix counter add/get using CQL2 and CQL3 in stress tool 
patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for CASSANDRA-4633
 2012-09-11 22:52:01 +03:00
Pavel Yaskevich 02769d5b69 update stress tool to be able to use CQL3 
patch by David Alves; reviewed by Pavel Yaskevich for CASSANDRA-4406
 2012-09-10 20:33:09 +03:00
Sylvain Lebresne 3a2faf9424 Finer grained exception hierarchy, and adds error codes 
patch by slebresne; reviewed by thepaul for CASSANDRA-3979
 2012-09-05 17:50:59 +02:00
Jonathan Ellis 5c94432b23 add request tracing 
patch by David Alves; reviewed by jbellis for CASSANDRA-1123
 2012-08-29 13:14:35 -05:00
Pavel Yaskevich b1c60d2b33 (stress) support for CQL prepared statements 
patch by David Alves; reviewed by Pavel Yaskevich for CASSANDRA-3633
 2012-06-30 15:09:46 +03:00
Sylvain Lebresne 3558e45ab6 Rename stress to cassandra-stress and include in debian packaging 
patch by Nick Bailey; reviewed by thepaul for CASSANDRA-4256
 2012-05-21 19:28:19 +02:00
Pavel Yaskevich 5c3db0d101 merge from 1.0 2012-05-03 03:52:14 +03:00