Repository: asterixdb Updated Branches: refs/heads/master 129d401bf -> 8bf93fa70
Revert "[NO ISSUE][LOG] Include destination IP in thread name on push back" This reverts commit 2498d28f0584d6ab002625417622be429f5c8131. Change-Id: I221071a8a2851bde839e67d7f0380816c249366d Reviewed-on: https://asterix-gerrit.ics.uci.edu/2941 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/8bf93fa7 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/8bf93fa7 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/8bf93fa7 Branch: refs/heads/master Commit: 8bf93fa70aaf44deced9737ef71001366a35b242 Parents: 129d401 Author: abdullah alamoudi <bamou...@gmail.com> Authored: Thu Aug 30 13:57:44 2018 -0700 Committer: abdullah alamoudi <bamou...@gmail.com> Committed: Fri Aug 31 00:05:58 2018 -0700 ---------------------------------------------------------------------- .../hyracks/comm/channels/NetworkOutputChannel.java | 12 +----------- .../net/protocols/muxdemux/ChannelControlBlock.java | 5 ----- .../hyracks/net/protocols/muxdemux/ChannelSet.java | 4 ---- .../net/protocols/muxdemux/MultiplexedConnection.java | 5 ----- 4 files changed, 1 insertion(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8bf93fa7/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java index 261e7c4..334fb5c 100644 --- a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java +++ b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java @@ -18,11 +18,9 @@ */ package org.apache.hyracks.comm.channels; -import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.util.ArrayDeque; import java.util.Deque; -import java.util.Objects; import org.apache.hyracks.api.comm.IBufferAcceptor; import org.apache.hyracks.api.comm.IFrameWriter; @@ -77,15 +75,7 @@ public class NetworkOutputChannel implements IFrameWriter { break; } try { - InetSocketAddress remoteAddress = ccb.getRemoteAddress(); - String nameBefore = Thread.currentThread().getName(); - try { - Thread.currentThread() - .setName(nameBefore + ":SendingTo(" + Objects.toString(remoteAddress) + ")"); - wait(); - } finally { - Thread.currentThread().setName(nameBefore); - } + wait(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw HyracksDataException.create(e); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8bf93fa7/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelControlBlock.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelControlBlock.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelControlBlock.java index f7ef2aa..998acfb 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelControlBlock.java +++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelControlBlock.java @@ -19,7 +19,6 @@ package org.apache.hyracks.net.protocols.muxdemux; import java.io.IOException; -import java.net.InetSocketAddress; import java.nio.channels.SocketChannel; import java.util.concurrent.atomic.AtomicBoolean; @@ -164,8 +163,4 @@ public class ChannelControlBlock implements IChannelControlBlock { + " remoteClose: " + remoteClose + " remoteCloseAck:" + remoteCloseAck + " readCredits: " + ri.getCredits() + " writeCredits: " + wi.getCredits() + "]"; } - - public InetSocketAddress getRemoteAddress() { - return cSet.getMultiplexedConnection().getRemoteAddress(); - } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8bf93fa7/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java index f5cdf2c..31a37ef 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java +++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java @@ -239,8 +239,4 @@ public class ChannelSet { ccbArray = Arrays.copyOf(ccbArray, ccbArray.length * 2); } } - - public MultiplexedConnection getMultiplexedConnection() { - return mConn; - } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/8bf93fa7/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java index 4c3836a..b6a392e 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java +++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java @@ -19,7 +19,6 @@ package org.apache.hyracks.net.protocols.muxdemux; import java.io.IOException; -import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; @@ -438,8 +437,4 @@ public class MultiplexedConnection implements ITCPConnectionEventListener { } } } - - public InetSocketAddress getRemoteAddress() { - return tcpConnection == null ? null : tcpConnection.getRemoteAddress(); - } } \ No newline at end of file
