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

Merge branch 'cassandra-2.0' into trunk

This commit is contained in:
Aleksey Yeschenko 2013-10-12 23:56:22 +07:00
parent c5b6a33fff 61dc59086b
commit 24e9d63109
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -55,6 +55,7 @@ Merged from 1.2:
* Properly error out on CREATE INDEX for counters table (CASSANDRA-6160)
* Handle JMX notification failure for repair (CASSANDRA-6097)
* (Hadoop) Fetch no more than 128 splits in parallel (CASSANDRA-6169)
* stress: add username/password authentication support (CASSANDRA-6068)
2.0.1

32
tools/stress/src/org/apache/cassandra/stress/Session.java
View File

@ -28,6 +28,8 @@ import org.apache.commons.cli.*;
import org.apache.commons.lang3.StringUtils;
import com.yammer.metrics.Metrics;
import org.apache.cassandra.auth.IAuthenticator;
import org.apache.cassandra.cli.transport.FramedTransportFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.EncryptionOptions;
@ -114,7 +116,9 @@ public class Session implements Serializable
availableOptions.addOption("alg", SSL_ALGORITHM, true, "SSL: algorithm (default: SunX509)");
availableOptions.addOption("st", SSL_STORE_TYPE, true, "SSL: type of store");
availableOptions.addOption("ciphers", SSL_CIPHER_SUITES, true, "SSL: comma-separated list of encryption suites to use");
availableOptions.addOption("th", "throttle", true, "Throttle the total number of operations per second to a maximum amount.");
availableOptions.addOption("th", "throttle", true, "Throttle the total number of operations per second to a maximum amount.");
availableOptions.addOption("un", "username", true, "Username for authentication.");
availableOptions.addOption("pw", "password", true, "Password for authentication.");
}
private int numKeys = 1000 * 1000;
@ -131,6 +135,8 @@ public class Session implements Serializable
private int superColumns = 1;
private String compression = null;
private String compactionStrategy = null;
private String username = null;
private String password = null;
private int progressInterval = 10;
private int keysPerCall = 1000;
@ -450,6 +456,11 @@ public class Session implements Serializable
if (cmd.hasOption("tf"))
transportFactory = validateAndSetTransportFactory(cmd.getOptionValue("tf"));
if (cmd.hasOption("un"))
username = cmd.getOptionValue("un");
if (cmd.hasOption("pw"))
password = cmd.getOptionValue("pw");
}
catch (ParseException e)
{
@ -742,17 +753,32 @@ public class Session implements Serializable
try
{
if(!transport.isOpen())
if (!transport.isOpen())
transport.open();
if (enable_cql)
client.set_cql_version(cqlVersion);
if (setKeyspace)
{
client.set_keyspace("Keyspace1");
if (username != null && password != null)
{
Map<String, String> credentials = new HashMap<String, String>();
credentials.put(IAuthenticator.USERNAME_KEY, username);
credentials.put(IAuthenticator.PASSWORD_KEY, password);
AuthenticationRequest authenticationRequest = new AuthenticationRequest(credentials);
client.login(authenticationRequest);
}
}
catch (AuthenticationException e)
{
throw new RuntimeException(e.getWhy());
}
catch (AuthorizationException e)
{
throw new RuntimeException(e.getWhy());
}
catch (InvalidRequestException e)
{
throw new RuntimeException(e.getWhy());