Fixing the sync issues with AAI

[aai/sparky-be.git] / src / main / java / org / openecomp / sparky / synchronizer / SyncController.java

diff --git a/src/main/java/org/openecomp/sparky/synchronizer/SyncController.java b/src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
index 85cbeb5..5d5ef61 100644 (file)
--- a/src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
+++ b/src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
@@ -422,30 +422,31 @@ public class SyncController {
 
     boolean allDone = false;
     long nextReportTimeStampInMs = System.currentTimeMillis() + 30000L;
+    boolean dumpPeriodicStatReport = false;
 
     while (!allDone) {
 
-      // allDone = false;
-
       int totalFinished = 0;
 
       for (IndexSynchronizer synchronizer : registeredSynchronizers) {
-        if (System.currentTimeMillis() > nextReportTimeStampInMs) {
-
-          nextReportTimeStampInMs = System.currentTimeMillis() + 30000L;
-
-          String statReport = synchronizer.getStatReport(false);
-
-          if (statReport != null) {
-            LOG.info(AaiUiMsgs.INFO_GENERIC, statReport);
-          }
-        }
-
-        if (synchronizer.getState() == SynchronizerState.IDLE) {
-          totalFinished++;
-        }
+         if (dumpPeriodicStatReport) {
+              if (synchronizer.getState() != SynchronizerState.IDLE) {
+                String statReport = synchronizer.getStatReport(false);
+                 if (statReport != null) {
+                           LOG.info(AaiUiMsgs.INFO_GENERIC, statReport);
+                         }
+              }
+               if (synchronizer.getState() == SynchronizerState.IDLE) {
+                 totalFinished++;
+               }
+         }
       }
-
+      if ( System.currentTimeMillis() > nextReportTimeStampInMs) {
+          dumpPeriodicStatReport = true;
+          nextReportTimeStampInMs = System.currentTimeMillis() + 30000L; 
+        } else {
+          dumpPeriodicStatReport = false;
+        }
       allDone = (totalFinished == registeredSynchronizers.size());
 
       try {