Merge branch 'ZSTAC-52782@@2' into 'master'

<fix>[compute]: strat ping right now

See merge request zstackio/zstack!3495

Author: gitlab

compute/src/main/java/org/zstack/compute/host/HostTrackImpl.java

@@ -34,6 +34,7 @@ public class HostTrackImpl implements HostTracker, ManagementNodeChangeListener,
     private final static CLogger logger = Utils.getLogger(HostTrackImpl.class);
 
     private Map<String, Tracker> trackers = new HashMap<>();
+    private static boolean alwaysStartRightNow = false;
 
     @Autowired
     private DatabaseFacade dbf;
@@ -241,7 +242,7 @@ public void trackHost(String hostUuid) {
         t = new Tracker(hostUuid);
         trackers.put(hostUuid, t);
 
-        if (CoreGlobalProperty.UNIT_TEST_ON) {
+        if (CoreGlobalProperty.UNIT_TEST_ON && !alwaysStartRightNow) {
             t.start();
         } else {
             t.startRightNow();

core/src/main/java/org/zstack/core/thread/AsyncTimer.java

@@ -63,7 +63,7 @@ public void startRightNow() {
             throw new CloudRuntimeException("cannot start a cancelled timer");
         }
 
-        cancel = thdf.submitTimeoutTask(this, getTimeUnit(), getPeriod(), true);
+        cancel = thdf.submitTimeoutTask(this, getTimeUnit(), 0);
         if (logger.isTraceEnabled()) {
             logger.trace(String.format("%s starts", getName()));
         }

core/src/main/java/org/zstack/core/thread/ThreadFacade.java

@@ -43,8 +43,6 @@ public interface ThreadFacade extends Component {
 
     ThreadFacadeImpl.TimeoutTaskReceipt submitTimeoutTask(Runnable task, TimeUnit unit, long delay);
 
-    ThreadFacadeImpl.TimeoutTaskReceipt submitTimeoutTask(Runnable task, TimeUnit unit, long delay, boolean executeRightNow);
-
     Runnable submitTimerTask(TimerTask task, TimeUnit unit, long delay);
 
     int getSyncThreadNum(int totalThreadNum);

core/src/main/java/org/zstack/core/thread/ThreadFacadeImpl.java

@@ -259,12 +259,7 @@ public interface TimeoutTaskReceipt {
     }
 
     @Override
-    public TimeoutTaskReceipt submitTimeoutTask(final Runnable task, TimeUnit unit, long delay) {
-        return submitTimeoutTask(task, unit, delay, false);
-    }
-
-    @Override
-    public TimeoutTaskReceipt submitTimeoutTask(Runnable task, TimeUnit unit, long delay, boolean executeRightNow) {
+    public TimeoutTaskReceipt submitTimeoutTask(Runnable task, TimeUnit unit, long delay) {
         final TimerWrapper timer = timerPool.getTimer();
 
         class TimerTaskWorker extends java.util.TimerTask implements TimeoutTaskReceipt {
@@ -290,21 +285,9 @@ public boolean cancel() {
 
         TimerTaskWorker worker = new TimerTaskWorker();
         timer.schedule(worker, unit.toMillis(delay));
-        if (executeRightNow) {
-            executeRightNow(task);
-        }
         return worker;
     }
 
-    @AsyncThread
-    private void executeRightNow(final Runnable task) {
-        try {
-            task.run();
-        } catch (Throwable t) {
-            _logger.warn(String.format("Unhandled exception happened when running %s", task.getClass().getName()), t);
-        }
-    }
-
     @Override
     public Runnable submitTimerTask(final TimerTask task, TimeUnit unit, long delay) {
         final TimerWrapper timer = timerPool.getTimer();

test/src/test/groovy/org/zstack/test/integration/core/AsyncTimerCase.groovy

@@ -45,6 +45,31 @@ class AsyncTimerCase extends SubCase {
         assert total == count
     }
 
+    void testStartRightNow() {
+        int count = 0
+        int total = 3
+
+        def timer = new AsyncTimer(TimeUnit.MILLISECONDS, 100L) {
+            @Override
+            protected void execute() {
+                count ++
+                if (count < total) {
+                    continueToRunThisTimer()
+                }
+            }
+        }
+
+        timer.startRightNow()
+
+        TimeUnit.MILLISECONDS.sleep((total - 1) * 100)
+        retryInSecs {
+            assert total == count
+        }
+
+        TimeUnit.MILLISECONDS.sleep(2L * 100)
+        assert total == count
+    }
+
     void testCancel() {
         int count = 0
 
@@ -68,6 +93,7 @@ class AsyncTimerCase extends SubCase {
     @Override
     void test() {
         testRun()
+        testStartRightNow()
         testCancel()
     }
 }