You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/08/16 20:07:34 UTC
[1/2] storm git commit: STORM-965: Fix excessive logging
Repository: storm
Updated Branches:
refs/heads/master aa308e116 -> 87fc2982e
STORM-965: Fix excessive logging
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f29de472
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f29de472
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f29de472
Branch: refs/heads/master
Commit: f29de472a21a9f5936cb13d26cc5a36669c48164
Parents: aa308e1
Author: Priyank <ps...@hortonworks.com>
Authored: Thu Aug 13 15:42:24 2015 -0700
Committer: Priyank <ps...@hortonworks.com>
Committed: Fri Aug 14 12:06:16 2015 -0700
----------------------------------------------------------------------
.../security/auth/SaslTransportPlugin.java | 6 +++
.../kerberos/KerberosSaslTransportPlugin.java | 5 ++-
.../security/auth/kerberos/NoOpTTrasport.java | 40 ++++++++++++++++++++
3 files changed, 49 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f29de472/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java
index 7208a17..9df8cdd 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/SaslTransportPlugin.java
@@ -32,6 +32,7 @@ import javax.security.auth.login.Configuration;
import javax.security.sasl.SaslServer;
import backtype.storm.utils.ExtendedThreadPoolExecutor;
+import backtype.storm.security.auth.kerberos.NoOpTTrasport;
import org.apache.thrift.TException;
import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TBinaryProtocol;
@@ -121,6 +122,11 @@ public abstract class SaslTransportPlugin implements ITransportPlugin {
TTransport trans = inProt.getTransport();
//Sasl transport
TSaslServerTransport saslTrans = (TSaslServerTransport)trans;
+
+ if(trans instanceof NoOpTTrasport) {
+ return false;
+ }
+
//remote address
TSocket tsocket = (TSocket)saslTrans.getUnderlyingTransport();
Socket socket = tsocket.getSocket();
http://git-wip-us.apache.org/repos/asf/storm/blob/f29de472/storm-core/src/jvm/backtype/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index ecb0daf..59254f3 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -195,8 +195,9 @@ public class KerberosSaslTransportPlugin extends SaslTransportPlugin {
return wrapped.getTransport(trans);
}
catch (Exception e) {
- LOG.error("Storm server failed to open transport to interact with a client during session initiation: " + e, e);
- return null;
+ LOG.debug("Storm server failed to open transport " +
+ "to interact with a client during session initiation: " + e, e);
+ return new NoOpTTrasport(null);
}
}
});
http://git-wip-us.apache.org/repos/asf/storm/blob/f29de472/storm-core/src/jvm/backtype/storm/security/auth/kerberos/NoOpTTrasport.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/kerberos/NoOpTTrasport.java b/storm-core/src/jvm/backtype/storm/security/auth/kerberos/NoOpTTrasport.java
new file mode 100644
index 0000000..074930d
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/security/auth/kerberos/NoOpTTrasport.java
@@ -0,0 +1,40 @@
+package backtype.storm.security.auth.kerberos;
+
+import org.apache.thrift.transport.TSaslServerTransport;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+
+/**
+ * Created by pshah on 8/12/15.
+ */
+public class NoOpTTrasport extends TSaslServerTransport {
+
+ public NoOpTTrasport(TTransport transport) {
+ super(transport);
+ }
+
+ @Override
+ public boolean isOpen() {
+ return true;
+ }
+
+ @Override
+ public void open() throws TTransportException {
+
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public int read(byte[] bytes, int i, int i1) throws TTransportException {
+ return 0;
+ }
+
+ @Override
+ public void write(byte[] bytes, int i, int i1) throws TTransportException {
+
+ }
+}
[2/2] storm git commit: Added STORM-965 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-965 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/87fc2982
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/87fc2982
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/87fc2982
Branch: refs/heads/master
Commit: 87fc2982e50f42e9e8261fb94228cb7ff4113f53
Parents: f29de47
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Aug 16 10:22:13 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Aug 16 10:22:13 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/87fc2982/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16cf2c0..f2e2f16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-995: Fix excessive logging
* STORM-837: HdfsState ignores commits
* STORM-938: storm-hive add a time interval to flush tuples to hive.
* STORM-977: Incorrect signal (-9) when as-user is true