You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2023/12/25 11:33:11 UTC
(ignite) branch master updated: IGNITE-14823 Logger abbrevation (#11135)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 967e355e1fd IGNITE-14823 Logger abbrevation (#11135)
967e355e1fd is described below
commit 967e355e1fd709a8b897df08bcad39410f94139e
Author: Nikolay <ni...@apache.org>
AuthorDate: Mon Dec 25 14:33:03 2023 +0300
IGNITE-14823 Logger abbrevation (#11135)
---
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../junits/IgniteCompatibilityAbstractTest.java | 10 ++---
.../indexreader/IgniteIndexReaderTest.java | 8 ++--
.../util/GridCommandHandlerAbstractTest.java | 6 +--
.../GridCommandHandlerInterruptCommandTest.java | 6 +--
.../dotnet/PlatformDotNetConfigurationClosure.java | 10 ++---
.../cache/CacheDataRegionConfigurationTest.java | 50 +++++++++++-----------
.../IgniteSemaphoreAbstractSelfTest.java | 8 ++--
...ueryRemoteFilterMissingInClassPathSelfTest.java | 6 +--
.../p2p/GridP2PScanQueryWithTransformerTest.java | 12 +++---
.../tcp/GridTcpCommunicationSpiConfigSelfTest.java | 8 ++--
.../internal/processors/query/SqlMergeTest.java | 4 +-
.../h2/twostep/RetryCauseMessageSelfTest.java | 8 ++--
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 4 +-
14 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index c4aa9b3a1b6..ebcce0795aa 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -36,7 +36,7 @@ initialize,init
#iterator,iter
label,lbl
#local,loc
-#logger,log
+logger,log
#loader,ldr
#manager,mgr
#message,msg
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
index 49519e020bf..a49e5275ae3 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
@@ -148,11 +148,11 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract
final IgniteConfiguration cfg = getConfiguration(igniteInstanceName); // stub - won't be used at node startup
- final ListeningTestLogger logger = new ListeningTestLogger(log);
+ final ListeningTestLogger listeningLog = new ListeningTestLogger(log);
- IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, logger, locJvmInstance == null ? null : () -> locJvmInstance, true) {
+ IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, listeningLog, locJvmInstance == null ? null : () -> locJvmInstance, true) {
@Override protected IgniteLogger logger(IgniteLogger log, Object ctgr) {
- return logger.getLogger(ctgr + "#" + ver.replaceAll("\\.", "_"));
+ return listeningLog.getLogger(ctgr + "#" + ver.replaceAll("\\.", "_"));
}
@Override protected String igniteNodeRunnerClassName() throws Exception {
@@ -177,14 +177,14 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract
LogListener lsnr = LogListener.matches(SYNCHRONIZATION_LOG_MESSAGE + nodeId).build();
- logger.registerListener(lsnr);
+ listeningLog.registerListener(lsnr);
final long joinTimeout = getNodeJoinTimeout();
assertTrue("Node has not joined [id=" + nodeId + "]/" +
"or does not completed its startup during timeout: " + joinTimeout + " ms.", lsnr.check(joinTimeout));
- logger.clearListeners();
+ listeningLog.clearListeners();
}
if (rmJvmInstance == null)
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
index a3f6022c9a8..fdc404820ce 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
@@ -743,7 +743,7 @@ public class IgniteIndexReaderTest extends GridCommandHandlerAbstractTest {
) throws IgniteCheckedException {
testOut.reset();
- IgniteLogger logger = createTestLogger();
+ IgniteLogger log = createTestLogger();
IgniteIndexReader reader0 = new IgniteIndexReader(
PAGE_SIZE,
@@ -752,7 +752,7 @@ public class IgniteIndexReaderTest extends GridCommandHandlerAbstractTest {
new File(workDir, dataDir(cacheGrp)),
isNull(idxs) ? null : idx -> Arrays.stream(idxs).anyMatch(idx::endsWith),
checkParts,
- logger
+ log
) {
/** {@inheritDoc} */
@Override ProgressPrinter createProgressPrinter(String caption, long total) {
@@ -763,8 +763,8 @@ public class IgniteIndexReaderTest extends GridCommandHandlerAbstractTest {
reader.readIndex();
}
- if (logger instanceof IgniteLoggerEx)
- ((IgniteLoggerEx)logger).flush();
+ if (log instanceof IgniteLoggerEx)
+ ((IgniteLoggerEx)log).flush();
return testOut.toString();
}
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
index 8bb0e670196..76a124ef409 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
@@ -216,11 +216,11 @@ public abstract class GridCommandHandlerAbstractTest extends GridCommandHandlerF
* @return Logger.
*/
public static IgniteLogger createTestLogger() {
- JavaLogger logger = new JavaLogger(initLogger(null), false);
+ JavaLogger log = new JavaLogger(initLogger(null), false);
- logger.addConsoleAppender(true);
+ log.addConsoleAppender(true);
- return logger;
+ return log;
}
/**
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
index 736e2ca3e68..f5cc0c981de 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
@@ -309,14 +309,14 @@ public class GridCommandHandlerInterruptCommandTest extends GridCommandHandlerAb
ValidateIndexesClosure clo = new ValidateIndexesClosure(cancelled::get, Collections.singleton(DEFAULT_CACHE_NAME),
0, 0, false, true);
- ListeningTestLogger listeningLogger = new ListeningTestLogger(log);
+ ListeningTestLogger listeningLog = new ListeningTestLogger(log);
GridTestUtils.setFieldValue(clo, "ignite", ignite0);
- GridTestUtils.setFieldValue(clo, "log", listeningLogger);
+ GridTestUtils.setFieldValue(clo, "log", listeningLog);
LogListener lnsrValidationStarted = LogListener.matches("Current progress of ValidateIndexesClosure").build();
- listeningLogger.registerListener(lnsrValidationStarted);
+ listeningLog.registerListener(lnsrValidationStarted);
IgniteInternalFuture fut = GridTestUtils.runAsync(() ->
GridTestUtils.assertThrows(log, clo::call, IgniteException.class, ValidateIndexesClosure.CANCELLED_MSG));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index 1de616272f2..f63471726d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -87,16 +87,16 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
memMgr = new PlatformMemoryManagerImpl(gate, 1024);
- PlatformLogger logger = null;
+ PlatformLogger log = null;
if (useLogger) {
- logger = new PlatformLogger();
- logger.setGateway(gate);
- igniteCfg.setGridLogger(logger);
+ log = new PlatformLogger();
+ log.setGateway(gate);
+ igniteCfg.setGridLogger(log);
}
PlatformDotNetConfigurationEx dotNetCfg0 = new PlatformDotNetConfigurationEx(dotNetCfg, gate, memMgr,
- logger);
+ log);
igniteCfg.setPlatformConfiguration(dotNetCfg0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
index 7724587e28c..1f52ab32f3a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
@@ -299,25 +299,25 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
ccfg = manyPartitionsCache;
- ListeningTestLogger srv0Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv0Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr0 = matches("Cache group 'default' brings high overhead").build();
LogListener dataRegLsnr0 = matches("metainformation in data region 'smallRegion'").build();
LogListener partsInfoLsnr0 = matches(numOfPartitions + " partitions, " +
DFLT_PAGE_SIZE +
" bytes per partition, " + partitionsMetaMemoryChunk + " MBs total").build();
- srv0Logger.registerAllListeners(cacheGrpLsnr0, dataRegLsnr0, partsInfoLsnr0);
- logger = srv0Logger;
+ srv0Log.registerAllListeners(cacheGrpLsnr0, dataRegLsnr0, partsInfoLsnr0);
+ logger = srv0Log;
IgniteEx ignite0 = startGrid("srv0");
- ListeningTestLogger srv1Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv1Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr1 = matches("Cache group 'default' brings high overhead").build();
LogListener dataRegLsnr1 = matches("metainformation in data region 'smallRegion'").build();
LogListener partsInfoLsnr1 = matches(numOfPartitions + " partitions, " +
DFLT_PAGE_SIZE +
" bytes per partition, " + partitionsMetaMemoryChunk + " MBs total").build();
- srv1Logger.registerAllListeners(cacheGrpLsnr1, dataRegLsnr1, partsInfoLsnr1);
- logger = srv1Logger;
+ srv1Log.registerAllListeners(cacheGrpLsnr1, dataRegLsnr1, partsInfoLsnr1);
+ logger = srv1Log;
startGrid("srv1");
@@ -365,32 +365,32 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
//one hour to guarantee that checkpoint will be triggered by 'dirty pages amount' trigger
memCfg.setCheckpointFrequency(60 * 60 * 1000);
- ListeningTestLogger srv0Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv0Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr0 = matches("Cache group 'default' brings high overhead").build();
LogListener dataRegLsnr0 = matches("metainformation in data region 'defaultRegion'").build();
LogListener partsInfoLsnr0 = matches(numOfPartitions + " partitions, " +
DFLT_PAGE_SIZE +
" bytes per partition, " + partitionsMetaMemoryChunk + " MBs total").build();
- srv0Logger.registerAllListeners(cacheGrpLsnr0, dataRegLsnr0, partsInfoLsnr0);
- logger = srv0Logger;
+ srv0Log.registerAllListeners(cacheGrpLsnr0, dataRegLsnr0, partsInfoLsnr0);
+ logger = srv0Log;
IgniteEx ignite0 = startGrid("srv0");
- ListeningTestLogger srv1Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv1Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr1 = matches("Cache group 'default' brings high overhead").build();
LogListener dataRegLsnr1 = matches("metainformation in data region 'defaultRegion'").build();
LogListener partsInfoLsnr1 = matches(numOfPartitions + " partitions, " +
DFLT_PAGE_SIZE +
" bytes per partition, " + partitionsMetaMemoryChunk + " MBs total").build();
- srv1Logger.registerAllListeners(cacheGrpLsnr1, dataRegLsnr1, partsInfoLsnr1);
- logger = srv1Logger;
+ srv1Log.registerAllListeners(cacheGrpLsnr1, dataRegLsnr1, partsInfoLsnr1);
+ logger = srv1Log;
startGrid("srv1");
- ListeningTestLogger srv2Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv2Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr2 = matches("Cache group 'default' brings high overhead").build();
- srv2Logger.registerListener(cacheGrpLsnr2);
- logger = srv2Logger;
+ srv2Log.registerListener(cacheGrpLsnr2);
+ logger = srv2Log;
startGrid("srv2");
@@ -437,17 +437,17 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
//one hour to guarantee that checkpoint will be triggered by 'dirty pages amount' trigger
memCfg.setCheckpointFrequency(60 * 60 * 1000);
- ListeningTestLogger srv0Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv0Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr0 = matches("Cache group 'default' brings high overhead").build();
- srv0Logger.registerListener(cacheGrpLsnr0);
- logger = srv0Logger;
+ srv0Log.registerListener(cacheGrpLsnr0);
+ logger = srv0Log;
IgniteEx ignite0 = startGrid("srv0");
- ListeningTestLogger srv1Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv1Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr1 = matches("Cache group 'default' brings high overhead").build();
- srv1Logger.registerListener(cacheGrpLsnr1);
- logger = srv1Logger;
+ srv1Log.registerListener(cacheGrpLsnr1);
+ logger = srv1Log;
startGrid("srv1");
@@ -503,12 +503,12 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
ccfg = fewPartitionsCache;
- ListeningTestLogger srv0Logger = new ListeningTestLogger(null);
+ ListeningTestLogger srv0Log = new ListeningTestLogger(null);
LogListener cacheGrpLsnr0 = matches("Cache group 'default' brings high overhead").build();
LogListener dynamicGrpLsnr = matches("Cache group 'dynamicCache' brings high overhead").build();
- srv0Logger.registerListener(cacheGrpLsnr0);
- srv0Logger.registerListener(dynamicGrpLsnr);
- logger = srv0Logger;
+ srv0Log.registerListener(cacheGrpLsnr0);
+ srv0Log.registerListener(dynamicGrpLsnr);
+ logger = srv0Log;
IgniteEx ignite0 = startGrid("srv0");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
index ddd5b4b5bb1..347f1ab58df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
@@ -290,18 +290,18 @@ public abstract class IgniteSemaphoreAbstractSelfTest extends IgniteAtomicsAbstr
@Test
public void testSemaphoreClosing() throws Exception {
IgniteConfiguration cfg;
- GridStringLogger stringLogger;
+ GridStringLogger stringLog;
- stringLogger = new GridStringLogger();
+ stringLog = new GridStringLogger();
cfg = optimize(getConfiguration("npeGrid"));
- cfg.setGridLogger(stringLogger);
+ cfg.setGridLogger(stringLog);
try (Ignite ignite = startGrid(cfg.getIgniteInstanceName(), cfg)) {
ignite.semaphore("semaphore", 1, true, true);
}
- assertFalse(stringLogger.toString().contains(NullPointerException.class.getName()));
+ assertFalse(stringLog.toString().contains(NullPointerException.class.getName()));
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java
index 02e5714874c..0853a53bcb8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java
@@ -156,9 +156,9 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC
executeContinuousQuery(ignite0.cache(DEFAULT_CACHE_NAME));
- ListeningTestLogger listeningLogger = new ListeningTestLogger();
+ ListeningTestLogger listeningLog = new ListeningTestLogger();
- log = listeningLogger;
+ log = listeningLog;
LogListener lsnr = LogListener.matches(logStr ->
logStr.contains("class org.apache.ignite.IgniteCheckedException: " +
@@ -166,7 +166,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC
|| logStr.contains("Failed to unmarshal continuous routine handler"
)).build();
- listeningLogger.registerListener(lsnr);
+ listeningLog.registerListener(lsnr);
setExternalLoader = false;
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PScanQueryWithTransformerTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PScanQueryWithTransformerTest.java
index 16df844fac3..727a4c50ae8 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PScanQueryWithTransformerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PScanQueryWithTransformerTest.java
@@ -255,13 +255,13 @@ public class GridP2PScanQueryWithTransformerTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
private void executeP2PClassLoadingEnabledTest(boolean withClientNode) throws Exception {
- ListeningTestLogger listeningLogger = new ListeningTestLogger();
+ ListeningTestLogger listeningLog = new ListeningTestLogger();
LogListener clsDeployedMsgLsnr = LogListener.matches(
"Class was deployed in SHARED or CONTINUOUS mode: " +
"class org.apache.ignite.tests.p2p.cache.ScanQueryTestTransformer")
.build();
- listeningLogger.registerListener(clsDeployedMsgLsnr);
- logger = listeningLogger;
+ listeningLog.registerListener(clsDeployedMsgLsnr);
+ logger = listeningLog;
IgniteEx ig0 = startGrid(0);
@@ -304,13 +304,13 @@ public class GridP2PScanQueryWithTransformerTest extends GridCommonAbstractTest
* @throws Exception If test scenario failed.
*/
private void executeP2PClassLoadingDisabledTest(boolean withClientNode) throws Exception {
- ListeningTestLogger listeningLogger = new ListeningTestLogger();
+ ListeningTestLogger listeningLog = new ListeningTestLogger();
LogListener clsDeployedMsgLsnr = LogListener.matches(
"Class was deployed in SHARED or CONTINUOUS mode: " +
"class org.apache.ignite.tests.p2p.cache.ScanQueryTestTransformerWrapper")
.build();
- listeningLogger.registerListener(clsDeployedMsgLsnr);
- logger = listeningLogger;
+ listeningLog.registerListener(clsDeployedMsgLsnr);
+ logger = listeningLog;
IgniteEx ig0 = startGrid(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
index d580d38723a..0e5e9a96cac 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java
@@ -157,17 +157,17 @@ public class GridTcpCommunicationSpiConfigSelfTest extends GridSpiAbstractConfig
@Test
@WithSystemProperty(key = "IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK", value = "true")
public void testSendToNonInitializedTcpCommSpi() throws Exception {
- ListeningTestLogger listeningLogger = new ListeningTestLogger(log);
+ ListeningTestLogger listeningLog = new ListeningTestLogger(log);
LogListener npeLsnr = LogListener.matches("NullPointerException")
.andMatches("InboundConnectionHandler.onMessageSent").build();
- listeningLogger.registerListener(npeLsnr);
+ listeningLog.registerListener(npeLsnr);
GridTestNode sendingNode = new GridTestNode();
sendingNode.order(0);
GridSpiTestContext sendingCtx = initSpiContext();
- TcpCommunicationSpi sendingSpi = initializeSpi(sendingCtx, sendingNode, listeningLogger, false);
+ TcpCommunicationSpi sendingSpi = initializeSpi(sendingCtx, sendingNode, listeningLog, false);
spisToStop.add(sendingSpi);
sendingSpi.onContextInitialized(sendingCtx);
@@ -197,7 +197,7 @@ public class GridTcpCommunicationSpiConfigSelfTest extends GridSpiAbstractConfig
return new MetricRegistry(name, null, null, new NullLogger());
});
- TcpCommunicationSpi receiverSpi = initializeSpi(receiverCtx, receiverNode, listeningLogger, true);
+ TcpCommunicationSpi receiverSpi = initializeSpi(receiverCtx, receiverNode, listeningLog, true);
spisToStop.add(receiverSpi);
receiverCtx.remoteNodes().add(sendingNode);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlMergeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlMergeTest.java
index d97842da885..f6d65e85472 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlMergeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlMergeTest.java
@@ -97,9 +97,9 @@ public class SqlMergeTest extends AbstractIndexingCommonTest {
.matches("The search row by explicit KEY isn't supported. The primary key is always used to search row")
.build();
- ListeningTestLogger listeningTestLogger = testLog();
+ ListeningTestLogger listeningTestLog = testLog();
- listeningTestLogger.registerListener(logLsnr);
+ listeningTestLog.registerListener(logLsnr);
sql("CREATE TABLE test2 (id INT, id2 INT, name VARCHAR, PRIMARY KEY (id, id2))");
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/RetryCauseMessageSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/RetryCauseMessageSelfTest.java
index ba605ff86cf..0f5491934e9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/RetryCauseMessageSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/twostep/RetryCauseMessageSelfTest.java
@@ -318,11 +318,11 @@ public class RetryCauseMessageSelfTest extends AbstractIndexingCommonTest {
final GridReduceQueryExecutor rdcQryExec = GridTestUtils.getFieldValue(h2Idx, IgniteH2Indexing.class, "rdcQryExec");
final ReducePartitionMapper mapper = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "mapper");
- final IgniteLogger logger = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "log");
+ final IgniteLogger rdcQryExecLog = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "log");
final GridKernalContext ctx = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "ctx");
GridTestUtils.setFieldValue(rdcQryExec, "mapper",
- new ReducePartitionMapper(ctx, logger) {
+ new ReducePartitionMapper(ctx, rdcQryExecLog) {
@Override public ReducePartitionMapResult nodesForPartitions(List<Integer> cacheIds,
AffinityTopologyVersion topVer, int[] parts, boolean isReplicatedOnly) {
final ReducePartitionMapResult res = super.nodesForPartitions(cacheIds, topVer, parts, isReplicatedOnly);
@@ -353,11 +353,11 @@ public class RetryCauseMessageSelfTest extends AbstractIndexingCommonTest {
final GridReduceQueryExecutor rdcQryExec = GridTestUtils.getFieldValue(h2Idx, IgniteH2Indexing.class, "rdcQryExec");
final ReducePartitionMapper mapper = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "mapper");
- final IgniteLogger logger = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "log");
+ final IgniteLogger rdcQryExecLog = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "log");
final GridKernalContext ctx = GridTestUtils.getFieldValue(rdcQryExec, GridReduceQueryExecutor.class, "ctx");
GridTestUtils.setFieldValue(rdcQryExec, "mapper",
- new ReducePartitionMapper(ctx, logger) {
+ new ReducePartitionMapper(ctx, rdcQryExecLog) {
@Override public ReducePartitionMapResult nodesForPartitions(List<Integer> cacheIds,
AffinityTopologyVersion topVer, int[] parts, boolean isReplicatedOnly) {
final ReducePartitionMapResult res = super.nodesForPartitions(cacheIds, topVer, parts, isReplicatedOnly);
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
index 9456634340f..192000ccff5 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
@@ -128,11 +128,11 @@ public class Log4j2LoggerVerboseModeSelfTest {
File xml = GridTestUtils.resolveIgnitePath(LOG_PATH_VERBOSE_TEST);
- Log4J2Logger logger = new Log4J2Logger(xml);
+ Log4J2Logger log = new Log4J2Logger(xml);
return new IgniteConfiguration()
.setIgniteInstanceName(igniteInstanceName)
- .setGridLogger(logger)
+ .setGridLogger(log)
.setConnectorConfiguration(null)
.setDiscoverySpi(disco);
}