Merge pull request #79 from ml054/v5.4

post sync bugfixes
ravendb · Oct 12, 2023 · 2e1af8d · 2e1af8d
2 parents a9e6864 + a282db6
commit 2e1af8d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/src/main/java/net/ravendb/client/http/NodeSelector.java b/src/main/java/net/ravendb/client/http/NodeSelector.java
@@ -251,7 +251,7 @@ public void scheduleSpeedTest() {
 
     private void ensureFastestNodeTimerExists() {
         if (_updateFastestNodeTimer == null) {
-            _updateFastestNodeTimer = new Timer(this::switchToSpeedTestPhase, null, executorService);
+            _updateFastestNodeTimer = new Timer(this::switchToSpeedTestPhase, null, null, executorService);
         }
     }
 

diff --git a/src/main/java/net/ravendb/client/primitives/Timer.java b/src/main/java/net/ravendb/client/primitives/Timer.java
@@ -20,7 +20,9 @@ public Timer(Runnable action, Duration dueTime, Duration period, ExecutorService
         this.executorService = executorService;
         this.action = action;
         this.period = period;
-        schedule(dueTime);
+        if (dueTime != null) {
+            schedule(dueTime);
+        }
     }
 
     public void change(Duration dueTime) {

diff --git a/src/test/java/net/ravendb/client/ClusterTestBase.java b/src/test/java/net/ravendb/client/ClusterTestBase.java
@@ -325,7 +325,7 @@ public static void waitForIndexingInTheCluster(IDocumentStore store, String dbNa
                 new GetDatabaseRecordOperation(ObjectUtils.firstNonNull(dbName, store.getDatabase())));
 
         for (String nodeTag : record.getTopology().getAllNodes()) {
-            waitForIndexing(store, dbName, timeout, nodeTag);
+            waitForIndexing(store, dbName, timeout, false, nodeTag);
         }
     }
 

diff --git a/src/test/java/net/ravendb/client/IndexesTestBase.java b/src/test/java/net/ravendb/client/IndexesTestBase.java
@@ -26,7 +26,7 @@ public void waitForIndexing(IDocumentStore store, String database, Duration time
     }
 
     public void waitForIndexing(IDocumentStore store, String database, Duration timeout, String nodeTag) {
-        RemoteTestBase.waitForIndexing(store, database, timeout, nodeTag);
+        RemoteTestBase.waitForIndexing(store, database, timeout, false, nodeTag);
     }
 
     public IndexErrors[] waitForIndexingErrors(IDocumentStore store, Duration timeout, String... indexNames) throws InterruptedException {

diff --git a/src/test/java/net/ravendb/client/documents/operations/indexes/IndexOperationsTest.java b/src/test/java/net/ravendb/client/documents/operations/indexes/IndexOperationsTest.java
@@ -229,7 +229,7 @@ public void canListErrors() throws Exception {
                 session.saveChanges();
             }
 
-            waitForIndexing(store, store.getDatabase());
+            waitForIndexing(store, store.getDatabase(), null, true, null);
 
             waitForValue(() -> store.maintenance().send(new GetIndexErrorsOperation())[0].getErrors().length, 1);
             waitForValue(() -> store.maintenance().send(new GetIndexErrorsOperation(new String[] { indexDef.getName() }))[0].getErrors().length, 1);

diff --git a/src/test/java/net/ravendb/client/driver/RavenTestDriver.java b/src/test/java/net/ravendb/client/driver/RavenTestDriver.java
@@ -188,10 +188,10 @@ public static void waitForIndexing(IDocumentStore store, String database) {
     }
 
     public static void waitForIndexing(IDocumentStore store, String database, Duration timeout) {
-        waitForIndexing(store, database, timeout, null);
+        waitForIndexing(store, database, timeout, false, null);
     }
 
-    public static void waitForIndexing(IDocumentStore store, String database, Duration timeout, String nodeTag) {
+    public static void waitForIndexing(IDocumentStore store, String database, Duration timeout, boolean allowErrors, String nodeTag) {
         MaintenanceOperationExecutor admin = store.maintenance().forDatabase(database);
 
         if (timeout == null) {
@@ -212,7 +212,11 @@ public static void waitForIndexing(IDocumentStore store, String database, Durati
                 return;
             }
 
-            if (Arrays.stream(databaseStatistics.getIndexes()).anyMatch(x -> IndexState.ERROR.equals(x.getState()))) {
+            long erroredIndexesCount = Arrays.stream(databaseStatistics.getIndexes()).filter(x -> IndexState.ERROR.equals(x.getState())).count();
+            if (allowErrors) {
+                // wait for all indexes to become non stale
+            } else if (erroredIndexesCount > 0) {
+                // have at least some errors
                 break;
             }
 
@@ -223,6 +227,10 @@ public static void waitForIndexing(IDocumentStore store, String database, Durati
             }
         }
 
+        if (allowErrors) {
+            return;
+        }
+
 
         IndexErrors[] errors = admin.send(new GetIndexErrorsOperation());
         String allIndexErrorsText = "";

diff --git a/src/test/java/net/ravendb/client/infrastructure/DisableOnPullRequestCondition.java b/src/test/java/net/ravendb/client/infrastructure/DisableOnPullRequestCondition.java
@@ -7,7 +7,7 @@
 
 public class DisableOnPullRequestCondition implements ExecutionCondition {
 
-    public static final String ENV_RAVEN_LICENSE = "RAVEN_LICENSE";
+    public static final String ENV_RAVEN_LICENSE = "RAVEN_License";
 
     @Override
     public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {