>From Ali Alsuliman <[email protected]>:
Ali Alsuliman has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17727 )
Change subject: Net debug logs
......................................................................
Net debug logs
Change-Id: If16dd84634a1278fbb2c549b5b2247c9db4a8512
---
M
hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java
M
hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPConnection.java
M
hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
M
hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkOutputChannel.java
M
hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
M
hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/MessagingChannelWriteInterface.java
8 files changed, 50 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/27/17727/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/MessagingChannelWriteInterface.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/MessagingChannelWriteInterface.java
index 57e8792..4c330d7 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/MessagingChannelWriteInterface.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/messaging/MessagingChannelWriteInterface.java
@@ -24,8 +24,11 @@
import org.apache.hyracks.api.comm.MuxDemuxCommand;
import org.apache.hyracks.api.exceptions.NetException;
import org.apache.hyracks.net.protocols.muxdemux.AbstractChannelWriteInterface;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class MessagingChannelWriteInterface extends
AbstractChannelWriteInterface {
+ private static final Logger LOGGER = LogManager.getLogger();
MessagingChannelWriteInterface(IChannelControlBlock ccb) {
super(ccb);
@@ -53,7 +56,10 @@
writerState.reset(null, 0, null);
ecodeSent = true;
ccb.reportLocalEOS();
+ boolean b1 = channelWritabilityState;
adjustChannelWritability();
+ boolean b2 = channelWritabilityState;
+ LOGGER.debug("mc: {} writing {}. b1={}, b2={}", ccb,
MuxDemuxCommand.CommandType.ERROR, b1, b2);
} else if (isPendingCloseWrite()) {
writerState.getCommand().setChannelId(channelId);
writerState.getCommand().setCommandType(MuxDemuxCommand.CommandType.CLOSE_CHANNEL);
@@ -61,7 +67,10 @@
writerState.reset(null, 0, null);
eosSent = true;
ccb.reportLocalEOS();
+ boolean b1 = channelWritabilityState;
adjustChannelWritability();
+ boolean b2 = channelWritabilityState;
+ LOGGER.debug("mc: {} writing {}. b1={}, b2={}", ccb,
MuxDemuxCommand.CommandType.CLOSE_CHANNEL, b1, b2);
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java
b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java
index 53bb7cd..c9fbe25 100644
---
a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java
+++
b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java
@@ -116,12 +116,13 @@
@Override
public void close() throws HyracksDataException {
-
+ LOGGER.debug("NetworkInputChannel: close(); {}", ccb);
}
@Override
public void fail() {
// do nothing (covered by job lifecycle)
+ LOGGER.debug("NetworkInputChannel: fail(); {}", ccb);
}
private class ReadFullBufferAcceptor implements ICloseableBufferAcceptor {
@@ -133,11 +134,13 @@
@Override
public void close() {
+ LOGGER.debug("NetworkInputChannel: fba close(); {}", ccb);
monitor.notifyEndOfStream(NetworkInputChannel.this);
}
@Override
public void error(int ecode) {
+ LOGGER.debug("NetworkInputChannel: fba abort(); ecode {}; {}",
ecode, ccb);
monitor.notifyFailure(NetworkInputChannel.this, ecode);
}
}
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 17cdc3e..b303d99 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
@@ -29,8 +29,11 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.net.protocols.muxdemux.AbstractChannelWriteInterface;
import org.apache.hyracks.net.protocols.muxdemux.ChannelControlBlock;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class NetworkOutputChannel implements IFrameWriter {
+ private static final Logger LOGGER = LogManager.getLogger();
private final ChannelControlBlock ccb;
private final int nBuffers;
@@ -106,15 +109,18 @@
@Override
public void fail() throws HyracksDataException {
+ LOGGER.debug("NetworkOutputChannel: fail(); {}", ccb);
ccb.getWriteInterface().getFullBufferAcceptor().error(AbstractChannelWriteInterface.REMOTE_ERROR_CODE);
}
@Override
public void close() throws HyracksDataException {
+ LOGGER.debug("NetworkOutputChannel: close(); {}", ccb);
ccb.getWriteInterface().getFullBufferAcceptor().close();
}
public void abort(int ecode) {
+ LOGGER.debug("NetworkOutputChannel: abort(); ecode {}; {}", ecode,
ccb);
ccb.getWriteInterface().getFullBufferAcceptor().error(ecode);
synchronized (NetworkOutputChannel.this) {
aborted = true;
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java
index 6876618..f35f959 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java
@@ -62,6 +62,7 @@
public NetworkManager(String inetAddress, int inetPort, PartitionManager
partitionManager, int nThreads,
int nBuffers, String publicInetAddress, int publicInetPort,
IChannelInterfaceFactory channelInterfaceFactory,
ISocketChannelFactory socketChannelFactory) {
+ LOGGER.debug("NetworkManager: nBuffers={}, nThreads={}", nBuffers,
nThreads);
this.partitionManager = partitionManager;
this.nBuffers = nBuffers;
md = new MuxDemux(new InetSocketAddress(inetAddress, inetPort), new
ChannelOpenListener(), nThreads,
@@ -112,6 +113,7 @@
private class ChannelOpenListener implements IChannelOpenListener {
@Override
public void channelOpened(ChannelControlBlock channel) {
+ LOGGER.debug("ChannelOpenListener: channel opened; {}", channel);
channel.getReadInterface().setFullBufferAcceptor(new
InitialBufferAcceptor(channel));
channel.getReadInterface().getEmptyBufferAcceptor().accept(ByteBuffer.allocate(INITIAL_MESSAGE_SIZE));
}
@@ -138,7 +140,7 @@
@Override
public void close() {
-
+ LOGGER.debug("NetworkManager: ba close()");
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
index 3595a3e..07b7fd9 100644
---
a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
+++
b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
@@ -48,7 +48,10 @@
writerState.reset(null, 0, null);
ecodeSent = true;
ccb.reportLocalEOS();
+ boolean b1 = channelWritabilityState;
adjustChannelWritability();
+ boolean b2 = channelWritabilityState;
+ LOGGER.debug("ffc: {} writing {}. b1={}, b2={}", ccb,
MuxDemuxCommand.CommandType.ERROR, b1, b2);
} else if (currentWriteBuffer != null) {
int size = Math.min(currentWriteBuffer.remaining(), credits);
if (size > 0) {
@@ -70,7 +73,10 @@
writerState.reset(null, 0, null);
eosSent = true;
ccb.reportLocalEOS();
+ boolean b1 = channelWritabilityState;
adjustChannelWritability();
+ boolean b2 = channelWritabilityState;
+ LOGGER.debug("ffc: {} writing {}. b1={}, b2={}", ccb,
MuxDemuxCommand.CommandType.CLOSE_CHANNEL, b1, b2);
}
}
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 061c6eee..17a8dda 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
@@ -300,6 +300,7 @@
if (!writerState.performPendingWrite(sc)) {
return;
}
+ LOGGER.debug("mux: {} writing {}", ccb,
MuxDemuxCommand.CommandType.CLOSE_CHANNEL_ACK);
pendingWriteEventsCounter.decrement();
}
BitSet pendingChannelWriteBitmap =
cSet.getPendingChannelWriteBitmap();
@@ -377,6 +378,7 @@
}
case CLOSE_CHANNEL: {
ccb = readerState.getCCBInCommand();
+ LOGGER.debug("mux: {} received {}", ccb,
MuxDemuxCommand.CommandType.CLOSE_CHANNEL);
ccb.reportRemoteEOS();
int channelId = ccb.getChannelId();
cSet.markEOSAck(channelId);
@@ -385,6 +387,7 @@
}
case CLOSE_CHANNEL_ACK: {
ccb = readerState.getCCBInCommand();
+ LOGGER.debug("mux: {} received {}", ccb,
MuxDemuxCommand.CommandType.CLOSE_CHANNEL_ACK);
ccb.reportLocalEOSAck();
break;
}
@@ -396,6 +399,7 @@
}
case ERROR: {
ccb = readerState.getCCBInCommand();
+ LOGGER.debug("mux: {} received {}", ccb,
MuxDemuxCommand.CommandType.ERROR);
ccb.reportRemoteError(readerState.command.getData());
int channelId = ccb.getChannelId();
cSet.markEOSAck(channelId);
diff --git
a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPConnection.java
b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPConnection.java
index 1814edb..492bb88 100644
---
a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPConnection.java
+++
b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPConnection.java
@@ -117,6 +117,7 @@
@Override
public String toString() {
- return "TCPConnection[Remote Address: " + remoteAddress + " Local
Address: " + endpoint.getLocalAddress() + "]";
+ return "TCPConnection[Remote Address: " + remoteAddress + " Local
Address: " + endpoint.getLocalAddress()
+ + " type " + type + " ]";
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
index b75e3c6..a032f2d 100644
---
a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
+++
b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/tcp/TCPEndpoint.java
@@ -253,6 +253,7 @@
throw new IllegalStateException("Unknown
connection type: " + conn.type);
}
} else {
+ LOGGER.error("handshake failed. {}", conn);
handleHandshakeFailure(conn);
}
} catch (Exception e) {
@@ -365,5 +366,11 @@
this.type = connectionType;
this.address = address;
}
+
+ @Override
+ public String toString() {
+ return "PendingHandshakeConnection{" + "socketChannel=" +
socketChannel + ", type=" + type + ", address="
+ + address + ", handshakeSuccess=" + handshakeSuccess + '}';
+ }
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17727
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: If16dd84634a1278fbb2c549b5b2247c9db4a8512
Gerrit-Change-Number: 17727
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-MessageType: newchange