You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by na...@apache.org on 2021/10/07 15:32:43 UTC
[ignite] branch master updated: IGNITE-15651 Fixed test
CacheGroupReencryptionTest.testReencryptionMetrics. (#9455)
This is an automated email from the ASF dual-hosted git repository.
namelchev 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 c047f01 IGNITE-15651 Fixed test CacheGroupReencryptionTest.testReencryptionMetrics. (#9455)
c047f01 is described below
commit c047f012fa856b40b8ac151e4e2484b3d549fcc7
Author: Pavel Pereslegin <xx...@gmail.com>
AuthorDate: Thu Oct 7 18:32:16 2021 +0300
IGNITE-15651 Fixed test CacheGroupReencryptionTest.testReencryptionMetrics. (#9455)
---
.../ignite/internal/encryption/CacheGroupReencryptionTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/CacheGroupReencryptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/CacheGroupReencryptionTest.java
index 75dc828..e97ed90 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/CacheGroupReencryptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/CacheGroupReencryptionTest.java
@@ -44,6 +44,7 @@ import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.processors.cache.CacheGroupMetricsImpl;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
@@ -63,6 +64,7 @@ import static org.apache.ignite.configuration.WALMode.LOG_ONLY;
import static org.apache.ignite.internal.managers.encryption.GridEncryptionManager.INITIAL_KEY_ID;
import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metricName;
import static org.apache.ignite.testframework.GridTestUtils.assertThrowsAnyCause;
+import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
/**
* Cache re-encryption tests.
@@ -809,7 +811,7 @@ public class CacheGroupReencryptionTest extends AbstractEncryptionTest {
* @param node Grid.
* @param finished Expected reencryption status.
*/
- private void validateMetrics(IgniteEx node, boolean finished) {
+ private void validateMetrics(IgniteEx node, boolean finished) throws IgniteInterruptedCheckedException {
MetricRegistry registry =
node.context().metric().registry(metricName(CacheGroupMetricsImpl.CACHE_GROUP_METRICS_PREFIX, cacheName()));
@@ -818,7 +820,7 @@ public class CacheGroupReencryptionTest extends AbstractEncryptionTest {
if (finished)
assertEquals(0, bytesLeft.value());
else
- assertTrue(bytesLeft.value() > 0);
+ assertTrue(waitForCondition(() -> bytesLeft.value() > 0, MAX_AWAIT_MILLIS));
BooleanMetric reencryptionFinished = registry.findMetric("ReencryptionFinished");