Fixed log info calls without isInfoEnabled checks
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96e7bb1d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96e7bb1d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96e7bb1d Branch: refs/heads/ignite-5578 Commit: 96e7bb1daccd64ea72ed043f1ebbe2792e5a0e92 Parents: 99584fe Author: Alexey Goncharuk <[email protected]> Authored: Fri Jul 28 15:11:41 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Jul 28 15:11:41 2017 +0300 ---------------------------------------------------------------------- .../IgniteDiagnosticPrepareContext.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 3 +- .../mem/file/MappedFileMemoryProvider.java | 3 +- .../GridCachePartitionExchangeManager.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 20 ++++++----- .../GridCacheDatabaseSharedManager.java | 7 ++-- .../persistence/freelist/FreeListImpl.java | 18 +++++----- .../reader/StandaloneWalRecordsIterator.java | 4 ++- .../cluster/GridClusterStateProcessor.java | 3 +- .../datastructures/GridCacheLockImpl.java | 13 ++++--- .../processors/odbc/SqlListenerProcessor.java | 3 +- .../ignite/internal/util/nio/GridNioServer.java | 7 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 38 ++++++++++---------- .../ignite/tests/p2p/JobStealingTask.java | 12 ++++--- .../hadoop/jobtracker/HadoopJobTracker.java | 24 +++++++------ .../hadoop/shuffle/HadoopShuffleJob.java | 5 +-- .../apache/ignite/stream/mqtt/MqttStreamer.java | 6 ++-- .../spi/deployment/uri/UriDeploymentSpi.java | 3 +- 18 files changed, 101 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java index 416ef29..378dc74 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticPrepareContext.java @@ -146,7 +146,8 @@ public class IgniteDiagnosticPrepareContext { @Override public void apply(IgniteInternalFuture<String> fut) { synchronized (IgniteDiagnosticPrepareContext.class) { try { - log.info(fut.get()); + if (log.isInfoEnabled()) + log.info(fut.get()); } catch (Exception e) { U.error(log, "Failed to dump diagnostic info: " + e, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 00c1d73..ae6722c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1253,7 +1253,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { sysPoolIdleThreads + ", qSize=" + sysPoolQSize + "]" + NL + " ^-- Outbound messages queue [size=" + m.getOutboundMessagesQueueSize() + "]"; - log.info(msg); + if (log.isInfoEnabled()) + log.info(msg); ctx.cache().context().database().dumpStatistics(log); } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java index b0d8d9a..3800214 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java @@ -81,7 +81,8 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider { File[] files = allocationPath.listFiles(ALLOCATOR_FILTER); if (files.length != 0) { - log.info("Will clean up the following files upon start: " + Arrays.asList(files)); + if (log.isInfoEnabled()) + log.info("Will clean up the following files upon start: " + Arrays.asList(files)); for (File file : files) { if (!file.delete()) http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index d4fe93f..71572f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1491,7 +1491,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana cctx.io().dumpPendingMessages(pendingMsgs); - if (pendingMsgs.length() > 0) + if (pendingMsgs.length() > 0 && diagnosticLog.isInfoEnabled()) diagnosticLog.info(pendingMsgs.toString()); if (IgniteSystemProperties.getBoolean(IGNITE_IO_DUMP_ON_TIMEOUT, false)) http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index c4a4f83..ad17666 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -442,13 +442,14 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte boolean crdNode = crd != null && crd.isLocal(); - exchLog.info("Started exchange init [topVer=" + topVer + - ", crd=" + crdNode + - ", evt=" + discoEvt.type() + - ", node=" + discoEvt.node() + - ", evtNode=" + discoEvt.node() + - ", customEvt=" + (discoEvt.type() == EVT_DISCOVERY_CUSTOM_EVT ? ((DiscoveryCustomEvent)discoEvt).customMessage() : null) + - ']'); + if (exchLog.isInfoEnabled()) + exchLog.info("Started exchange init [topVer=" + topVer + + ", crd=" + crdNode + + ", evt=" + discoEvt.type() + + ", node=" + discoEvt.node() + + ", evtNode=" + discoEvt.node() + + ", customEvt=" + (discoEvt.type() == EVT_DISCOVERY_CUSTOM_EVT ? ((DiscoveryCustomEvent)discoEvt).customMessage() : null) + + ']'); ExchangeType exchange; @@ -967,8 +968,9 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte String futInfo = RELEASE_FUTURE_DUMP_THRESHOLD > 0 && waitTime > RELEASE_FUTURE_DUMP_THRESHOLD ? partReleaseFut.toString() : "NA"; - log.info("Finished waiting for partition release future [topVer=" + exchangeId().topologyVersion() + - ", waitTime=" + (waitEnd - waitStart) + "ms, futInfo=" + futInfo + "]"); + if (log.isInfoEnabled()) + log.info("Finished waiting for partition release future [topVer=" + exchangeId().topologyVersion() + + ", waitTime=" + (waitEnd - waitStart) + "ms, futInfo=" + futInfo + "]"); } IgniteInternalFuture<?> locksFut = cctx.mvcc().finishLocks(exchId.topologyVersion()); http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 39038ba..a1eb4af 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -1229,7 +1229,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan if (Files.exists(dir.toPath())) log.warning("Read checkpoint status: cpDir.exists() is false, Files.exists(cpDir) is true."); - log.info("Read checkpoint status: checkpoint directory is not found."); + if (log.isInfoEnabled()) + log.info("Read checkpoint status: checkpoint directory is not found."); return new CheckpointStatus(0, startId, startPtr, endId, endPtr); } @@ -1266,8 +1267,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan if (endFile != null) endPtr = readPointer(endFile, buf); - // TODO: remove excessive logging after GG-12116 fix. - log.info("Read checkpoint status: start marker = " + startFile + ", end marker = " + endFile); + if (log.isInfoEnabled()) + log.info("Read checkpoint status [startMarker=" + startFile + ", endMarker=" + endFile + ']'); return new CheckpointStatus(lastStartTs, startId, startPtr, endId, endPtr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java index d50020e..53a33c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java @@ -406,18 +406,20 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList { } } - log.info("Bucket [b=" + b + - ", size=" + size + - ", stripes=" + (stripes != null ? stripes.length : 0) + - ", stripesEmpty=" + empty + ']'); + if (log.isInfoEnabled()) + log.info("Bucket [b=" + b + + ", size=" + size + + ", stripes=" + (stripes != null ? stripes.length : 0) + + ", stripesEmpty=" + empty + ']'); } } if (dataPages > 0) { - log.info("FreeList [name=" + name + - ", buckets=" + BUCKETS + - ", dataPages=" + dataPages + - ", reusePages=" + bucketsSize[REUSE_BUCKET].longValue() + "]"); + if (log.isInfoEnabled()) + log.info("FreeList [name=" + name + + ", buckets=" + BUCKETS + + ", dataPages=" + dataPages + + ", reusePages=" + bucketsSize[REUSE_BUCKET].longValue() + "]"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java index ecad70a..85022ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java @@ -234,7 +234,9 @@ class StandaloneWalRecordsIterator extends AbstractWalRecordsIterator { return initReadHandle(fd, null); } catch (FileNotFoundException e) { - log.info("Missing WAL segment in the archive: " + e.getMessage()); + if (log.isInfoEnabled()) + log.info("Missing WAL segment in the archive: " + e.getMessage()); + return null; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 6e94669..283a58f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -273,7 +273,8 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { if (fut != null) fut.setRemaining(nodeIds, topVer.nextMinorVersion()); - log.info("Start state transition: " + msg.activate()); + if (log.isInfoEnabled()) + log.info("Started state transition: " + msg.activate()); globalState = DiscoveryDataClusterState.createTransitionState(msg.activate(), msg.requestId(), http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java index b798670..fac7eaf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheLockImpl.java @@ -567,15 +567,17 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo } catch (Exception e) { if (interruptAll) { - log.info("Node is stopped (or lock is broken in non-failover safe mode)," + - " aborting transaction."); + if (log.isInfoEnabled()) + log.info("Node is stopped (or lock is broken in non-failover safe mode)," + + " aborting transaction."); // Return immediately, exception will be thrown later. return true; } else { if (Thread.currentThread().isInterrupted()) { - log.info("Thread is interrupted while attempting to acquire lock."); + if (log.isInfoEnabled()) + log.info("Thread is interrupted while attempting to acquire lock."); // Delegate the decision to throw InterruptedException to the AQS. sync.release(0); @@ -803,8 +805,9 @@ public final class GridCacheLockImpl implements GridCacheLockEx, IgniteChangeGlo } catch (Exception e) { if (interruptAll) { - log.info("Node is stopped (or lock is broken in non-failover safe mode)," + - " aborting transaction."); + if (log.isInfoEnabled()) + log.info("Node is stopped (or lock is broken in non-failover safe mode)," + + " aborting transaction."); return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerProcessor.java index a7061ff..1b364b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerProcessor.java @@ -144,7 +144,8 @@ public class SqlListenerProcessor extends GridProcessorAdapter { ctx.ports().registerPort(port, IgnitePortProtocol.TCP, getClass()); - log.info("SQL connector processor has started on TCP port " + port); + if (log.isInfoEnabled()) + log.info("SQL connector processor has started on TCP port " + port); lastErr = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index ce7e7f3..2f591f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -3878,9 +3878,10 @@ public class GridNioServer<T> { GridNioSession ses = randomSession(clientWorkers.get(w1)); if (ses != null) { - log.info("Move session [from=" + w1 + - ", to=" + w2 + - ", ses=" + ses + ']'); + if (log.isInfoEnabled()) + log.info("Move session [from=" + w1 + + ", to=" + w2 + + ", ses=" + ses + ']'); moveSession(ses, w1, w2); } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/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 d621fb3..f673f3f 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 @@ -1510,21 +1510,22 @@ class ServerImpl extends TcpDiscoveryImpl { TcpDiscoveryNode coord = resolveCoordinator(); - log.info("Discovery SPI statistics [statistics=" + spi.stats + ", spiState=" + spiStateCopy() + - ", coord=" + coord + - ", next=" + (msgWorker != null ? msgWorker.next : "N/A") + - ", intOrder=" + (locNode != null ? locNode.internalOrder() : "N/A") + - ", topSize=" + ring.allNodes().size() + - ", leavingNodesSize=" + leavingNodesSize + - ", failedNodesSize=" + failedNodesSize + - ", joiningNodesSize=" + joiningNodesSize + - ", pendingCustomMsgs=" + pendingCustomMsgsSize + - ", msgWorker.queue.size=" + (msgWorker != null ? msgWorker.queueSize() : "N/A") + - ", clients=" + ring.clientNodes().size() + - ", clientWorkers=" + clientMsgWorkers.size() + - ", lastUpdate=" + (locNode != null ? U.format(locNode.lastUpdateTime()) : "N/A") + - ", heapFree=" + runtime.freeMemory() / (1024 * 1024) + - "M, heapTotal=" + runtime.maxMemory() / (1024 * 1024) + "M]"); + if (log.isInfoEnabled()) + log.info("Discovery SPI statistics [statistics=" + spi.stats + ", spiState=" + spiStateCopy() + + ", coord=" + coord + + ", next=" + (msgWorker != null ? msgWorker.next : "N/A") + + ", intOrder=" + (locNode != null ? locNode.internalOrder() : "N/A") + + ", topSize=" + ring.allNodes().size() + + ", leavingNodesSize=" + leavingNodesSize + + ", failedNodesSize=" + failedNodesSize + + ", joiningNodesSize=" + joiningNodesSize + + ", pendingCustomMsgs=" + pendingCustomMsgsSize + + ", msgWorker.queue.size=" + (msgWorker != null ? msgWorker.queueSize() : "N/A") + + ", clients=" + ring.clientNodes().size() + + ", clientWorkers=" + clientMsgWorkers.size() + + ", lastUpdate=" + (locNode != null ? U.format(locNode.lastUpdateTime()) : "N/A") + + ", heapFree=" + runtime.freeMemory() / (1024 * 1024) + + "M, heapTotal=" + runtime.maxMemory() / (1024 * 1024) + "M]"); } } @@ -5506,9 +5507,10 @@ class ServerImpl extends TcpDiscoveryImpl { spiStateCopy() == CONNECTED && (hasRemoteSrvNodes = ring.hasRemoteServerNodes())) { - log.info("Local node seems to be disconnected from topology (failure detection timeout " + - "is reached) [failureDetectionTimeout=" + spi.failureDetectionTimeout() + - ", connCheckFreq=" + connCheckFreq + ']'); + if (log.isInfoEnabled()) + log.info("Local node seems to be disconnected from topology (failure detection timeout " + + "is reached) [failureDetectionTimeout=" + spi.failureDetectionTimeout() + + ", connCheckFreq=" + connCheckFreq + ']'); failureThresholdReached = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java index 2e81694..b43f4cd 100644 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/JobStealingTask.java @@ -70,7 +70,8 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege Map<UUID, Integer> ret = U.newHashMap(results.size()); for (ComputeJobResult res : results) { - log.info("Job result: " + res.getData()); + if (log.isInfoEnabled()) + log.info("Job result: " + res.getData()); UUID resUuid = (UUID)res.getData(); @@ -102,7 +103,8 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege /** {@inheritDoc} */ @Override public Serializable execute() { - log.info("Started job on node: " + ignite.cluster().localNode().id()); + if (log.isInfoEnabled()) + log.info("Started job on node: " + ignite.cluster().localNode().id()); try { Long sleep = argument(0); @@ -112,12 +114,14 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege Thread.sleep(sleep); } catch (InterruptedException e) { - log.info("Job got interrupted on node: " + ignite.cluster().localNode().id()); + if (log.isInfoEnabled()) + log.info("Job got interrupted on node: " + ignite.cluster().localNode().id()); throw new IgniteException("Job got interrupted.", e); } finally { - log.info("Job finished on node: " + ignite.cluster().localNode().id()); + if (log.isInfoEnabled()) + log.info("Job finished on node: " + ignite.cluster().localNode().id()); } return ignite.cluster().localNode().id(); http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java index 39f909e..cf40497 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java @@ -803,25 +803,27 @@ public class HadoopJobTracker extends HadoopComponent { */ @SuppressWarnings({"unused", "ConstantConditions" }) private void printPlan(HadoopJobId jobId, HadoopMapReducePlan plan) { - log.info("Plan for " + jobId); + if (log.isInfoEnabled()) { + log.info("Plan for " + jobId); - SB b = new SB(); + SB b = new SB(); - b.a(" Map: "); + b.a(" Map: "); - for (UUID nodeId : plan.mapperNodeIds()) - b.a(nodeId).a("=").a(plan.mappers(nodeId).size()).a(' '); + for (UUID nodeId : plan.mapperNodeIds()) + b.a(nodeId).a("=").a(plan.mappers(nodeId).size()).a(' '); - log.info(b.toString()); + log.info(b.toString()); - b = new SB(); + b = new SB(); - b.a(" Reduce: "); + b.a(" Reduce: "); - for (UUID nodeId : plan.reducerNodeIds()) - b.a(nodeId).a("=").a(Arrays.toString(plan.reducers(nodeId))).a(' '); + for (UUID nodeId : plan.reducerNodeIds()) + b.a(nodeId).a("=").a(Arrays.toString(plan.reducers(nodeId))).a(' '); - log.info(b.toString()); + log.info(b.toString()); + } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java index 226d3e3..346362b 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java @@ -182,8 +182,9 @@ public class HadoopShuffleJob<T> implements AutoCloseable { if (stripeMappers0) { if (!embedded) { - log.info("Striped mapper output is disabled becuase it cannot be used in external mode [jobId=" + - job.id() + ']'); + if (log.isInfoEnabled()) + log.info("Striped mapper output is disabled becuase it cannot be used in external mode [jobId=" + + job.id() + ']'); stripeMappers0 = false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java ---------------------------------------------------------------------- diff --git a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java index e546da2..1ae59be 100644 --- a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java +++ b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java @@ -242,7 +242,8 @@ public class MqttStreamer<K, V> extends StreamAdapter<MqttMessage, K, V> impleme // Create the connection retrier. connectionRetrier = new MqttConnectionRetrier(retrier); - log.info("Starting MQTT Streamer " + cachedLogValues); + if (log.isInfoEnabled()) + log.info("Starting MQTT Streamer " + cachedLogValues); // Connect. connectionRetrier.connect(); @@ -679,7 +680,8 @@ public class MqttStreamer<K, V> extends StreamAdapter<MqttMessage, K, V> impleme client.subscribe(topics.toArray(new String[0]), qoses); } - log.info("MQTT Streamer (re-)connected and subscribed " + cachedLogValues); + if (log.isInfoEnabled()) + log.info("MQTT Streamer (re-)connected and subscribed " + cachedLogValues); return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/96e7bb1d/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java index 68ed0d9..f149804 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java @@ -604,7 +604,8 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi uriList.add(U.hidePassword(uri)); } - log.info("Found deleted GAR units [uris=" + uriList + ']'); + if (log.isInfoEnabled()) + log.info("Found deleted GAR units [uris=" + uriList + ']'); } processDeletedFiles(uris);
