This is an automated email from the ASF dual-hosted git repository.
baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new 524ce9474a [MINOR] Add retry on failing monitor test
524ce9474a is described below
commit 524ce9474a3a8aeb090990717d776705a7676640
Author: baunsgaard <[email protected]>
AuthorDate: Fri Sep 30 14:52:11 2022 +0200
[MINOR] Add retry on failing monitor test
---
.../FederatedCoordinatorIntegrationCRUDTest.java | 1 -
.../FederatedWorkerIntegrationCRUDTest.java | 1 -
.../monitoring/FederatedWorkerStatisticsTest.java | 36 ++++++++++++----------
.../TransformFederatedEncodeApplyTest.java | 1 +
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
index 5ee3431394..e059ab8e21 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedCoordinatorIntegrationCRUDTest.java
@@ -25,7 +25,6 @@ import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.Coord
import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class FederatedCoordinatorIntegrationCRUDTest extends
FederatedMonitoringTestBase {
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
index 4210829c31..07c9eeafcd 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerIntegrationCRUDTest.java
@@ -25,7 +25,6 @@ import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.Worke
import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class FederatedWorkerIntegrationCRUDTest extends
FederatedMonitoringTestBase {
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerStatisticsTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerStatisticsTest.java
index 0e2f3dfa2e..db2403920f 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerStatisticsTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/monitoring/FederatedWorkerStatisticsTest.java
@@ -19,11 +19,20 @@
package org.apache.sysds.test.functions.federated.monitoring;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.DataObjectModel;
-import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.EventModel;
-import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.EventStageModel;
import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.RequestModel;
import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.StatisticsModel;
import
org.apache.sysds.runtime.controlprogram.federated.monitoring.models.StatisticsOptions;
@@ -39,17 +48,6 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
public class FederatedWorkerStatisticsTest extends FederatedMonitoringTestBase
{
private static final Log LOG =
LogFactory.getLog(FederatedWorkerStatisticsTest.class.getName());
@@ -73,12 +71,18 @@ public class FederatedWorkerStatisticsTest extends
FederatedMonitoringTestBase {
}
@Test
- public void testWorkerStatisticsParsedCorrectly() {
+ public void testWorkerStatisticsParsedCorrectly() throws
InterruptedException {
var model = (StatisticsModel)
StatisticsService.getWorkerStatistics(1L, "localhost:" + workerPorts[0]);
+ int retry = 10;
+ while(model == null && retry > 0){
+ Thread.sleep(1000);
+ model = (StatisticsModel)
StatisticsService.getWorkerStatistics(1L, "localhost:" + workerPorts[0]);
+ retry--;
+ }
- Assert.assertNotNull("Stats parsed correctly", model);
- Assert.assertNotEquals("Utilization stats parsed correctly", 0,
model.utilization.size());
+ Assert.assertNotNull("Stats still null", model);
+ Assert.assertNotEquals("Utilization stats not parsed
correctly", 0, model.utilization.size());
}
@Test
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
index 77ea36e20b..ec02bf3d80 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/transform/TransformFederatedEncodeApplyTest.java
@@ -227,6 +227,7 @@ public class TransformFederatedEncodeApplyTest extends
AutomatedTestBase {
case BIN_HEIGHT_DUMMY: SPEC =
colnames?SPEC7d:SPEC7c; DATASET = DATASET1; break;
case HASH: SPEC = colnames ? SPEC8b : SPEC8; DATASET =
DATASET1; break;
case HASH_RECODE: SPEC = colnames ? SPEC9b : SPEC9;
DATASET = DATASET1; break;
+ default: throw new RuntimeException("Not supported
type");
}
Thread t1 = null, t2 = null, t3 = null, t4 = null;
