[NO ISSUE][OTH] Log Level Fixes
- user model changes: no
- storage format changes: no
- interface changes: no
Change-Id: Ib5fb7e3140bf36cf4ba5857b9fda8e6cc4bdfa20
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2883
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mhubail@apache.org>
Reviewed-by: Till Westmann <tillw@apache.org>
diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
index af9d109..b1a1fcc 100644
--- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
+++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
@@ -93,7 +93,7 @@
@Override
public final void initialize() throws HyracksDataException {
- LOGGER.log(Level.INFO, "initialize() called on ActiveSourceOperatorNodePushable");
+ LOGGER.trace("initialize() called on ActiveSourceOperatorNodePushable");
taskThread = Thread.currentThread();
activeManager.registerRuntime(this);
try {
@@ -113,7 +113,7 @@
done = true;
notifyAll();
}
- LOGGER.log(Level.INFO, "initialize() returning on ActiveSourceOperatorNodePushable");
+ LOGGER.trace("initialize() returning on ActiveSourceOperatorNodePushable");
}
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index 8ade9ec..e5d557b 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -183,9 +183,9 @@
@Override
public synchronized IActiveEntityEventsListener[] getEventListeners() {
- if (LOGGER.isEnabled(level)) {
- LOGGER.log(level, "getEventListeners() was called");
- LOGGER.log(level, "returning " + entityEventListeners.size() + " Listeners");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("getEventListeners() was called");
+ LOGGER.trace("returning " + entityEventListeners.size() + " Listeners");
}
return entityEventListeners.values().toArray(new IActiveEntityEventsListener[entityEventListeners.size()]);
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
index b26342e..3f2412f 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
@@ -676,7 +676,7 @@
}
private long findResourceInGroup(ResourceGroup group, int dsId, int entityHashValue) {
- stats.logCounters(LOGGER, Level.DEBUG, false);
+ stats.logCounters(LOGGER, LVL, false);
long resSlot = group.firstResourceIndex.get();
while (resSlot != NILL) {
// either we already have a lock on this resource or we have a
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/HybridHashJoinPOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/HybridHashJoinPOperator.java
index d06dde5..45ec44b 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/HybridHashJoinPOperator.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/HybridHashJoinPOperator.java
@@ -78,12 +78,13 @@
this.maxInputBuildSizeInFrames = maxInputSizeInFrames;
this.aveRecordsPerFrame = aveRecordsPerFrame;
this.fudgeFactor = fudgeFactor;
-
- LOGGER.debug("HybridHashJoinPOperator constructed with: JoinKind=" + kind + ", JoinPartitioningType="
- + partitioningType + ", List<LogicalVariable>=" + sideLeftOfEqualities + ", List<LogicalVariable>="
- + sideRightOfEqualities + ", int memSizeInFrames=" + memSizeInFrames + ", int maxInputSize0InFrames="
- + maxInputSizeInFrames + ", int aveRecordsPerFrame=" + aveRecordsPerFrame + ", double fudgeFactor="
- + fudgeFactor + ".");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("HybridHashJoinPOperator constructed with: JoinKind=" + kind + ", JoinPartitioningType="
+ + partitioningType + ", List<LogicalVariable>=" + sideLeftOfEqualities + ", List<LogicalVariable>="
+ + sideRightOfEqualities + ", int memSizeInFrames=" + memSizeInFrames
+ + ", int maxInputSize0InFrames=" + maxInputSizeInFrames + ", int aveRecordsPerFrame="
+ + aveRecordsPerFrame + ", double fudgeFactor=" + fudgeFactor + ".");
+ }
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java
index e2cd923..3628e96 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java
@@ -146,8 +146,8 @@
}
acg.addActivityClusters(acList);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(acg.toJSON().asText());
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(acg.toJSON().asText());
}
return acg;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/ResultNetworkInputChannel.java b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/ResultNetworkInputChannel.java
index 37540cd..1df39e9 100644
--- a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/ResultNetworkInputChannel.java
+++ b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/ResultNetworkInputChannel.java
@@ -114,8 +114,8 @@
writeBuffer.putLong(resultSetId.getId());
writeBuffer.putInt(partition);
writeBuffer.flip();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Sending partition request for JobId: " + jobId + " partition: " + partition + " on channel: "
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Sending partition request for JobId: " + jobId + " partition: " + partition + " on channel: "
+ ccb);
}
ccb.getWriteInterface().getFullBufferAcceptor().accept(writeBuffer);
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/InMemoryHashJoin.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/InMemoryHashJoin.java
index 10c6227..89c370f 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/InMemoryHashJoin.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/InMemoryHashJoin.java
@@ -110,8 +110,10 @@
} else {
isTableCapacityNotZero = false;
}
- LOGGER.debug("InMemoryHashJoin has been created for a table size of " + table.getTableSize() + " for Thread ID "
- + Thread.currentThread().getId() + ".");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("InMemoryHashJoin has been created for a table size of " + table.getTableSize()
+ + " for Thread ID " + Thread.currentThread().getId() + ".");
+ }
}
public void build(ByteBuffer buffer) throws HyracksDataException {
@@ -205,8 +207,8 @@
}
}
buffers.clear();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("InMemoryHashJoin has finished using " + nFrames + " frames for Thread ID "
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("InMemoryHashJoin has finished using " + nFrames + " frames for Thread ID "
+ Thread.currentThread().getId() + ".");
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
index b68e64e..e7984d6 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
@@ -295,8 +295,8 @@
buildHpc, predEvaluator, isLeftOuter, nonMatchWriterFactories);
state.hybridHJ.initBuild();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("OptimizedHybridHashJoin is starting the build phase with " + state.numOfPartitions
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("OptimizedHybridHashJoin is starting the build phase with " + state.numOfPartitions
+ " partitions using " + state.memForJoin + " frames for memory.");
}
}
@@ -313,8 +313,8 @@
state.hybridHJ.clearBuildTempFiles();
} else {
ctx.setStateObject(state);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("OptimizedHybridHashJoin closed its build phase");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("OptimizedHybridHashJoin closed its build phase");
}
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java
index f274ca1..406703e 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java
@@ -132,8 +132,8 @@
runGen.close();
state.generatedRunFileReaders = runGen.getRuns();
state.sorter = runGen.getSorter();
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("InitialNumberOfRuns:" + runGen.getRuns().size());
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("InitialNumberOfRuns:" + runGen.getRuns().size());
}
ctx.setStateObject(state);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
index a88a19a..1cad00f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
@@ -31,7 +31,6 @@
import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
import org.apache.hyracks.storage.common.MultiComparator;
import org.apache.hyracks.storage.common.buffercache.IPageWriteFailureCallback;
-import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -159,8 +158,8 @@
@Override
public void markAsValid(boolean persist, IPageWriteFailureCallback callback) throws HyracksDataException {
ComponentUtils.markAsValid(getMetadataHolder(), persist, callback);
- if (LOGGER.isInfoEnabled()) {
- LOGGER.log(Level.INFO, "Marked as valid component with id: " + getId());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Marked as valid component with id: " + getId());
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
index ab00dff..278098f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
@@ -335,8 +335,8 @@
throw new IllegalStateException(
this + " receives illegal id. Old id " + this.componentId + ", new id " + componentId);
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.log(Level.INFO, "Component Id was reset from " + this.componentId + " to " + componentId);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Component Id was reset from " + this.componentId + " to " + componentId);
}
this.componentId = componentId;
if (componentId != null) {
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 8e2ff01..aa7be86 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -478,7 +478,7 @@
@Override
public ILSMIOOperation scheduleFlush(ILSMIndexOperationContext ctx) throws HyracksDataException {
ILSMIOOperation flush;
- LOGGER.info("Flush is being scheduled on {}", lsmIndex);
+ LOGGER.debug("Flush is being scheduled on {}", lsmIndex);
if (!lsmIndex.isMemoryComponentsAllocated()) {
lsmIndex.allocateMemoryComponents();
}
@@ -498,9 +498,7 @@
@SuppressWarnings("squid:S2142")
@Override
public void flush(ILSMIOOperation operation) throws HyracksDataException {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Started a flush operation for index: {}", lsmIndex);
- }
+ LOGGER.debug("Started a flush operation for index: {}", lsmIndex);
synchronized (opTracker) {
while (!enterComponents(operation.getAccessor().getOpContext(), LSMOperationType.FLUSH)) {
try {
@@ -520,8 +518,8 @@
operation.getAccessor().getOpContext().getSearchOperationCallback(),
operation.getAccessor().getOpContext().getModificationCallback());
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Finished the flush operation for index: {}. Result: ", lsmIndex, operation.getStatus());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Finished the flush operation for index: {}. Result: {}", lsmIndex, operation.getStatus());
}
}
@@ -561,8 +559,8 @@
@Override
public void merge(ILSMIOOperation operation) throws HyracksDataException {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Started a merge operation for index: {}", lsmIndex);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Started a merge operation for index: {}", lsmIndex);
}
synchronized (opTracker) {
enterComponents(operation.getAccessor().getOpContext(), LSMOperationType.MERGE);
@@ -576,8 +574,8 @@
operation.getAccessor().getOpContext().getSearchOperationCallback(),
operation.getAccessor().getOpContext().getModificationCallback());
}
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Finished the merge operation for index: {}. Result: {}", lsmIndex, operation.getStatus());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Finished the merge operation for index: {}. Result: {}", lsmIndex, operation.getStatus());
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
index e73fa0a..0c2167f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MemoryComponentMetadata.java
@@ -29,7 +29,6 @@
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrame;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentMetadata;
-import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -95,11 +94,11 @@
public void copy(IMetadataPageManager mdpManager) throws HyracksDataException {
lock.readLock().lock();
try {
- LOGGER.log(Level.INFO, "Copying Metadata into a different component");
+ LOGGER.trace("Copying Metadata into a different component");
ITreeIndexMetadataFrame frame = mdpManager.createMetadataFrame();
for (Pair<IValueReference, ArrayBackedValueStorage> pair : store) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.log(Level.INFO, "Copying " + pair.getKey() + " : " + pair.getValue().getLength() + " bytes");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("Copying " + pair.getKey() + " : " + pair.getValue().getLength() + " bytes");
}
mdpManager.put(frame, pair.getKey(), pair.getValue());
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
index 262943a..1e3f85b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
@@ -81,7 +81,7 @@
new ArrayBlockingQueue<>(IO_REQUEST_QUEUE_SIZE);
//DEBUG
- private static final Level fileOpsLevel = Level.DEBUG;
+ private static final Level fileOpsLevel = Level.TRACE;
private ArrayList<CachedPage> confiscatedPages;
private Lock confiscateLock;
private HashMap<CachedPage, StackTraceElement[]> confiscatedPagesOwner;