summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoanna Jeremicz <joanna.jeremicz@nokia.com>2019-10-16 14:15:20 +0200
committerJoanna Jeremicz <joanna.jeremicz@nokia.com>2019-10-16 14:15:20 +0200
commit4d3b7fd91bcf316878b8482c7c540e61960198f7 (patch)
tree58903b72d013a8f896d5807a4667192e8fb3ff54
parentfb245c467048eb70b0b9f944c1a64f6f7b55bd4a (diff)
Fix El-alto staging job
- Clean up scheduledTasksRunner after previous integration tests - Prevent race condition Change-Id: I2e112be27d736406b30ccfbfe0f762c164becb6c Issue-ID: DCAEGEN2-1853 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java39
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java12
-rw-r--r--prh-app-server/src/main/resources/application.yaml3
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowSchedulingIntegrationTest.java31
4 files changed, 76 insertions, 9 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java
new file mode 100644
index 00000000..2aa154b2
--- /dev/null
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java
@@ -0,0 +1,39 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PNF-REGISTRATION-HANDLER
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.prh.configuration;
+
+import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties("prh")
+public class PrhProperties {
+ private Duration workflowSchedulingInterval = Duration.ofSeconds(10);
+
+ public Duration getWorkflowSchedulingInterval() {
+ return workflowSchedulingInterval;
+ }
+
+ public void setWorkflowSchedulingInterval(Duration schedulingDelay) {
+ this.workflowSchedulingInterval = schedulingDelay;
+ }
+}
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java
index 25ed262e..70c54a51 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java
@@ -20,11 +20,12 @@
package org.onap.dcaegen2.services.prh.tasks;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
+import javax.annotation.PreDestroy;
+import org.onap.dcaegen2.services.prh.configuration.PrhProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Marker;
@@ -42,17 +43,19 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@Configuration
@EnableScheduling
public class ScheduledTasksRunner {
- private static final int SCHEDULING_DELAY_FOR_PRH_TASKS = 10;
private static final Logger LOGGER = LoggerFactory.getLogger(ScheduledTasksRunner.class);
private static final Marker ENTRY = MarkerFactory.getMarker("ENTRY");
private static volatile List<ScheduledFuture> scheduledPrhTaskFutureList = new ArrayList<>();
private final TaskScheduler taskScheduler;
private final ScheduledTasks scheduledTask;
+ private final PrhProperties prhProperties;
- public ScheduledTasksRunner(TaskScheduler taskScheduler, ScheduledTasks scheduledTask) {
+ public ScheduledTasksRunner(TaskScheduler taskScheduler, ScheduledTasks scheduledTask,
+ PrhProperties prhProperties) {
this.taskScheduler = taskScheduler;
this.scheduledTask = scheduledTask;
+ this.prhProperties = prhProperties;
}
@EventListener
@@ -63,6 +66,7 @@ public class ScheduledTasksRunner {
/**
* Function which have to stop tasks execution.
*/
+ @PreDestroy
public synchronized void cancelTasks() {
scheduledPrhTaskFutureList.forEach(x -> x.cancel(false));
scheduledPrhTaskFutureList.clear();
@@ -78,7 +82,7 @@ public class ScheduledTasksRunner {
if (scheduledPrhTaskFutureList.isEmpty()) {
scheduledPrhTaskFutureList.add(taskScheduler
.scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask,
- Duration.ofSeconds(SCHEDULING_DELAY_FOR_PRH_TASKS)));
+ prhProperties.getWorkflowSchedulingInterval()));
return true;
} else {
return false;
diff --git a/prh-app-server/src/main/resources/application.yaml b/prh-app-server/src/main/resources/application.yaml
index 2d244887..983cf81b 100644
--- a/prh-app-server/src/main/resources/application.yaml
+++ b/prh-app-server/src/main/resources/application.yaml
@@ -22,4 +22,5 @@ logging:
management.endpoints.web.exposure.include: "*"
-
+prh:
+ workflow-scheduling-interval: 10s
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowSchedulingIntegrationTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowSchedulingIntegrationTest.java
index 44dcabfa..fffab218 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowSchedulingIntegrationTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowSchedulingIntegrationTest.java
@@ -20,22 +20,45 @@
package org.onap.dcaegen2.services.prh.integration;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.doAnswer;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;
+import org.mockito.stubbing.Answer;
import org.onap.dcaegen2.services.prh.tasks.ScheduledTasks;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-
-import static org.mockito.Mockito.verify;
+import org.springframework.test.context.TestPropertySource;
@SpringBootTest
+@TestPropertySource(properties = {"prh.workflow-scheduling-interval=20ms"})
class PrhWorkflowSchedulingIntegrationTest {
+ private static final int EXPECTED_INVOCATIONS_NUMBER = 1;
+ private static final int REMAINING_INVOCATIONS_NUMBER = 0;
@MockBean
private ScheduledTasks scheduledTasks;
+ private CountDownLatch invocationLatch;
@Test
- void prhWorkflowShouldBeExecutedRightAfterApplicationStart() {
- verify(scheduledTasks).scheduleMainPrhEventTask();
+ void prhWorkflowShouldBeExecutedRightAfterApplicationStart() throws InterruptedException {
+ invocationLatch = new CountDownLatch(EXPECTED_INVOCATIONS_NUMBER);
+ doAnswer(registerInvocation(invocationLatch)).when(scheduledTasks).scheduleMainPrhEventTask();
+ assertThatMethodWasInvokedOnce();
+ }
+
+ private void assertThatMethodWasInvokedOnce() throws InterruptedException {
+ invocationLatch.await(1, TimeUnit.SECONDS);
+ assertEquals(REMAINING_INVOCATIONS_NUMBER, invocationLatch.getCount());
+ }
+
+ private static Answer registerInvocation(CountDownLatch invocationLatch) {
+ return invocation -> {
+ invocationLatch.countDown();
+ return null;
+ };
}
} \ No newline at end of file