IGNITE-3770: GridLogThrottle.warn ignores the exception. Fixes #1095.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3271d75f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3271d75f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3271d75f Branch: refs/heads/ignite-2788 Commit: 3271d75fca41db9ae186047c08f422f6b6f66498 Parents: a370bad Author: Roman Shtykh <[email protected]> Authored: Tue Oct 4 15:16:40 2016 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Tue Oct 4 15:16:40 2016 -0700 ---------------------------------------------------------------------- .../affinity/fair/FairAffinityFunction.java | 2 +- .../rendezvous/RendezvousAffinityFunction.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../GridDeploymentPerVersionStore.java | 2 +- .../discovery/GridDiscoveryManager.java | 2 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../cache/GridCacheDeploymentManager.java | 4 +- .../processors/cache/GridCacheEventManager.java | 10 ++--- .../store/GridCacheStoreManagerAdapter.java | 2 +- .../cache/store/GridCacheWriteBehindStore.java | 2 +- .../clock/GridClockSyncProcessor.java | 2 +- .../igfs/IgfsFragmentizerManager.java | 29 +++++++-------- .../internal/processors/igfs/IgfsImpl.java | 35 +++++++++--------- .../OsDiscoveryNodeValidationProcessor.java | 2 +- .../processors/task/GridTaskWorker.java | 2 +- .../ignite/internal/util/GridLogThrottle.java | 35 +++++++++--------- .../ignite/internal/util/IgniteUtils.java | 6 +-- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 2 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 4 +- .../nio/GridConnectionBytesVerifyFilter.java | 2 +- .../internal/util/nio/GridNioCodecFilter.java | 2 +- .../internal/util/nio/GridNioFilterChain.java | 2 +- .../ignite/internal/util/nio/GridNioServer.java | 2 +- .../util/nio/GridSelectorNioSessionImpl.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +++--- .../ignite/spi/discovery/tcp/ClientImpl.java | 7 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 39 +++++++++----------- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 8 ++-- .../TcpDiscoveryMulticastIpFinder.java | 4 +- .../ignite/testframework/GridTestUtils.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 6 +-- .../apache/ignite/util/GridLogThrottleTest.java | 27 +++++--------- .../HadoopExternalCommunication.java | 6 +-- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../scanners/http/UriDeploymentHttpScanner.java | 8 ++-- 37 files changed, 133 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java index c624df4..cf1cb02 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java @@ -331,7 +331,7 @@ public class FairAffinityFunction implements AffinityFunction { balance(tier, pendingParts, fullMap, topSnapshot, true); if (!exclNeighborsWarn) { - LT.warn(log, null, "Affinity function excludeNeighbors property is ignored " + + LT.warn(log, "Affinity function excludeNeighbors property is ignored " + "because topology has no enough nodes to assign backups."); exclNeighborsWarn = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java index e876fb5..8f2d2f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java @@ -440,7 +440,7 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza } if (!exclNeighborsWarn) { - LT.warn(log, null, "Affinity function excludeNeighbors property is ignored " + + LT.warn(log, "Affinity function excludeNeighbors property is ignored " + "because topology has no enough nodes to assign backups."); exclNeighborsWarn = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/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 e0a36a7..c521718 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 @@ -991,7 +991,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { // at least one waiting request, then it is possible starvation. if (exec.getPoolSize() == exec.getActiveCount() && completedCnt == lastCompletedCnt && !exec.getQueue().isEmpty()) - LT.warn(log, null, "Possible thread pool starvation detected (no task completed in last " + + LT.warn(log, "Possible thread pool starvation detected (no task completed in last " + interval + "ms, is executorService pool size large enough?)"); lastCompletedCnt = completedCnt; http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java index 5e30bf6..0bf8328 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java @@ -317,7 +317,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { if (ctx.localNodeId().equals(e.getKey())) { // Warn only if mode is not CONTINUOUS. if (meta.deploymentMode() != CONTINUOUS) - LT.warn(log, null, "Local node is in participants (most probably, " + + LT.warn(log, "Local node is in participants (most probably, " + "IgniteConfiguration.getPeerClassLoadingLocalClassPathExclude() " + "is not used properly " + "[locNodeId=" + ctx.localNodeId() + ", meta=" + meta + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index d24f900..931d99a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -995,7 +995,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { break; if (ctx.config().isWaitForSegmentOnStart()) { - LT.warn(log, null, "Failed to check network segment (retrying every 2000 ms)."); + LT.warn(log, "Failed to check network segment (retrying every 2000 ms)."); // Wait and check again. U.sleep(2000); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index 0095707..a4cee9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@ -278,7 +278,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> int type = evt.type(); if (!isRecordable(type)) { - LT.warn(log, null, "Trying to record event without checking if it is recordable: " + + LT.warn(log, "Trying to record event without checking if it is recordable: " + U.gridEventName(type)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index 8e66233..ad4892b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -399,7 +399,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap ", daemon=" + daemon + ']'); if (!daemon) { - LT.warn(log, null, "Ignoring deployment in PRIVATE or ISOLATED mode " + + LT.warn(log, "Ignoring deployment in PRIVATE or ISOLATED mode " + "[sndId=" + sndId + ", ldrId=" + ldrId + ", userVer=" + userVer + ", mode=" + mode + ", participants=" + participants + ", daemon=" + daemon + ']'); } @@ -408,7 +408,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap } if (mode != cctx.gridConfig().getDeploymentMode()) { - LT.warn(log, null, "Local and remote deployment mode mismatch (please fix configuration and restart) " + + LT.warn(log, "Local and remote deployment mode mismatch (please fix configuration and restart) " + "[locDepMode=" + cctx.gridConfig().getDeploymentMode() + ", rmtDepMode=" + mode + ", rmtNodeId=" + sndId + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index ec8b8cc..1c18738 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -251,7 +251,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { assert key != null || type == EVT_CACHE_STARTED || type == EVT_CACHE_STOPPED; if (!cctx.events().isRecordable(type)) - LT.warn(log, null, "Added event without checking if event is recordable: " + U.gridEventName(type)); + LT.warn(log, "Added event without checking if event is recordable: " + U.gridEventName(type)); // Events are not fired for internal entry. if (key == null || !key.internal()) { @@ -261,7 +261,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { evtNode = findNodeInHistory(evtNodeId); if (evtNode == null) - LT.warn(log, null, "Failed to find event node in grid topology history " + + LT.warn(log, "Failed to find event node in grid topology history " + "(try to increase topology history size configuration property of configured " + "discovery SPI): " + evtNodeId); @@ -284,7 +284,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { log.debug("Failed to unmarshall cache object value for the event notification: " + e); if (!forceKeepBinary) - LT.warn(log, null, "Failed to unmarshall cache object value for the event notification " + + LT.warn(log, "Failed to unmarshall cache object value for the event notification " + "(all further notifications will keep binary object format)."); forceKeepBinary = true; @@ -351,7 +351,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { assert discoTs > 0; if (!cctx.events().isRecordable(type)) - LT.warn(log, null, "Added event without checking if event is recordable: " + U.gridEventName(type)); + LT.warn(log, "Added event without checking if event is recordable: " + U.gridEventName(type)); cctx.gridEvents().record(new CacheRebalancingEvent(cctx.name(), cctx.localNode(), "Cache rebalancing event.", type, part, discoNode, discoType, discoTs)); @@ -364,7 +364,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { */ public void addUnloadEvent(int part) { if (!cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_UNLOADED)) - LT.warn(log, null, "Added event without checking if event is recordable: " + + LT.warn(log, "Added event without checking if event is recordable: " + U.gridEventName(EVT_CACHE_REBALANCE_PART_UNLOADED)); cctx.gridEvents().record(new CacheRebalancingEvent(cctx.name(), cctx.localNode(), http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java index cd0c50f..024375e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java @@ -547,7 +547,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt return true; } - LT.warn(log, null, "Calling Cache.loadCache() method will have no effect, " + + LT.warn(log, "Calling Cache.loadCache() method will have no effect, " + "CacheConfiguration.getStore() is not defined for cache: " + cctx.namexx()); return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java index 468945b..858d9a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStore.java @@ -705,7 +705,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy } } catch (Exception e) { - LT.warn(log, e, "Unable to update underlying store: " + store); + LT.error(log, e, "Unable to update underlying store: " + store); if (writeCache.sizex() > cacheCriticalSize || stopping.get()) { for (Map.Entry<K, Entry<? extends K, ? extends V>> entry : vals.entrySet()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java index b5c89cf..0764316 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java @@ -458,7 +458,7 @@ public class GridClockSyncProcessor extends GridProcessorAdapter { srv.sendPacket(req, addr, port); } catch (IgniteCheckedException e) { - LT.warn(log, e, "Failed to send time request to remote node [rmtNodeId=" + rmtNodeId + + LT.error(log, e, "Failed to send time request to remote node [rmtNodeId=" + rmtNodeId + ", addr=" + addr + ", port=" + port + ']'); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java index d64c64a..2e82f33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java @@ -17,6 +17,19 @@ package org.apache.ignite.internal.processors.igfs; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterNode; @@ -41,20 +54,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; @@ -383,7 +382,7 @@ public class IgfsFragmentizerManager extends IgfsManager { } catch (IgniteCheckedException | IgniteException e) { if (!X.hasCause(e, InterruptedException.class) && !X.hasCause(e, IgniteInterruptedCheckedException.class)) - LT.warn(log, e, "Failed to get fragmentizer file info (will retry)."); + LT.error(log, e, "Failed to get fragmentizer file info (will retry)."); else { if (log.isDebugEnabled()) log.debug("Got interrupted exception in fragmentizer coordinator (grid is stopping)."); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 1dd12d9..9dc5e78 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -17,6 +17,21 @@ package org.apache.ignite.internal.processors.igfs; +import java.io.OutputStream; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; @@ -81,22 +96,6 @@ import org.apache.ignite.thread.IgniteThreadPoolExecutor; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -import java.io.OutputStream; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED; import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED; import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_READ; @@ -1313,7 +1312,7 @@ public final class IgfsImpl implements IgfsEx { secondarySpaceSize = secondaryFs.usedSpaceSize(); } catch (IgniteException e) { - LT.warn(log, e, "Failed to get secondary file system consumed space size."); + LT.error(log, e, "Failed to get secondary file system consumed space size."); secondarySpaceSize = -1; } @@ -1846,4 +1845,4 @@ public final class IgfsImpl implements IgfsEx { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java index a7e06e9..37e59bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java @@ -58,7 +58,7 @@ public class OsDiscoveryNodeValidationProcessor extends GridProcessorAdapter imp ", rmtNodeAddrs=" + U.addressesAsString(node) + ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id() + ']'; - LT.warn(log, null, errMsg); + LT.warn(log, errMsg); // Always output in debug. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index 452e48c..84edb14 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -626,7 +626,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { res.setOccupied(true); if (resCache && jobRes.size() > ctx.discovery().size() && jobRes.size() % SPLIT_WARN_THRESHOLD == 0) - LT.warn(log, null, "Number of jobs in task is too large for task: " + ses.getTaskName() + + LT.warn(log, "Number of jobs in task is too large for task: " + ses.getTaskName() + ". Consider reducing number of jobs or disabling job result cache with " + "@ComputeTaskNoResultCache annotation."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java index 745619a..c4a107a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java @@ -79,41 +79,38 @@ public class GridLogThrottle { * Logs warning if needed. * * @param log Logger. - * @param e Error (optional). * @param msg Message. */ - public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String msg) { + public static void warn(@Nullable IgniteLogger log, String msg) { assert !F.isEmpty(msg); - log(log, e, msg, null, LogLevel.WARN, false); + log(log, null, msg, null, LogLevel.WARN, false); } /** * Logs warning if needed. * * @param log Logger. - * @param e Error (optional). * @param msg Message. - * @param quite Print warning anyway. + * @param quiet Print warning anyway. */ - public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String msg, boolean quite) { + public static void warn(@Nullable IgniteLogger log, String msg, boolean quiet) { assert !F.isEmpty(msg); - log(log, e, msg, null, LogLevel.WARN, quite); + log(log, null, msg, null, LogLevel.WARN, quiet); } /** * Logs warning if needed. * * @param log Logger. - * @param e Error (optional). * @param longMsg Long message (or just message). - * @param shortMsg Short message for quite logging. + * @param shortMsg Short message for quiet logging. */ - public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e, String longMsg, @Nullable String shortMsg) { + public static void warn(@Nullable IgniteLogger log, String longMsg, @Nullable String shortMsg) { assert !F.isEmpty(longMsg); - log(log, e, longMsg, shortMsg, LogLevel.WARN, false); + log(log, null, longMsg, shortMsg, LogLevel.WARN, false); } /** @@ -121,12 +118,12 @@ public class GridLogThrottle { * * @param log Logger. * @param msg Message. - * @param quite Print info anyway. + * @param quiet Print info anyway. */ - public static void info(@Nullable IgniteLogger log, String msg, boolean quite) { + public static void info(@Nullable IgniteLogger log, String msg, boolean quiet) { assert !F.isEmpty(msg); - log(log, null, msg, null, LogLevel.INFO, quite); + log(log, null, msg, null, LogLevel.INFO, quiet); } /** @@ -136,6 +133,8 @@ public class GridLogThrottle { * @param msg Message. */ public static void info(@Nullable IgniteLogger log, String msg) { + assert !F.isEmpty(msg); + info(log, msg, false); } @@ -152,12 +151,12 @@ public class GridLogThrottle { * @param log Logger. * @param e Error (optional). * @param longMsg Long message (or just message). - * @param shortMsg Short message for quite logging. + * @param shortMsg Short message for quiet logging. * @param level Level where messages should appear. */ @SuppressWarnings({"RedundantTypeArguments"}) - private static void log(@Nullable IgniteLogger log, @Nullable Throwable e, String longMsg, @Nullable String shortMsg, - LogLevel level, boolean quiet) { + private static void log(@Nullable IgniteLogger log, @Nullable Throwable e, String longMsg, + @Nullable String shortMsg, LogLevel level, boolean quiet) { assert !F.isEmpty(longMsg); IgniteBiTuple<Class<? extends Throwable>, String> tup = @@ -252,4 +251,4 @@ public class GridLogThrottle { */ public abstract void doLog(IgniteLogger log, String longMsg, String shortMsg, Throwable e, boolean quiet); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 569a25f..1c6da49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -4075,7 +4075,7 @@ public abstract class IgniteUtils { } /** - * Logs warning message in both verbose and quite modes. + * Logs warning message in both verbose and quiet modes. * * @param log Logger to use. * @param msg Message to log. @@ -4085,7 +4085,7 @@ public abstract class IgniteUtils { } /** - * Logs warning message in both verbose and quite modes. + * Logs warning message in both verbose and quiet modes. * * @param log Logger to use. * @param shortMsg Short message. @@ -4255,7 +4255,7 @@ public abstract class IgniteUtils { } /** - * Prints out the message in quite and info modes. + * Prints out the message in quiet and info modes. * * @param log Logger. * @param msg Message to print. http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java index 2771d28..02c4de5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java @@ -150,7 +150,7 @@ public class IpcSharedMemoryNativeLoader { try { if (log != null) - LT.warn(log, null, "Failed to load 'igniteshmem' library from classpath. Will try to load it from IGNITE_HOME."); + LT.warn(log, "Failed to load 'igniteshmem' library from classpath. Will try to load it from IGNITE_HOME."); String igniteHome = X.resolveIgniteHome(); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java index 6fd6482..3cc673e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java @@ -297,13 +297,13 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint { String msg = "Failed to process incoming connection (most probably, shared memory " + "rest endpoint has been configured by mistake)."; - LT.warn(log, null, msg); + LT.warn(log, msg); sendErrorResponse(out, e); } catch (IpcOutOfSystemResourcesException e) { if (!omitOutOfResourcesWarn) - LT.warn(log, null, OUT_OF_RESOURCES_MSG); + LT.warn(log, OUT_OF_RESOURCES_MSG); sendErrorResponse(out, e); } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java index 13d7ca7..213fd8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java @@ -115,7 +115,7 @@ public class GridConnectionBytesVerifyFilter extends GridNioFilterAdapter { else { ses.close(); - LT.warn(log, null, "Unknown connection detected (is some other software connecting to this " + + LT.warn(log, "Unknown connection detected (is some other software connecting to this " + "Ignite port?) [rmtAddr=" + ses.remoteAddress() + ", locAddr=" + ses.localAddress() + ']'); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java index a2f543d..7083ccf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioCodecFilter.java @@ -110,7 +110,7 @@ public class GridNioCodecFilter extends GridNioFilterAdapter { if (directMode) return; - LT.warn(log, null, "Parser returned null but there are still unread data in input buffer (bug in " + + LT.warn(log, "Parser returned null but there are still unread data in input buffer (bug in " + "parser code?) [parser=" + parser + ", ses=" + ses + ']'); input.position(input.limit()); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java index 8a43e29..a3a74e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFilterChain.java @@ -158,7 +158,7 @@ public class GridNioFilterChain<T> extends GridNioFilterAdapter { head.onExceptionCaught(ses, e); } catch (Exception ex) { - LT.warn(log, ex, "Failed to forward GridNioException to filter chain [ses=" + ses + ", e=" + e + ']'); + LT.error(log, ex, "Failed to forward GridNioException to filter chain [ses=" + ses + ", e=" + e + ']'); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/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 24b8fad..c8e2e0b 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 @@ -768,7 +768,7 @@ public class GridNioServer<T> { filterChain.onMessageReceived(ses, readBuf); if (readBuf.remaining() > 0) { - LT.warn(log, null, "Read buffer contains data after filter chain processing (will discard " + + LT.warn(log, "Read buffer contains data after filter chain processing (will discard " + "remaining bytes) [ses=" + ses + ", remainingCnt=" + readBuf.remaining() + ']'); readBuf.clear(); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java index 0ba6af2..63c9845 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java @@ -227,7 +227,7 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl { if (recovery != null) { if (!recovery.add(last)) { - LT.warn(log, null, "Unacknowledged messages queue size overflow, will attempt to reconnect " + + LT.warn(log, "Unacknowledged messages queue size overflow, will attempt to reconnect " + "[remoteAddr=" + remoteAddress() + ", queueLimit=" + recovery.queueLimit() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 74ecc45..ac347bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -329,7 +329,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter private final GridNioServerListener<Message> srvLsnr = new GridNioServerListenerAdapter<Message>() { @Override public void onSessionWriteTimeout(GridNioSession ses) { - LT.warn(log, null, "Communication SPI Session write timed out (consider increasing " + + LT.warn(log, "Communication SPI Session write timed out (consider increasing " + "'socketWriteTimeout' " + "configuration property) [remoteAddr=" + ses.remoteAddress() + ", writeTimeout=" + sockWriteTimeout + ']'); @@ -2142,9 +2142,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter catch (IgniteCheckedException e) { if (e.hasCause(IpcOutOfSystemResourcesException.class)) // Has cause or is itself the IpcOutOfSystemResourcesException. - LT.warn(log, null, OUT_OF_RESOURCES_TCP_MSG); + LT.warn(log, OUT_OF_RESOURCES_TCP_MSG); else if (getSpiContext().node(node.id()) != null) - LT.warn(log, null, e.getMessage()); + LT.warn(log, e.getMessage()); else if (log.isDebugEnabled()) log.debug("Failed to establish shared memory connection with local node (node has left): " + node.id()); @@ -2505,11 +2505,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter boolean failureDetThrReached = timeoutHelper.checkFailureTimeoutReached(e); if (failureDetThrReached) - LT.warn(log, null, "Connect timed out (consider increasing 'failureDetectionTimeout' " + + LT.warn(log, "Connect timed out (consider increasing 'failureDetectionTimeout' " + "configuration property) [addr=" + addr + ", failureDetectionTimeout=" + failureDetectionTimeout() + ']'); else if (X.hasCause(e, SocketTimeoutException.class)) - LT.warn(log, null, "Connect timed out (consider increasing 'connTimeout' " + + LT.warn(log, "Connect timed out (consider increasing 'connTimeout' " + "configuration property) [addr=" + addr + ", connTimeout=" + connTimeout + ']'); if (errs == null) @@ -2540,7 +2540,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter assert errs != null; if (X.hasCause(errs, ConnectException.class)) - LT.warn(log, null, "Failed to connect to a remote node " + + LT.warn(log, "Failed to connect to a remote node " + "(make sure that destination node is alive and " + "operating system firewall is disabled on local and remote hosts) " + "[addrs=" + addrs + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 79cfe49..0024f7b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -64,7 +64,6 @@ import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper; @@ -483,7 +482,7 @@ class ClientImpl extends TcpDiscoveryImpl { if (timeout > 0 && (U.currentTimeMillis() - startTime) > timeout) return null; - LT.warn(log, null, "IP finder returned empty addresses list. " + + LT.warn(log, "IP finder returned empty addresses list. " + "Please check IP finder configuration" + (spi.ipFinder instanceof TcpDiscoveryMulticastIpFinder ? " and make sure multicast works on your network. " : ". ") + @@ -553,7 +552,7 @@ class ClientImpl extends TcpDiscoveryImpl { if (timeout > 0 && (U.currentTimeMillis() - startTime) > timeout) return null; - LT.warn(log, null, "Failed to connect to any address from IP finder (will retry to join topology " + + LT.warn(log, "Failed to connect to any address from IP finder (will retry to join topology " + "every 2 secs): " + toOrderedList(addrs0), true); Thread.sleep(2000); @@ -917,7 +916,7 @@ class ClientImpl extends TcpDiscoveryImpl { ClassNotFoundException clsNotFoundEx = X.cause(e, ClassNotFoundException.class); if (clsNotFoundEx != null) - LT.warn(log, null, "Failed to read message due to ClassNotFoundException " + + LT.warn(log, "Failed to read message due to ClassNotFoundException " + "(make sure same versions of all classes are available on all nodes) " + "[rmtNodeId=" + rmtNodeId + ", err=" + clsNotFoundEx.getMessage() + ']'); else http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/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 135a737..95398e0 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 @@ -516,7 +516,7 @@ class ServerImpl extends TcpDiscoveryImpl { boolean res = pingNode(node); if (!res && !node.isClient() && nodeAlive(nodeId)) { - LT.warn(log, null, "Failed to ping node (status check will be initiated): " + nodeId); + LT.warn(log, "Failed to ping node (status check will be initiated): " + nodeId); msgWorker.addMessage(new TcpDiscoveryStatusCheckMessage(locNode, node.id())); } @@ -906,7 +906,7 @@ class ServerImpl extends TcpDiscoveryImpl { U.addressesAsString(msg.addresses(), msg.hostNames()) + ']'); } else - LT.warn(log, null, "Node has not been connected to topology and will repeat join process. " + + LT.warn(log, "Node has not been connected to topology and will repeat join process. " + "Check remote nodes logs for possible error messages. " + "Note that large topology may require significant time to start. " + "Increase 'TcpDiscoverySpi.networkTimeout' configuration property " + @@ -1026,7 +1026,7 @@ class ServerImpl extends TcpDiscoveryImpl { } if (e != null && X.hasCause(e, ConnectException.class)) { - LT.warn(log, null, "Failed to connect to any address from IP finder " + + LT.warn(log, "Failed to connect to any address from IP finder " + "(make sure IP finder addresses are correct and firewalls are disabled on all host machines): " + toOrderedList(addrs), true); } @@ -2905,7 +2905,7 @@ class ServerImpl extends TcpDiscoveryImpl { } } - LT.warn(log, null, "Local node has detected failed nodes and started cluster-wide procedure. " + + LT.warn(log, "Local node has detected failed nodes and started cluster-wide procedure. " + "To speed up failure detection please see 'Failure Detection' section under javadoc" + " for 'TcpDiscoverySpi'"); } @@ -2990,7 +2990,7 @@ class ServerImpl extends TcpDiscoveryImpl { "[locNodeAddrs=" + U.addressesAsString(locNode) + ", rmtNodeAddrs=" + U.addressesAsString(node) + ']'; - LT.warn(log, null, errMsg); + LT.warn(log, errMsg); // Always output in debug. if (log.isDebugEnabled()) @@ -3043,7 +3043,7 @@ class ServerImpl extends TcpDiscoveryImpl { } // Output warning. - LT.warn(log, null, "Ignoring join request from node (duplicate ID) [node=" + node + + LT.warn(log, "Ignoring join request from node (duplicate ID) [node=" + node + ", existingNode=" + existingNode + ']'); // Ignore join request. @@ -3098,8 +3098,7 @@ class ServerImpl extends TcpDiscoveryImpl { if (subj == null) { // Node has not pass authentication. - LT.warn(log, null, - "Authentication failed [nodeId=" + node.id() + + LT.warn(log, "Authentication failed [nodeId=" + node.id() + ", addrs=" + U.addressesAsString(node) + ']', "Authentication failed [nodeId=" + U.id8(node.id()) + ", addrs=" + U.addressesAsString(node) + ']'); @@ -3128,8 +3127,7 @@ class ServerImpl extends TcpDiscoveryImpl { else { if (!(subj instanceof Serializable)) { // Node has not pass authentication. - LT.warn(log, null, - "Authentication subject is not Serializable [nodeId=" + node.id() + + LT.warn(log, "Authentication subject is not Serializable [nodeId=" + node.id() + ", addrs=" + U.addressesAsString(node) + ']', "Authentication subject is not Serializable [nodeId=" + U.id8(node.id()) + ", addrs=" + @@ -3199,7 +3197,7 @@ class ServerImpl extends TcpDiscoveryImpl { return; } - LT.warn(log, null, err.message()); + LT.warn(log, err.message()); // Always output in debug. if (log.isDebugEnabled()) @@ -3240,7 +3238,7 @@ class ServerImpl extends TcpDiscoveryImpl { ", rmtNodeAddrs=" + U.addressesAsString(node) + ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId() + ']'; - LT.warn(log, null, errMsg); + LT.warn(log, errMsg); // Always output in debug. if (log.isDebugEnabled()) @@ -3528,7 +3526,7 @@ class ServerImpl extends TcpDiscoveryImpl { * @param sndMsg Message to send. */ private void nodeCheckError(TcpDiscoveryNode node, String errMsg, String sndMsg) { - LT.warn(log, null, errMsg); + LT.warn(log, errMsg); // Always output in debug. if (log.isDebugEnabled()) @@ -3811,8 +3809,7 @@ class ServerImpl extends TcpDiscoveryImpl { if (!permissionsEqual(coordSubj.subject().permissions(), subj.subject().permissions())) { // Node has not pass authentication. - LT.warn(log, null, - "Authentication failed [nodeId=" + node.id() + + LT.warn(log, "Authentication failed [nodeId=" + node.id() + ", addrs=" + U.addressesAsString(node) + ']', "Authentication failed [nodeId=" + U.id8(node.id()) + ", addrs=" + U.addressesAsString(node) + ']'); @@ -5267,7 +5264,7 @@ class ServerImpl extends TcpDiscoveryImpl { "[rmtAddr=" + sock.getRemoteSocketAddress() + ", locAddr=" + sock.getLocalSocketAddress() + ']'); - LT.warn(log, null, "Failed to read magic header (too few bytes received) [rmtAddr=" + + LT.warn(log, "Failed to read magic header (too few bytes received) [rmtAddr=" + sock.getRemoteSocketAddress() + ", locAddr=" + sock.getLocalSocketAddress() + ']'); return; @@ -5283,7 +5280,7 @@ class ServerImpl extends TcpDiscoveryImpl { "[rmtAddr=" + sock.getRemoteSocketAddress() + ", locAddr=" + sock.getLocalSocketAddress() + ']'); - LT.warn(log, null, "Unknown connection detected (is some other software connecting to " + + LT.warn(log, "Unknown connection detected (is some other software connecting to " + "this Ignite port?" + (!spi.isSslEnabled() ? " missing SSL configuration on remote node?" : "" ) + ") [rmtAddr=" + sock.getInetAddress() + ']', true); @@ -5403,7 +5400,7 @@ class ServerImpl extends TcpDiscoveryImpl { U.error(log, "Caught exception on handshake [err=" + e +", sock=" + sock + ']', e); if (X.hasCause(e, SSLException.class) && spi.isSslEnabled() && !spi.isNodeStopping0()) - LT.warn(log, null, "Failed to initialize connection " + + LT.warn(log, "Failed to initialize connection " + "(missing SSL configuration on remote node?) " + "[rmtAddr=" + sock.getInetAddress() + ']', true); else if ((X.hasCause(e, ObjectStreamException.class) || !sock.isClosed()) @@ -5432,12 +5429,12 @@ class ServerImpl extends TcpDiscoveryImpl { onException("Caught exception on handshake [err=" + e +", sock=" + sock + ']', e); if (e.hasCause(SocketTimeoutException.class)) - LT.warn(log, null, "Socket operation timed out on handshake " + + LT.warn(log, "Socket operation timed out on handshake " + "(consider increasing 'networkTimeout' configuration property) " + "[netTimeout=" + spi.netTimeout + ']'); else if (e.hasCause(ClassNotFoundException.class)) - LT.warn(log, null, "Failed to read message due to ClassNotFoundException " + + LT.warn(log, "Failed to read message due to ClassNotFoundException " + "(make sure same versions of all classes are available on all nodes) " + "[rmtAddr=" + sock.getRemoteSocketAddress() + ", err=" + X.cause(e, ClassNotFoundException.class).getMessage() + ']'); @@ -5667,7 +5664,7 @@ class ServerImpl extends TcpDiscoveryImpl { return; if (e.hasCause(ClassNotFoundException.class)) - LT.warn(log, null, "Failed to read message due to ClassNotFoundException " + + LT.warn(log, "Failed to read message due to ClassNotFoundException " + "(make sure same versions of all classes are available on all nodes) " + "[rmtNodeId=" + nodeId + ", err=" + X.cause(e, ClassNotFoundException.class).getMessage() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index 30b83e5..1d63852 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -303,7 +303,7 @@ abstract class TcpDiscoveryImpl { */ protected boolean checkAckTimeout(long ackTimeout) { if (ackTimeout > spi.getMaxAckTimeout()) { - LT.warn(log, null, "Acknowledgement timeout is greater than maximum acknowledgement timeout " + + LT.warn(log, "Acknowledgement timeout is greater than maximum acknowledgement timeout " + "(consider increasing 'maxAckTimeout' configuration property) " + "[ackTimeout=" + ackTimeout + ", maxAckTimeout=" + spi.getMaxAckTimeout() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 426eb8e..dee93aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -1471,7 +1471,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T } catch (IOException | IgniteCheckedException e) { if (X.hasCause(e, SocketTimeoutException.class)) - LT.warn(log, null, "Timed out waiting for message to be read (most probably, the reason is " + + LT.warn(log, "Timed out waiting for message to be read (most probably, the reason is " + "in long GC pauses on remote node) [curTimeout=" + timeout + ']'); throw e; @@ -1511,7 +1511,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T return res; } catch (SocketTimeoutException e) { - LT.warn(log, null, "Timed out waiting for message delivery receipt (most probably, the reason is " + + LT.warn(log, "Timed out waiting for message delivery receipt (most probably, the reason is " + "in long GC pauses on remote node; consider tuning GC and increasing 'ackTimeout' " + "configuration property). Will retry to send message with increased timeout. " + "Current timeout: " + timeout + '.'); @@ -1575,7 +1575,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T res.add(resolved); } catch (UnknownHostException ignored) { - LT.warn(log, null, "Failed to resolve address from IP finder (host is unknown): " + addr); + LT.warn(log, "Failed to resolve address from IP finder (host is unknown): " + addr); // Add address in any case. res.add(addr); @@ -2045,7 +2045,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T // Close socket - timeout occurred. U.closeQuiet(sock); - LT.warn(log, null, "Socket write has timed out (consider increasing " + + LT.warn(log, "Socket write has timed out (consider increasing " + (failureDetectionTimeoutEnabled() ? "'IgniteConfiguration.failureDetectionTimeout' configuration property) [" + "failureDetectionTimeout=" + failureDetectionTimeout() + ']' : http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java index 5bbe90e..d5d3533 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java @@ -598,7 +598,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { addrRes = new AddressResponse(data); } catch (IgniteCheckedException e) { - LT.warn(log, e, "Failed to deserialize multicast response."); + LT.error(log, e, "Failed to deserialize multicast response."); continue; } @@ -876,7 +876,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { } catch (IOException e) { if (!isInterrupted()) { - LT.warn(log, e, "Failed to send/receive address message (will try to reconnect)."); + LT.error(log, e, "Failed to send/receive address message (will try to reconnect)."); synchronized (this) { U.close(sock); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 524c643..e6a5537 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1024,7 +1024,7 @@ public final class GridTestUtils { Collection<ClusterNode> nodes = top.nodes(p, AffinityTopologyVersion.NONE); if (nodes.size() > backups + 1) { - LT.warn(log, null, "Partition map was not updated yet (will wait) [grid=" + g.name() + + LT.warn(log, "Partition map was not updated yet (will wait) [grid=" + g.name() + ", p=" + p + ", nodes=" + F.nodeIds(nodes) + ']'); wait = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 032d99e..e0432a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -486,7 +486,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { if (affNodes.size() != owners.size() || !affNodes.containsAll(owners) || (waitEvicts && loc != null && loc.state() != GridDhtPartitionState.OWNING)) { - LT.warn(log(), null, "Waiting for topology map update [" + + LT.warn(log(), "Waiting for topology map update [" + "grid=" + g.name() + ", cache=" + cfg.getName() + ", cacheId=" + dht.context().cacheId() + @@ -503,7 +503,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { match = true; } else { - LT.warn(log(), null, "Waiting for topology map update [" + + LT.warn(log(), "Waiting for topology map update [" + "grid=" + g.name() + ", cache=" + cfg.getName() + ", cacheId=" + dht.context().cacheId() + @@ -569,7 +569,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { } if (entry.getValue() != GridDhtPartitionState.OWNING) { - LT.warn(log(), null, + LT.warn(log(), "Waiting for correct partition state, should be OWNING [state=" + entry.getValue() + "]"); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java index d9540a8..9eac0cc 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java @@ -53,26 +53,20 @@ public class GridLogThrottleTest extends GridCommonAbstractTest { // LOGGED. LT.error(log, new RuntimeException("Test exception 2."), "Test"); - // OMITTED. - LT.warn(log, new RuntimeException("Test exception 1."), "Test"); - - // OMITTED. - LT.warn(log, new RuntimeException("Test exception 2."), "Test1"); - - // OMITTED. - LT.warn(log, new RuntimeException("Test exception 2."), "Test3"); - // LOGGED. LT.error(log, null, "Test - without throwable."); // OMITTED. LT.error(log, null, "Test - without throwable."); + // OMITTED. + LT.warn(log, "Test - without throwable."); + // LOGGED. - LT.warn(log, null, "Test - without throwable1."); + LT.warn(log, "Test - without throwable1."); // OMITTED. - LT.warn(log, null, "Test - without throwable1."); + LT.warn(log, "Test - without throwable1."); Thread.sleep(LT.throttleTimeout()); @@ -90,14 +84,11 @@ public class GridLogThrottleTest extends GridCommonAbstractTest { // LOGGED. LT.error(log, new RuntimeException("Test exception 2."), "Test"); - // OMITTED. - LT.warn(log, new RuntimeException("Test exception 1."), "Test"); - - // OMITTED. - LT.warn(log, new RuntimeException("Test exception 2."), "Test1"); + // LOGGED. + LT.warn(log, "Test - without throwable."); // OMITTED. - LT.warn(log, new RuntimeException("Test exception 2."), "Test3"); + LT.warn(log, "Test - without throwable."); Thread.sleep(LT.throttleTimeout()); @@ -121,4 +112,4 @@ public class GridLogThrottleTest extends GridCommonAbstractTest { //OMMITED. LT.info(log(), "Test info message."); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java index 1d59a95..6202c41 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/HadoopExternalCommunication.java @@ -850,7 +850,7 @@ public class HadoopExternalCommunication { catch (IgniteCheckedException e) { if (e.hasCause(IpcOutOfSystemResourcesException.class)) // Has cause or is itself the IpcOutOfSystemResourcesException. - LT.warn(log, null, OUT_OF_RESOURCES_TCP_MSG); + LT.warn(log, OUT_OF_RESOURCES_TCP_MSG); else if (log.isDebugEnabled()) log.debug("Failed to establish shared memory connection with local hadoop process: " + desc); @@ -1053,7 +1053,7 @@ public class HadoopExternalCommunication { ", err=" + e + ']'); if (X.hasCause(e, SocketTimeoutException.class)) - LT.warn(log, null, "Connect timed out (consider increasing 'connTimeout' " + + LT.warn(log, "Connect timed out (consider increasing 'connTimeout' " + "configuration property) [addr=" + addr + ", port=" + port + ']'); if (errs == null) @@ -1078,7 +1078,7 @@ public class HadoopExternalCommunication { assert errs != null; if (X.hasCause(errs, ConnectException.class)) - LT.warn(log, null, "Failed to connect to a remote Hadoop process (is process still running?). " + + LT.warn(log, "Failed to connect to a remote Hadoop process (is process still running?). " + "Make sure operating system firewall is disabled on local and remote host) " + "[addrs=" + addr + ", port=" + port + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 2e8b93f..000e70d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -921,7 +921,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { String longMsg = "Query execution is too long [time=" + time + " ms, sql='" + sql + '\'' + ", plan=" + U.nl() + plan.getString(1) + U.nl() + ", parameters=" + params + "]"; - LT.warn(log, null, longMsg, msg); + LT.warn(log, longMsg, msg); } return rs; http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java index f21a279..aecbb03 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java @@ -174,7 +174,7 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest { } } - LT.warn(log, null, e.getMessage()); + LT.warn(log, e.getMessage()); return; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3271d75f/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/UriDeploymentHttpScanner.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/UriDeploymentHttpScanner.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/UriDeploymentHttpScanner.java index 48bfd7f..bb7260d 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/UriDeploymentHttpScanner.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/http/UriDeploymentHttpScanner.java @@ -343,11 +343,11 @@ public class UriDeploymentHttpScanner implements UriDeploymentScanner { catch (IOException e) { if (!scanCtx.isCancelled()) { if (X.hasCause(e, ConnectException.class)) { - LT.warn(scanCtx.getLogger(), e, "Failed to connect to HTTP server " + + LT.error(scanCtx.getLogger(), e, "Failed to connect to HTTP server " + "(connection refused): " + U.hidePassword(url)); } else if (X.hasCause(e, UnknownHostException.class)) { - LT.warn(scanCtx.getLogger(), e, "Failed to connect to HTTP server " + + LT.error(scanCtx.getLogger(), e, "Failed to connect to HTTP server " + "(host is unknown): " + U.hidePassword(url)); } else @@ -404,11 +404,11 @@ public class UriDeploymentHttpScanner implements UriDeploymentScanner { catch (IOException e) { if (!scanCtx.isCancelled()) { if (X.hasCause(e, ConnectException.class)) { - LT.warn(scanCtx.getLogger(), e, "Failed to connect to HTTP server (connection refused): " + + LT.error(scanCtx.getLogger(), e, "Failed to connect to HTTP server (connection refused): " + U.hidePassword(url.toString())); } else if (X.hasCause(e, UnknownHostException.class)) { - LT.warn(scanCtx.getLogger(), e, "Failed to connect to HTTP server (host is unknown): " + + LT.error(scanCtx.getLogger(), e, "Failed to connect to HTTP server (host is unknown): " + U.hidePassword(url.toString())); } else
