You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/24 15:04:06 UTC
[43/50] [abbrv] ignite git commit: ignite-3054 - Channel blocking
workaround
ignite-3054 - Channel blocking workaround
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27201bb1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27201bb1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27201bb1
Branch: refs/heads/ignite-3054
Commit: 27201bb1e5c6e097f6d70d6890720a787faed801
Parents: 6ff80d5
Author: dkarachentsev <dk...@gridgain.com>
Authored: Fri Dec 16 17:26:08 2016 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Fri Dec 16 17:26:08 2016 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ServerImpl.java | 7 ++--
.../tcp/IgniteCacheSslStartStopSelfTest.java | 41 --------------------
2 files changed, 3 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/27201bb1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index eb38765..758b576 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -7488,7 +7488,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (sslIn == null) {
synchronized (this) {
if (sslIn == null)
- sslIn = new SslInputStream(delegate.getInputStream(), ch, hnd);
+ sslIn = new SslInputStream(delegate.getInputStream(), hnd);
}
}
@@ -7681,12 +7681,11 @@ class ServerImpl extends TcpDiscoveryImpl {
/**
* @param in Original stream.
- * @param ch Socket channel.
* @param sslHnd SSL handler.
*/
- SslInputStream(final InputStream in, final SocketChannel ch, final BlockingSslHandler sslHnd) {
+ SslInputStream(final InputStream in, final BlockingSslHandler sslHnd) {
this.in = in;
- this.ch = Channels.newChannel(in);
+ this.ch = Channels.newChannel(in); // workaround, because SocketChannel ignores timeout
this.sslHnd = sslHnd;
buf = ByteBuffer.allocate(32 * 1024);
http://git-wip-us.apache.org/repos/asf/ignite/blob/27201bb1/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
index 651df66..0bb5d7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteCacheSslStartStopSelfTest.java
@@ -20,8 +20,6 @@ package org.apache.ignite.spi.communication.tcp;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAbstractSelfTest;
-import org.apache.ignite.spi.discovery.DiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -36,8 +34,6 @@ public class IgniteCacheSslStartStopSelfTest extends IgniteCachePutRetryAbstract
cfg.setSslContextFactory(GridTestUtils.sslFactory());
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setStatisticsPrintFrequency(1000);
-
return cfg;
}
@@ -45,41 +41,4 @@ public class IgniteCacheSslStartStopSelfTest extends IgniteCachePutRetryAbstract
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
- @Override public void testPut() throws Exception {
- }
-
- @Override public void testGetAndPut() throws Exception {
- super.testGetAndPut();
- }
-
- @Override public void testPutStoreEnabled() throws Exception {
- }
-
- @Override public void testPutAll() throws Exception {
- }
-
- @Override public void testPutAsync() throws Exception {
- }
-
- @Override public void testPutAsyncStoreEnabled() throws Exception {
- }
-
- @Override public void testInvoke() throws Exception {
- }
-
- @Override public void testInvokeAll() throws Exception {
- }
-
- @Override public void testInvokeAllOffheapSwap() throws Exception {
- }
-
- @Override public void testInvokeAllOffheapTiered() throws Exception {
- }
-
- @Override public void testFailsWithNoRetries() throws Exception {
- }
-
- @Override public void testFailsWithNoRetriesAsync() throws Exception {
- }
}