You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2018/08/05 19:45:36 UTC
asterixdb git commit: [NO ISSUE][OTH] Move Network Tracing Logs to
Trace Level
Repository: asterixdb
Updated Branches:
refs/heads/master 8026b2dc9 -> 67e23dc4c
[NO ISSUE][OTH] Move Network Tracing Logs to Trace Level
- user model changes: no
- storage format changes: no
- interface changes: no
Change-Id: Iebc13ff6cb7b3c9086c19597ec982061672a891f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2848
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/67e23dc4
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/67e23dc4
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/67e23dc4
Branch: refs/heads/master
Commit: 67e23dc4ceebbc470d1d6150022adce5bc3805fe
Parents: 8026b2d
Author: Murtadha Hubail <mh...@apache.org>
Authored: Sat Aug 4 22:27:17 2018 -0700
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Sun Aug 5 12:45:19 2018 -0700
----------------------------------------------------------------------
.../apache/hyracks/comm/channels/NetworkInputChannel.java | 4 ++--
.../org/apache/hyracks/control/nc/net/NetworkManager.java | 4 ++--
.../apache/hyracks/control/nc/net/ResultNetworkManager.java | 4 ++--
.../hyracks/control/nc/result/ResultPartitionManager.java | 6 +++---
.../hyracks/control/nc/result/ResultPartitionReader.java | 4 ++--
.../org/apache/hyracks/control/nc/result/ResultSetMap.java | 4 ++--
.../std/collectors/NonDeterministicChannelReader.java | 8 ++++----
.../org/apache/hyracks/ipc/impl/IPCConnectionManager.java | 6 +++---
.../apache/hyracks/net/protocols/muxdemux/ChannelSet.java | 8 ++++----
.../net/protocols/muxdemux/MultiplexedConnection.java | 8 ++++----
10 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java
----------------------------------------------------------------------
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 7e893f8..58664c6 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
@@ -107,8 +107,8 @@ public class NetworkInputChannel implements IInputChannel {
writeBuffer.putInt(partitionId.getSenderIndex());
writeBuffer.putInt(partitionId.getReceiverIndex());
writeBuffer.flip();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Sending partition request: " + partitionId + " on channel: " + ccb);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Sending partition request: " + partitionId + " on channel: " + ccb);
}
ccb.getWriteInterface().getFullBufferAcceptor().accept(writeBuffer);
ccb.getWriteInterface().getFullBufferAcceptor().close();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/NetworkManager.java
----------------------------------------------------------------------
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 cfe0991..98693d0 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
@@ -124,8 +124,8 @@ public class NetworkManager implements IChannelConnectionFactory {
@Override
public void accept(ByteBuffer buffer) {
PartitionId pid = readInitialMessage(buffer);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Received initial partition request: " + pid + " on channel: " + ccb);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Received initial partition request: " + pid + " on channel: " + ccb);
}
noc = new NetworkOutputChannel(ccb, nBuffers);
partitionManager.registerPartitionRequest(pid, noc);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java
index e56bfe6..6927a58 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/net/ResultNetworkManager.java
@@ -137,8 +137,8 @@ public class ResultNetworkManager implements IChannelConnectionFactory {
JobId jobId = new JobId(buffer.getLong());
ResultSetId rsId = new ResultSetId(buffer.getLong());
int partition = buffer.getInt();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Received initial result partition read request for JobId: " + jobId + " partition: "
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Received initial result partition read request for JobId: " + jobId + " partition: "
+ partition + " on channel: " + ccb);
}
noc = new NetworkOutputChannel(ccb, nBuffers);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionManager.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionManager.java
index 82c7d50..835b59b 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionManager.java
@@ -81,7 +81,7 @@ public class ResultPartitionManager extends AbstractResultManager implements IRe
ResultState[] resultStates = rsIdMap.createOrGetResultStates(rsId, nPartitions);
resultStates[partition] = dpw.getResultState();
}
- LOGGER.debug("Initialized partition writer: JobId: {}:partition: {}", jobId, partition);
+ LOGGER.trace("Initialized partition writer: JobId: {}:partition: {}", jobId, partition);
return dpw;
}
@@ -100,7 +100,7 @@ public class ResultPartitionManager extends AbstractResultManager implements IRe
@Override
public void reportPartitionWriteCompletion(JobId jobId, ResultSetId rsId, int partition) throws HyracksException {
try {
- LOGGER.debug("Reporting partition write completion: JobId: {}:ResultSetId: {}:partition: {}", jobId, rsId,
+ LOGGER.trace("Reporting partition write completion: JobId: {}:ResultSetId: {}:partition: {}", jobId, rsId,
partition);
ncs.getClusterController(jobId.getCcId()).reportResultPartitionWriteCompletion(jobId, rsId, partition);
} catch (Exception e) {
@@ -114,7 +114,7 @@ public class ResultPartitionManager extends AbstractResultManager implements IRe
ResultState resultState = getResultState(jobId, resultSetId, partition);
ResultPartitionReader dpr = new ResultPartitionReader(this, resultMemoryManager, executor, resultState);
dpr.writeTo(writer);
- LOGGER.debug("Initialized partition reader: JobId: {}:ResultSetId: {}:partition: {}", jobId, resultSetId,
+ LOGGER.trace("Initialized partition reader: JobId: {}:ResultSetId: {}:partition: {}", jobId, resultSetId,
partition);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java
index 121d5a1..39cdc1e 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultPartitionReader.java
@@ -77,8 +77,8 @@ public class ResultPartitionReader {
buffer.flip();
channel.nextFrame(buffer);
}
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("result reading successful(" + resultState.getResultSetPartitionId() + ")");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("result reading successful(" + resultState.getResultSetPartitionId() + ")");
}
} catch (Exception e) {
LOGGER.error(() -> "failed to send result partition " + resultState.getResultSetPartitionId(), e);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultSetMap.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultSetMap.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultSetMap.java
index 41b7f07..518dc48 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultSetMap.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/result/ResultSetMap.java
@@ -71,7 +71,7 @@ class ResultSetMap implements IResultStateRecord, Serializable {
final ResultState state = resultStates[partition];
if (state != null) {
state.closeAndDelete();
- LOGGER.debug("Removing partition: " + partition + " for JobId: " + jobId);
+ LOGGER.trace("Removing partition: {} for JobId: {}", partition, jobId);
}
resultStates[partition] = null;
boolean stateEmpty = true;
@@ -96,7 +96,7 @@ class ResultSetMap implements IResultStateRecord, Serializable {
void closeAndDeleteAll() {
applyToAllStates((rsId, state, i) -> {
state.closeAndDelete();
- LOGGER.debug("Removing partition: " + i + " for result set " + rsId);
+ LOGGER.trace("Removing partition: {} for result set {}", i, rsId);
});
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/collectors/NonDeterministicChannelReader.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/collectors/NonDeterministicChannelReader.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/collectors/NonDeterministicChannelReader.java
index 5a1d5f8..3b5c9b1 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/collectors/NonDeterministicChannelReader.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/collectors/NonDeterministicChannelReader.java
@@ -166,8 +166,8 @@ public class NonDeterministicChannelReader implements IInputChannelMonitor, IPar
public synchronized void notifyDataAvailability(IInputChannel channel, int nFrames) {
PartitionId pid = (PartitionId) channel.getAttachment();
int senderIndex = pid.getSenderIndex();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Data available: " + pid.getConnectorDescriptorId() + " sender: " + senderIndex + " receiver: "
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Data available: " + pid.getConnectorDescriptorId() + " sender: " + senderIndex + " receiver: "
+ pid.getReceiverIndex());
}
availableFrameCounts[senderIndex] += nFrames;
@@ -179,8 +179,8 @@ public class NonDeterministicChannelReader implements IInputChannelMonitor, IPar
public synchronized void notifyEndOfStream(IInputChannel channel) {
PartitionId pid = (PartitionId) channel.getAttachment();
int senderIndex = pid.getSenderIndex();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("EOS: " + pid);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("EOS: " + pid);
}
eosSenders.set(senderIndex);
notifyAll();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
index b191bd3..53ada46 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
@@ -138,8 +138,8 @@ public class IPCConnectionManager {
}
synchronized void write(Message msg) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Enqueued message: " + msg);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Enqueued message: " + msg);
}
sendList.add(msg);
networkThread.selector.wakeup();
@@ -312,7 +312,7 @@ public class IPCConnectionManager {
}
private boolean sendMessage(Message msg) {
- LOGGER.debug("Processing send of message: {}", msg);
+ LOGGER.trace("Processing send of message: {}", msg);
IPCHandle handle = msg.getIPCHandle();
if (handle.getState() == HandleState.CLOSED) {
// message will never be sent
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/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 49b9f7a..a546349 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
@@ -82,8 +82,8 @@ public class ChannelSet {
ChannelControlBlock ccb = ccbArray[i];
if (ccb != null) {
if (ccb.completelyClosed()) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Cleaning free channel: " + ccb);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Cleaning free channel: " + ccb);
}
freeChannel(ccb);
}
@@ -218,8 +218,8 @@ public class ChannelSet {
if (ccbArray[idx] != null) {
assert ccbArray[idx].completelyClosed() : ccbArray[idx].toString();
if (ccbArray[idx].completelyClosed()) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Cleaning free channel: " + ccbArray[idx]);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Cleaning free channel: " + ccbArray[idx]);
}
freeChannel(ccbArray[idx]);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67e23dc4/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 a7fa49e..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
@@ -346,8 +346,8 @@ public class MultiplexedConnection implements ITCPConnectionEventListener {
}
readerState.readBuffer.flip();
readerState.command.read(readerState.readBuffer);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Received command: " + readerState.command);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Received command: " + readerState.command);
}
ChannelControlBlock ccb = null;
switch (readerState.command.getCommandType()) {
@@ -389,8 +389,8 @@ public class MultiplexedConnection implements ITCPConnectionEventListener {
muxDemux.getChannelOpenListener().channelOpened(ccb);
}
}
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Applied command: " + readerState.command + " on " + ccb);
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Applied command: " + readerState.command + " on " + ccb);
}
}
if (readerState.pendingReadSize > 0) {