Fix for race condition in interval watcher scheduler tests (#115501) (#115567)

Author: lukewhiting

muted-tests.yml

@@ -351,18 +351,6 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/102992
 - class: org.elasticsearch.bootstrap.SpawnerNoBootstrapTests
   issue: https://github.com/elastic/elasticsearch/issues/114555
-- class: org.elasticsearch.xpack.watcher.trigger.schedule.engine.TickerScheduleEngineTests
-  method: testAddWithNoLastCheckedTimeButHasActivationTimeExecutesBeforeInitialInterval
-  issue: https://github.com/elastic/elasticsearch/issues/115339
-- class: org.elasticsearch.xpack.watcher.trigger.schedule.engine.TickerScheduleEngineTests
-  method: testAddWithLastCheckedTimeExecutesBeforeInitialInterval
-  issue: https://github.com/elastic/elasticsearch/issues/115356
-- class: org.elasticsearch.xpack.watcher.trigger.schedule.engine.TickerScheduleEngineTests
-  method: testWatchWithLastCheckedTimeExecutesBeforeInitialInterval
-  issue: https://github.com/elastic/elasticsearch/issues/115354
-- class: org.elasticsearch.xpack.watcher.trigger.schedule.engine.TickerScheduleEngineTests
-  method: testWatchWithNoLastCheckedTimeButHasActivationTimeExecutesBeforeInitialInterval
-  issue: https://github.com/elastic/elasticsearch/issues/115368
 - class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
   method: test {p0=search.vectors/42_knn_search_int4_flat/Vector similarity with filter only}
   issue: https://github.com/elastic/elasticsearch/issues/115475

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleEngineTests.java

@@ -312,14 +312,13 @@ public void testWatchWithLastCheckedTimeExecutesBeforeInitialInterval() throws E
 
         engine.register(events -> {
             for (TriggerEvent ignored : events) {
-                if (runCount.get() == 0) {
+                if (runCount.getAndIncrement() == 0) {
                     logger.info("job first fire");
                     firstLatch.countDown();
                 } else {
                     logger.info("job second fire");
                     secondLatch.countDown();
                 }
-                runCount.incrementAndGet();
             }
         });
 
@@ -375,14 +374,13 @@ public void testWatchWithNoLastCheckedTimeButHasActivationTimeExecutesBeforeInit
 
         engine.register(events -> {
             for (TriggerEvent ignored : events) {
-                if (runCount.get() == 0) {
+                if (runCount.getAndIncrement() == 0) {
                     logger.info("job first fire");
                     firstLatch.countDown();
                 } else {
                     logger.info("job second fire");
                     secondLatch.countDown();
                 }
-                runCount.incrementAndGet();
             }
         });
 
@@ -428,14 +426,13 @@ public void testAddWithLastCheckedTimeExecutesBeforeInitialInterval() throws Exc
 
         engine.register(events -> {
             for (TriggerEvent ignored : events) {
-                if (runCount.get() == 0) {
+                if (runCount.getAndIncrement() == 0) {
                     logger.info("job first fire");
                     firstLatch.countDown();
                 } else {
                     logger.info("job second fire");
                     secondLatch.countDown();
                 }
-                runCount.incrementAndGet();
             }
         });
 
@@ -492,14 +489,13 @@ public void testAddWithNoLastCheckedTimeButHasActivationTimeExecutesBeforeInitia
 
         engine.register(events -> {
             for (TriggerEvent ignored : events) {
-                if (runCount.get() == 0) {
+                if (runCount.getAndIncrement() == 0) {
                     logger.info("job first fire");
                     firstLatch.countDown();
                 } else {
                     logger.info("job second fire");
                     secondLatch.countDown();
                 }
-                runCount.incrementAndGet();
             }
         });