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

Make stress use client mode to avoid checking commit log size on startup 

Patch by Denis Ranger; Reviewed by Paulo Motta for CASSANDRA-12478
This commit is contained in:
Denis Ranger 2016-08-11 19:28:43 -04:00 committed by Aleksey Yeschenko
parent 85ac06c640
commit db869bc774
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
3.0.10
* Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478)
* Fix exceptions with new vnode allocation (CASSANDRA-12715)
* Unify drain and shutdown processes (CASSANDRA-12509)
* Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)

8
tools/stress/src/org/apache/cassandra/stress/StressProfile.java
View File

@ -35,8 +35,10 @@ import com.google.common.util.concurrent.Uninterruptibles;
import com.datastax.driver.core.*;
import com.datastax.driver.core.exceptions.AlreadyExistsException;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.cql3.statements.CreateKeyspaceStatement;
import org.apache.cassandra.cql3.statements.CreateTableStatement;
import org.apache.cassandra.exceptions.RequestValidationException;
import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.stress.generate.*;
@ -89,6 +91,10 @@ public class StressProfile implements Serializable
private void init(StressYaml yaml) throws RequestValidationException
{
// Use client mode. Otherwise, users with no read permission on /var/lib/commitlog won't be able to
// use cassandra-stress...
Config.setClientMode(true);
keyspaceName = yaml.keyspace;
keyspaceCql = yaml.keyspace_definition;
tableName = yaml.table;
@ -129,7 +135,7 @@ public class StressProfile implements Serializable
{
try
{
String name = CFMetaData.compile(tableCql, keyspaceName).cfName;
String name = ((CreateTableStatement.RawStatement) QueryProcessor.parseStatement(tableCql)).columnFamily();
assert name.equalsIgnoreCase(tableName) : "Name in table_definition doesn't match table property: '" + name + "' != '" + tableName + "'";
}
catch (RuntimeException e)