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:03:54 UTC
[31/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-3054
Merge remote-tracking branch 'remotes/origin/master' into ignite-3054
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0123742e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0123742e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0123742e
Branch: refs/heads/ignite-3054
Commit: 0123742ee536ad3eb1c4651597d1390ed2270b42
Parents: f0f388e
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 13 12:25:02 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 13 12:25:02 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/discovery/tcp/ServerImpl.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0123742e/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 e743b5c..b9a6b9d 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
@@ -62,7 +62,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -115,7 +114,6 @@ import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.util.worker.GridWorker;
-import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteClosure;
import org.apache.ignite.lang.IgniteInClosure;
@@ -158,8 +156,6 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRedirectToClient;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage;
-import org.apache.ignite.thread.IgniteThread;
-import org.apache.ignite.thread.IgniteThreadPoolExecutor;
import org.apache.ignite.thread.IgniteThreadPoolExecutor;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
@@ -438,8 +434,12 @@ class ServerImpl extends TcpDiscoveryImpl {
clientNioSrv.start();
nioClientProcessingPool = new IgniteThreadPoolExecutor(
- "disco-client-nio-msg-processor", gridName, spi.getClientNioThreads() * 2, spi.getClientNioThreads() * 3,
- 60_000L, new LinkedBlockingQueue<Runnable>());
+ "disco-client-nio-msg-processor",
+ gridName,
+ spi.getClientNioThreads() * 2,
+ spi.getClientNioThreads() * 3,
+ 60_000L,
+ new LinkedBlockingQueue<Runnable>());
for (int i = 0; i < spi.getClientNioThreads(); i++)
nioClientProcessingPool.submit(new NioSendWorker(gridName, log));
@@ -8099,7 +8099,6 @@ class ServerImpl extends TcpDiscoveryImpl {
if (msg != null)
worker.sendMessage(msg.get1(), msg.get2());
-
}
while (msg != null);