From a07ea7cc1f8b8673afbd31f4cfdcda2d6c8e8c2b Mon Sep 17 00:00:00 2001 From: pkaras Date: Thu, 15 Nov 2018 09:15:49 +0100 Subject: Cycle between configuration & tasks removed Change-Id: Ida3b77ab3f3d197d8ca0bf81f344801df46e6627 Issue-ID: DCAEGEN2-974 Signed-off-by: piotr.karas --- .../prh/configuration/CloudConfiguration.java | 2 +- .../prh/configuration/SchedulerConfig.java | 107 -------------------- .../prh/controllers/ScheduleController.java | 12 +-- .../services/prh/tasks/ScheduledTasksRunner.java | 108 +++++++++++++++++++++ 4 files changed, 115 insertions(+), 114 deletions(-) delete mode 100644 prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java create mode 100644 prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java index 1e1e0491..c9667ed6 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java @@ -65,7 +65,7 @@ public class CloudConfiguration extends AppConfig { this.prhConfigurationProvider = prhConfigurationProvider; } - protected void runTask() { + public void runTask() { Flux.defer(() -> EnvironmentProcessor.evaluate(systemEnvironment)) .subscribeOn(Schedulers.parallel()) .subscribe(this::parsingConfigSuccess, this::parsingConfigError); diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java deleted file mode 100644 index 76ba5ec6..00000000 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 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 io.swagger.annotations.ApiOperation; -import java.time.Duration; -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ScheduledFuture; -import javax.annotation.PostConstruct; -import org.onap.dcaegen2.services.prh.tasks.ScheduledTasks; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.scheduling.TaskScheduler; -import org.springframework.scheduling.annotation.EnableScheduling; -import reactor.core.publisher.Mono; - - -/** - * @author Przemysław Wąsala on 6/13/18 - */ -@Configuration -@EnableScheduling -public class SchedulerConfig { - - private static final int SCHEDULING_DELAY_FOR_PRH_TASKS = 10; - private static final int SCHEDULING_REQUEST_FOR_CONFIGURATION_DELAY = 5; - private static final Logger LOGGER = LoggerFactory.getLogger(SchedulerConfig.class); - private static final Marker ENTRY = MarkerFactory.getMarker("ENTRY"); - private static volatile List scheduledPrhTaskFutureList = new ArrayList<>(); - - private final TaskScheduler taskScheduler; - private final ScheduledTasks scheduledTask; - private final CloudConfiguration cloudConfiguration; - - @Autowired - public SchedulerConfig(TaskScheduler taskScheduler, - ScheduledTasks scheduledTask, - CloudConfiguration cloudConfiguration) { - this.taskScheduler = taskScheduler; - this.scheduledTask = scheduledTask; - this.cloudConfiguration = cloudConfiguration; - } - - /** - * Function which have to stop tasks execution. - * - * @return response entity about status of cancellation operation - */ - @ApiOperation(value = "Get response on stopping task execution") - public synchronized Mono> getResponseFromCancellationOfTasks() { - scheduledPrhTaskFutureList.forEach(x -> x.cancel(false)); - scheduledPrhTaskFutureList.clear(); - return Mono.defer(() -> - Mono.just(new ResponseEntity<>("PRH Service has already been stopped!", HttpStatus.CREATED)) - ); - } - - /** - * Function for starting scheduling PRH workflow. - * - * @return status of operation execution: true - started, false - not started - */ - - @PostConstruct - @ApiOperation(value = "Start task if possible") - public synchronized boolean tryToStartTask() { - LOGGER.info(ENTRY, "Start scheduling PRH workflow"); - if (scheduledPrhTaskFutureList.isEmpty()) { - scheduledPrhTaskFutureList.add(taskScheduler - .scheduleAtFixedRate(cloudConfiguration::runTask, Instant.now(), - Duration.ofMinutes(SCHEDULING_REQUEST_FOR_CONFIGURATION_DELAY))); - scheduledPrhTaskFutureList.add(taskScheduler - .scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask, - Duration.ofSeconds(SCHEDULING_DELAY_FOR_PRH_TASKS))); - return true; - } else { - return false; - } - } - -} diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java index 9386b9e8..aa913654 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java @@ -22,7 +22,7 @@ package org.onap.dcaegen2.services.prh.controllers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.onap.dcaegen2.services.prh.configuration.SchedulerConfig; +import org.onap.dcaegen2.services.prh.tasks.ScheduledTasksRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,25 +42,25 @@ public class ScheduleController { private static final Logger LOGGER = LoggerFactory.getLogger(ScheduleController.class); - private final SchedulerConfig schedulerConfig; + private final ScheduledTasksRunner scheduledTasksRunner; @Autowired - public ScheduleController(SchedulerConfig schedulerConfig) { - this.schedulerConfig = schedulerConfig; + public ScheduleController(ScheduledTasksRunner scheduledTasksRunner) { + this.scheduledTasksRunner = scheduledTasksRunner; } @RequestMapping(value = "start", method = RequestMethod.GET) @ApiOperation(value = "Start scheduling worker request") public Mono> startTasks() { LOGGER.trace("Receiving start scheduling worker request"); - return Mono.fromSupplier(schedulerConfig::tryToStartTask).map(this::createStartTaskResponse); + return Mono.fromSupplier(scheduledTasksRunner::tryToStartTask).map(this::createStartTaskResponse); } @RequestMapping(value = "stopPrh", method = RequestMethod.GET) @ApiOperation(value = "Receiving stop scheduling worker request") public Mono> stopTask() { LOGGER.trace("Receiving stop scheduling worker request"); - return schedulerConfig.getResponseFromCancellationOfTasks(); + return scheduledTasksRunner.getResponseFromCancellationOfTasks(); } @ApiOperation(value = "Sends success or error response on starting task execution") 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 new file mode 100644 index 00000000..956ffead --- /dev/null +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java @@ -0,0 +1,108 @@ +/* + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 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.tasks; + +import io.swagger.annotations.ApiOperation; +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ScheduledFuture; +import javax.annotation.PostConstruct; + +import org.onap.dcaegen2.services.prh.configuration.CloudConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.scheduling.TaskScheduler; +import org.springframework.scheduling.annotation.EnableScheduling; +import reactor.core.publisher.Mono; + + +/** + * @author Przemysław Wąsala on 6/13/18 + */ +@Configuration +@EnableScheduling +public class ScheduledTasksRunner { + + private static final int SCHEDULING_DELAY_FOR_PRH_TASKS = 10; + private static final int SCHEDULING_REQUEST_FOR_CONFIGURATION_DELAY = 5; + private static final Logger LOGGER = LoggerFactory.getLogger(ScheduledTasksRunner.class); + private static final Marker ENTRY = MarkerFactory.getMarker("ENTRY"); + private static volatile List scheduledPrhTaskFutureList = new ArrayList<>(); + + private final TaskScheduler taskScheduler; + private final ScheduledTasks scheduledTask; + private final CloudConfiguration cloudConfiguration; + + @Autowired + public ScheduledTasksRunner(TaskScheduler taskScheduler, + ScheduledTasks scheduledTask, + CloudConfiguration cloudConfiguration) { + this.taskScheduler = taskScheduler; + this.scheduledTask = scheduledTask; + this.cloudConfiguration = cloudConfiguration; + } + + /** + * Function which have to stop tasks execution. + * + * @return response entity about status of cancellation operation + */ + @ApiOperation(value = "Get response on stopping task execution") + public synchronized Mono> getResponseFromCancellationOfTasks() { + scheduledPrhTaskFutureList.forEach(x -> x.cancel(false)); + scheduledPrhTaskFutureList.clear(); + return Mono.defer(() -> + Mono.just(new ResponseEntity<>("PRH Service has already been stopped!", HttpStatus.CREATED)) + ); + } + + /** + * Function for starting scheduling PRH workflow. + * + * @return status of operation execution: true - started, false - not started + */ + + @PostConstruct + @ApiOperation(value = "Start task if possible") + public synchronized boolean tryToStartTask() { + LOGGER.info(ENTRY, "Start scheduling PRH workflow"); + if (scheduledPrhTaskFutureList.isEmpty()) { + scheduledPrhTaskFutureList.add(taskScheduler + .scheduleAtFixedRate(cloudConfiguration::runTask, Instant.now(), + Duration.ofMinutes(SCHEDULING_REQUEST_FOR_CONFIGURATION_DELAY))); + scheduledPrhTaskFutureList.add(taskScheduler + .scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask, + Duration.ofSeconds(SCHEDULING_DELAY_FOR_PRH_TASKS))); + return true; + } else { + return false; + } + } + +} -- cgit 1.2.3-korg