From 1525cfba9da0d0bc178183962316ee36b74aa41a Mon Sep 17 00:00:00 2001 From: Fomin Date: Thu, 16 Nov 2023 14:28:18 +0300 Subject: [PATCH 1/5] IGNITE-20737: add method equals to PartitionUpdateCounterDebugWrapper --- .../processors/cache/PartitionUpdateCounterDebugWrapper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java index 39aeb92b63a59..1a9de57a81c86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java @@ -286,4 +286,9 @@ public PartitionUpdateCounterDebugWrapper(int partId, PartitionUpdateCounter del @Override public String toString() { return delegate.toString(); } + + /** {@inheritDoc} */ + @Override public boolean equals(Object o) { + return o instanceof PartitionUpdateCounterDebugWrapper && delegate.equals(((PartitionUpdateCounterDebugWrapper)o).delegate); + } } From 366d1601014ad58cbbb2c6cf76b2a7c56f170f00 Mon Sep 17 00:00:00 2001 From: Fomin Date: Wed, 22 Nov 2023 20:19:23 +0300 Subject: [PATCH 2/5] IGNITE-20737: addtestCacheIdleVerifyLogLevelDebug() --- .../ignite/util/GridCommandHandlerTest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index f3869dbac24bb..cafeee079f044 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -3951,6 +3951,27 @@ public void testFailStopWarmUp() throws Exception { assertEquals(EXIT_CODE_UNEXPECTED_ERROR, execute("--warm-up", "--stop")); } + /** @throws Exception If fails. */ + @Test + public void testCacheIdleVerifyLogLevelDebug() throws Exception { + + IgniteEx ignite = startGrids(3); + + ignite.cluster().state(ACTIVE); + + IgniteCache cache = ignite.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME) + .setAffinity(new RendezvousAffinityFunction(false, 32)) + .setBackups(1)); + cache.put("key", "value"); + + injectTestSystemOut(); + + setLoggerDebugLevel(); + + assertEquals(EXIT_CODE_OK, execute("--cache", "idle_verify")); + assertContains(log, testOut.toString(), "no conflicts have been found"); + } + /** * @param ignite Ignite to execute task on. * @param delFoundGarbage If clearing mode should be used. From f47822d55711c9ad58effd09d2fa465b7cf978bf Mon Sep 17 00:00:00 2001 From: Fomin Date: Wed, 22 Nov 2023 20:36:47 +0300 Subject: [PATCH 3/5] IGNITE-20737: style --- .../java/org/apache/ignite/util/GridCommandHandlerTest.java | 4 ++-- .../processors/cache/PartitionUpdateCounterDebugWrapper.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index cafeee079f044..fc0e24c9a4f47 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -3954,12 +3954,12 @@ public void testFailStopWarmUp() throws Exception { /** @throws Exception If fails. */ @Test public void testCacheIdleVerifyLogLevelDebug() throws Exception { - - IgniteEx ignite = startGrids(3); + IgniteEx ignite = startGrids(2); ignite.cluster().state(ACTIVE); IgniteCache cache = ignite.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME) + .setAffinity(new RendezvousAffinityFunction(false, 32)) .setBackups(1)); cache.put("key", "value"); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java index 1a9de57a81c86..e6c02850bd12a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java @@ -289,6 +289,7 @@ public PartitionUpdateCounterDebugWrapper(int partId, PartitionUpdateCounter del /** {@inheritDoc} */ @Override public boolean equals(Object o) { - return o instanceof PartitionUpdateCounterDebugWrapper && delegate.equals(((PartitionUpdateCounterDebugWrapper)o).delegate); + return o instanceof PartitionUpdateCounterDebugWrapper && + delegate.equals(((PartitionUpdateCounterDebugWrapper)o).delegate); } } From e59c7764766910ab2117f64c3ece21bb208217b5 Mon Sep 17 00:00:00 2001 From: Fomin Date: Wed, 22 Nov 2023 20:38:50 +0300 Subject: [PATCH 4/5] IGNITE-20737: style --- .../java/org/apache/ignite/util/GridCommandHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index fc0e24c9a4f47..a0e46a0fa1db8 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -3959,9 +3959,9 @@ public void testCacheIdleVerifyLogLevelDebug() throws Exception { ignite.cluster().state(ACTIVE); IgniteCache cache = ignite.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME) - .setAffinity(new RendezvousAffinityFunction(false, 32)) .setBackups(1)); + cache.put("key", "value"); injectTestSystemOut(); From 02248248f1be75d3fecbdcc6ae8d1ac31fea88d7 Mon Sep 17 00:00:00 2001 From: Fomin Date: Wed, 22 Nov 2023 21:34:32 +0300 Subject: [PATCH 5/5] IGNITE-20737: style --- .../processors/cache/PartitionUpdateCounterDebugWrapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java index e6c02850bd12a..54dc938b8251e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/PartitionUpdateCounterDebugWrapper.java @@ -289,7 +289,7 @@ public PartitionUpdateCounterDebugWrapper(int partId, PartitionUpdateCounter del /** {@inheritDoc} */ @Override public boolean equals(Object o) { - return o instanceof PartitionUpdateCounterDebugWrapper && - delegate.equals(((PartitionUpdateCounterDebugWrapper)o).delegate); + return o instanceof PartitionUpdateCounterDebugWrapper + && delegate.equals(((PartitionUpdateCounterDebugWrapper)o).delegate); } }