You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/15 00:37:05 UTC
[1/6] git commit: Support authentication in CqlRecordReader
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b927f790a -> 569177fb9
refs/heads/cassandra-2.1 92c38c0e6 -> 6be62c2c4
refs/heads/trunk eea5c3748 -> 072283739
Support authentication in CqlRecordReader
Patch by Jacek Lewandowski, reviewed by Alex Liu for CASSANDRA-7221
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/569177fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/569177fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/569177fb
Branch: refs/heads/cassandra-2.0
Commit: 569177fb9e7c2b7935ff2e7f8b7c0b10806b8f50
Parents: b927f79
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 17:35:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 17:35:38 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/569177fb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a43040..285efd1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/569177fb/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index a4a9c44..a2cf1e7 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -40,9 +40,11 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.cassandra.hadoop.ConfigHelper;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import com.datastax.driver.core.AuthProvider;
+import com.datastax.driver.core.PlainTextAuthProvider;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Host;
import com.datastax.driver.core.HostDistance;
@@ -64,6 +66,9 @@ public class CqlConfigHelper
private static final String INPUT_CQL_WHERE_CLAUSE_CONFIG = "cassandra.input.where.clause";
private static final String INPUT_CQL = "cassandra.input.cql";
+ private static final String USERNAME = "cassandra.username";
+ private static final String PASSWORD = "cassandra.password";
+
private static final String INPUT_NATIVE_PORT = "cassandra.input.native.port";
private static final String INPUT_NATIVE_CORE_CONNECTIONS_PER_HOST = "cassandra.input.native.core.connections.per.host";
private static final String INPUT_NATIVE_MAX_CONNECTIONS_PER_HOST = "cassandra.input.native.max.connections.per.host";
@@ -152,6 +157,16 @@ public class CqlConfigHelper
conf.set(INPUT_CQL, cql);
}
+ public static void setUserNameAndPassword(Configuration conf, String username, String password)
+ {
+ if (StringUtils.isNotBlank(username))
+ {
+ conf.set(INPUT_NATIVE_AUTH_PROVIDER, PlainTextAuthProvider.class.getName());
+ conf.set(USERNAME, username);
+ conf.set(PASSWORD, password);
+ }
+ }
+
public static Optional<Integer> getInputCoreConnections(Configuration conf)
{
return getIntSetting(INPUT_NATIVE_CORE_CONNECTIONS_PER_HOST, conf);
@@ -547,7 +562,7 @@ public class CqlConfigHelper
if (!authProvider.isPresent())
return Optional.absent();
- return Optional.of(getClientAuthProvider(authProvider.get()));
+ return Optional.of(getClientAuthProvider(authProvider.get(), conf));
}
private static Optional<SSLOptions> getSSLOptions(Configuration conf)
@@ -602,11 +617,22 @@ public class CqlConfigHelper
return Optional.of(setting);
}
- private static AuthProvider getClientAuthProvider(String factoryClassName)
+ private static AuthProvider getClientAuthProvider(String factoryClassName, Configuration conf)
{
try
{
- return (AuthProvider) Class.forName(factoryClassName).newInstance();
+ Class<?> c = Class.forName(factoryClassName);
+ if (PlainTextAuthProvider.class.equals(c))
+ {
+ String username = getStringSetting(USERNAME, conf).or("");
+ String password = getStringSetting(PASSWORD, conf).or("");
+ return (AuthProvider) c.getConstructor(String.class, String.class)
+ .newInstance(username, password);
+ }
+ else
+ {
+ return (AuthProvider) c.newInstance();
+ }
}
catch (Exception e)
{
[3/6] git commit: Support authentication in CqlRecordReader
Posted by br...@apache.org.
Support authentication in CqlRecordReader
Patch by Jacek Lewandowski, reviewed by Alex Liu for CASSANDRA-7221
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/569177fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/569177fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/569177fb
Branch: refs/heads/trunk
Commit: 569177fb9e7c2b7935ff2e7f8b7c0b10806b8f50
Parents: b927f79
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 17:35:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 17:35:38 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/569177fb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a43040..285efd1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/569177fb/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index a4a9c44..a2cf1e7 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -40,9 +40,11 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.cassandra.hadoop.ConfigHelper;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import com.datastax.driver.core.AuthProvider;
+import com.datastax.driver.core.PlainTextAuthProvider;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Host;
import com.datastax.driver.core.HostDistance;
@@ -64,6 +66,9 @@ public class CqlConfigHelper
private static final String INPUT_CQL_WHERE_CLAUSE_CONFIG = "cassandra.input.where.clause";
private static final String INPUT_CQL = "cassandra.input.cql";
+ private static final String USERNAME = "cassandra.username";
+ private static final String PASSWORD = "cassandra.password";
+
private static final String INPUT_NATIVE_PORT = "cassandra.input.native.port";
private static final String INPUT_NATIVE_CORE_CONNECTIONS_PER_HOST = "cassandra.input.native.core.connections.per.host";
private static final String INPUT_NATIVE_MAX_CONNECTIONS_PER_HOST = "cassandra.input.native.max.connections.per.host";
@@ -152,6 +157,16 @@ public class CqlConfigHelper
conf.set(INPUT_CQL, cql);
}
+ public static void setUserNameAndPassword(Configuration conf, String username, String password)
+ {
+ if (StringUtils.isNotBlank(username))
+ {
+ conf.set(INPUT_NATIVE_AUTH_PROVIDER, PlainTextAuthProvider.class.getName());
+ conf.set(USERNAME, username);
+ conf.set(PASSWORD, password);
+ }
+ }
+
public static Optional<Integer> getInputCoreConnections(Configuration conf)
{
return getIntSetting(INPUT_NATIVE_CORE_CONNECTIONS_PER_HOST, conf);
@@ -547,7 +562,7 @@ public class CqlConfigHelper
if (!authProvider.isPresent())
return Optional.absent();
- return Optional.of(getClientAuthProvider(authProvider.get()));
+ return Optional.of(getClientAuthProvider(authProvider.get(), conf));
}
private static Optional<SSLOptions> getSSLOptions(Configuration conf)
@@ -602,11 +617,22 @@ public class CqlConfigHelper
return Optional.of(setting);
}
- private static AuthProvider getClientAuthProvider(String factoryClassName)
+ private static AuthProvider getClientAuthProvider(String factoryClassName, Configuration conf)
{
try
{
- return (AuthProvider) Class.forName(factoryClassName).newInstance();
+ Class<?> c = Class.forName(factoryClassName);
+ if (PlainTextAuthProvider.class.equals(c))
+ {
+ String username = getStringSetting(USERNAME, conf).or("");
+ String password = getStringSetting(PASSWORD, conf).or("");
+ return (AuthProvider) c.getConstructor(String.class, String.class)
+ .newInstance(username, password);
+ }
+ else
+ {
+ return (AuthProvider) c.newInstance();
+ }
}
catch (Exception e)
{
[2/6] git commit: Support authentication in CqlRecordReader
Posted by br...@apache.org.
Support authentication in CqlRecordReader
Patch by Jacek Lewandowski, reviewed by Alex Liu for CASSANDRA-7221
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/569177fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/569177fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/569177fb
Branch: refs/heads/cassandra-2.1
Commit: 569177fb9e7c2b7935ff2e7f8b7c0b10806b8f50
Parents: b927f79
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 17:35:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 17:35:38 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/569177fb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a43040..285efd1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/569177fb/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index a4a9c44..a2cf1e7 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -40,9 +40,11 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.cassandra.hadoop.ConfigHelper;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import com.datastax.driver.core.AuthProvider;
+import com.datastax.driver.core.PlainTextAuthProvider;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Host;
import com.datastax.driver.core.HostDistance;
@@ -64,6 +66,9 @@ public class CqlConfigHelper
private static final String INPUT_CQL_WHERE_CLAUSE_CONFIG = "cassandra.input.where.clause";
private static final String INPUT_CQL = "cassandra.input.cql";
+ private static final String USERNAME = "cassandra.username";
+ private static final String PASSWORD = "cassandra.password";
+
private static final String INPUT_NATIVE_PORT = "cassandra.input.native.port";
private static final String INPUT_NATIVE_CORE_CONNECTIONS_PER_HOST = "cassandra.input.native.core.connections.per.host";
private static final String INPUT_NATIVE_MAX_CONNECTIONS_PER_HOST = "cassandra.input.native.max.connections.per.host";
@@ -152,6 +157,16 @@ public class CqlConfigHelper
conf.set(INPUT_CQL, cql);
}
+ public static void setUserNameAndPassword(Configuration conf, String username, String password)
+ {
+ if (StringUtils.isNotBlank(username))
+ {
+ conf.set(INPUT_NATIVE_AUTH_PROVIDER, PlainTextAuthProvider.class.getName());
+ conf.set(USERNAME, username);
+ conf.set(PASSWORD, password);
+ }
+ }
+
public static Optional<Integer> getInputCoreConnections(Configuration conf)
{
return getIntSetting(INPUT_NATIVE_CORE_CONNECTIONS_PER_HOST, conf);
@@ -547,7 +562,7 @@ public class CqlConfigHelper
if (!authProvider.isPresent())
return Optional.absent();
- return Optional.of(getClientAuthProvider(authProvider.get()));
+ return Optional.of(getClientAuthProvider(authProvider.get(), conf));
}
private static Optional<SSLOptions> getSSLOptions(Configuration conf)
@@ -602,11 +617,22 @@ public class CqlConfigHelper
return Optional.of(setting);
}
- private static AuthProvider getClientAuthProvider(String factoryClassName)
+ private static AuthProvider getClientAuthProvider(String factoryClassName, Configuration conf)
{
try
{
- return (AuthProvider) Class.forName(factoryClassName).newInstance();
+ Class<?> c = Class.forName(factoryClassName);
+ if (PlainTextAuthProvider.class.equals(c))
+ {
+ String username = getStringSetting(USERNAME, conf).or("");
+ String password = getStringSetting(PASSWORD, conf).or("");
+ return (AuthProvider) c.getConstructor(String.class, String.class)
+ .newInstance(username, password);
+ }
+ else
+ {
+ return (AuthProvider) c.newInstance();
+ }
}
catch (Exception e)
{
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6be62c2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6be62c2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6be62c2c
Branch: refs/heads/trunk
Commit: 6be62c2c46de06170dd4a10327ecab4ab7a41d78
Parents: 92c38c0 569177f
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 17:36:48 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 17:36:48 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6be62c2c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d43a0f5,285efd1..450e337
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,21 @@@
-2.0.9
+2.1.0-rc1
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+ * Add server side batching to native transport (CASSANDRA-5663)
+ * Make batchlog replay asynchronous (CASSANDRA-6134)
+Merged from 2.0:
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
* return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6be62c2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6be62c2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6be62c2c
Branch: refs/heads/cassandra-2.1
Commit: 6be62c2c46de06170dd4a10327ecab4ab7a41d78
Parents: 92c38c0 569177f
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 17:36:48 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 17:36:48 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6be62c2c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d43a0f5,285efd1..450e337
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,21 @@@
-2.0.9
+2.1.0-rc1
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+ * Add server side batching to native transport (CASSANDRA-5663)
+ * Make batchlog replay asynchronous (CASSANDRA-6134)
+Merged from 2.0:
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
* return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07228373
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07228373
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07228373
Branch: refs/heads/trunk
Commit: 072283739b49219641df9e7234e796c90f072b6e
Parents: eea5c37 6be62c2
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 14 17:36:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 14 17:36:58 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++--
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07228373/CHANGES.txt
----------------------------------------------------------------------