From 6e7c747a74ebf93515fbcc474410e0f14c010107 Mon Sep 17 00:00:00 2001 From: Iliyan Velichkov Date: Mon, 13 Jan 2025 14:04:20 +0200 Subject: [PATCH] Fix CsvimIT execution stability - improve files watching reset (#4561) * reset synchronization watcher when starting synch processing Prevent resetting the watcher after the sync completion since this way it leads to skipped file modifications which occur during long synchronization executions. Signed-off-by: Iliyan Velichkov * reduce timeout Signed-off-by: Iliyan Velichkov --------- Signed-off-by: Iliyan Velichkov --- .../initializers/synchronizer/SynchronizationProcessor.java | 2 +- .../eclipse/dirigible/integration/tests/api/java/CsvimIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/core/core-initializers/src/main/java/org/eclipse/dirigible/components/initializers/synchronizer/SynchronizationProcessor.java b/components/core/core-initializers/src/main/java/org/eclipse/dirigible/components/initializers/synchronizer/SynchronizationProcessor.java index 08aa7ff46c..64b508aaf6 100644 --- a/components/core/core-initializers/src/main/java/org/eclipse/dirigible/components/initializers/synchronizer/SynchronizationProcessor.java +++ b/components/core/core-initializers/src/main/java/org/eclipse/dirigible/components/initializers/synchronizer/SynchronizationProcessor.java @@ -167,6 +167,7 @@ public void processSynchronizers() { } processing.set(true); + synchronizationWatcher.reset(); try { @@ -397,7 +398,6 @@ public void processSynchronizers() { definitions.clear(); artefacts.clear(); - synchronizationWatcher.reset(); initialized.set(true); processing.set(false); } diff --git a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java index 748a7a1317..38f1647a6d 100644 --- a/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java +++ b/tests/tests-integrations/src/test/java/org/eclipse/dirigible/integration/tests/api/java/CsvimIT.java @@ -120,7 +120,7 @@ private void createUndefinedTable() { } private void verifyDataInTable(String tableName, List expectedReaders) { - await().atMost(60, TimeUnit.SECONDS) + await().atMost(30, TimeUnit.SECONDS) .pollInterval(1, TimeUnit.SECONDS) .until(() -> { try {