You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2016/02/01 18:31:34 UTC
[1/2] accumulo git commit: ACCUMULO-4117 work around THRIFT-3450
Repository: accumulo
Updated Branches:
refs/heads/master 7a6b48203 -> fed5dd50a
ACCUMULO-4117 work around THRIFT-3450
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d75e963d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d75e963d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d75e963d
Branch: refs/heads/master
Commit: d75e963de130ab8fe2dc1622b5683c51b54b0102
Parents: 664012d
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Feb 1 12:30:31 2016 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Feb 1 12:30:31 2016 -0500
----------------------------------------------------------------------
.../accumulo/core/rpc/SslConnectionParams.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d75e963d/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java b/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
index f85ea10..017134e 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
@@ -209,12 +209,24 @@ public class SslConnectionParams {
return trustStoreType;
}
+ // Work around THRIFT-3450 ... fixed with b9641e094...
+ static class TSSLTransportParametersHack extends TSSLTransportParameters {
+ TSSLTransportParametersHack(String clientProtocol) {
+ super(clientProtocol, new String[] {});
+ this.cipherSuites = null;
+ }
+ }
+
public TSSLTransportParameters getTTransportParams() {
if (useJsse)
throw new IllegalStateException("Cannot get TTransportParams for JSEE configuration.");
- // Null cipherSuites is implicitly handled
- TSSLTransportParameters params = new TSSLTransportParameters(clientProtocol, cipherSuites);
+ TSSLTransportParameters params;
+ if (cipherSuites != null) {
+ params = new TSSLTransportParameters(clientProtocol, cipherSuites);
+ } else {
+ params = new TSSLTransportParametersHack(clientProtocol);
+ }
params.requireClientAuth(clientAuth);
if (keyStoreSet) {
[2/2] accumulo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Posted by ec...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fed5dd50
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fed5dd50
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fed5dd50
Branch: refs/heads/master
Commit: fed5dd50aecb9e7b602e0208ef6fae706b0b2619
Parents: d75e963 7a6b482
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Feb 1 12:30:52 2016 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Feb 1 12:30:52 2016 -0500
----------------------------------------------------------------------
.gitignore | 3 +
assemble/.gitignore | 3 +
assemble/pom.xml | 3 +
core/.gitignore | 3 +
core/pom.xml | 3 +
.../core/client/impl/CompressedIterators.java | 14 +-
.../core/client/impl/ConditionalWriterImpl.java | 46 +++++-
.../accumulo/core/iterators/IteratorUtil.java | 89 +++++-----
.../client/impl/ConditionalComparatorTest.java | 53 ++++++
docs/.gitignore | 3 +
examples/simple/.gitignore | 3 +
examples/simple/pom.xml | 3 +
fate/.gitignore | 3 +
maven-plugin/.gitignore | 3 +
minicluster/.gitignore | 3 +
pom.xml | 12 ++
proxy/.gitignore | 3 +
server/base/.gitignore | 3 +
server/gc/.gitignore | 3 +
server/master/.gitignore | 3 +
server/monitor/.gitignore | 3 +
server/monitor/pom.xml | 3 +
server/native/.gitignore | 3 +
server/tracer/.gitignore | 3 +
server/tserver/.gitignore | 3 +
server/tserver/pom.xml | 3 +
.../tserver/ConditionCheckerContext.java | 164 +++++++++++++++++++
.../apache/accumulo/tserver/TabletServer.java | 79 +++------
.../accumulo/tserver/tablet/ScanDataSource.java | 19 ++-
.../apache/accumulo/tserver/tablet/Tablet.java | 18 ++
shell/.gitignore | 4 +-
shell/pom.xml | 17 ++
start/.gitignore | 4 +-
test/.gitignore | 4 +
test/pom.xml | 3 +
.../accumulo/test/ConditionalWriterIT.java | 139 +++++++++++++++-
trace/.gitignore | 3 +
37 files changed, 614 insertions(+), 117 deletions(-)
----------------------------------------------------------------------