gCubeSystem
/
smart-executor
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged from private branch for release 4.1.0 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@131611 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-09-22 09:31:05 +00:00
parent c57302c47c
commit 27b86ffb5c
29 changed files with 583 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.checkstyle Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<fileset name="all" enabled="true" check-config-name="gCube Configuration" local="false">
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
</fileset-config>

5
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
<installed facet="jst.web" version="3.1"/> <installed facet="jst.web" version="3.0"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project> </faceted-project>

2
distro/descriptor.xml
View File

@ -24,7 +24,7 @@
</fileSets> </fileSets>
<files> <files>
<file> <file>
<source>target/${build.finalName}.jar</source> <source>target/${build.finalName}.war</source>
<outputDirectory>/${artifactId}</outputDirectory> <outputDirectory>/${artifactId}</outputDirectory>
</file> </file>
</files> </files>

11
distro/gcube-handlers.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<handlers>
<lifecycle>
<profile-management />
<plugin-registration-handler />
</lifecycle>
<request>
<request-validation />
<request-accounting />
</request>
</handlers>

70
pom.xml
View File

@ -31,6 +31,13 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>LATEST</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>maven-smartgears-bom</artifactId> <artifactId>maven-smartgears-bom</artifactId>
@ -42,6 +49,16 @@
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.resources.discovery</groupId>
<artifactId>discovery-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
@ -50,56 +67,55 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-smartgears-app</artifactId> <artifactId>common-encryption</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.resources</groupId>
<artifactId>common-gcore-resources</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-encryption</artifactId> <artifactId>common-smartgears-app</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.gcube.common</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>authorization-client</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.gcube.common</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>common-authorization</artifactId>
<version>[3.0.0, 4.0.0)</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.vremanagement</groupId> <groupId>org.gcube.vremanagement</groupId>
<artifactId>smart-executor-api</artifactId> <artifactId>smart-executor-api</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>[3.0.1, 4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.sun.xml.ws</groupId> <groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId> <artifactId>jaxws-rt</artifactId>
<version>2.1.7</version> <version>2.1.7</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20090211</version> <version>20090211</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<!-- CouchDB libraries --> <!-- CouchDB libraries -->
<dependency> <dependency>
<groupId>org.ektorp</groupId> <groupId>org.ektorp</groupId>
@ -123,16 +139,11 @@
<version>4.11</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.acme</groupId> <groupId>org.acme</groupId>
<artifactId>HelloWorldPlugin</artifactId> <artifactId>HelloWorldPlugin</artifactId>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -168,7 +179,8 @@
<version>2.6</version> <version>2.6</version>
<configuration> <configuration>
<warName>smart-executor</warName> <warName>smart-executor</warName>
<webXml>src\main\webapp\WEB-INF\web.xml</webXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<!-- webXml>src\main\webapp\WEB-INF\web.xml</webXml -->
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

92
src/main/java/org/gcube/vremanagement/executor/SmartExecutorImpl.java
View File

@ -4,7 +4,7 @@ import java.util.UUID;
import javax.jws.WebService; import javax.jws.WebService;
import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.smartgears.annotations.ManagedBy;
import org.gcube.vremanagement.executor.api.SmartExecutor; import org.gcube.vremanagement.executor.api.SmartExecutor;
import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.exception.ExecutorException; import org.gcube.vremanagement.executor.exception.ExecutorException;
@ -17,6 +17,7 @@ import org.gcube.vremanagement.executor.exception.SchedulerNotFoundException;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory;
import org.gcube.vremanagement.executor.plugin.PluginState; import org.gcube.vremanagement.executor.plugin.PluginState;
import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
import org.gcube.vremanagement.executor.scheduler.SmartExecutorScheduler; import org.gcube.vremanagement.executor.scheduler.SmartExecutorScheduler;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -31,6 +32,7 @@ portName = "SmartExecutorPort",
serviceName = SmartExecutor.WEB_SERVICE_SERVICE_NAME, serviceName = SmartExecutor.WEB_SERVICE_SERVICE_NAME,
targetNamespace = SmartExecutor.TARGET_NAMESPACE, targetNamespace = SmartExecutor.TARGET_NAMESPACE,
endpointInterface = "org.gcube.vremanagement.executor.api.SmartExecutor" ) endpointInterface = "org.gcube.vremanagement.executor.api.SmartExecutor" )
@ManagedBy(SmartExecutorInitializator.class)
public class SmartExecutorImpl implements SmartExecutor { public class SmartExecutorImpl implements SmartExecutor {
/** /**
@ -38,23 +40,19 @@ public class SmartExecutorImpl implements SmartExecutor {
*/ */
private static Logger logger = LoggerFactory.getLogger(SmartExecutorImpl.class); private static Logger logger = LoggerFactory.getLogger(SmartExecutorImpl.class);
protected static ApplicationContext ctx;
/**
* @return the ctx
*/
public static ApplicationContext getCtx() {
return ctx;
}
/**{@inheritDoc}*/ /**{@inheritDoc}*/
@Override @Override
public String launch(LaunchParameter parameter) throws InputsNullException, public String launch(LaunchParameter parameter) throws InputsNullException,
PluginNotFoundException, LaunchException, ExecutorException { PluginNotFoundException, LaunchException, ExecutorException {
logger.info("Launch requested {}", parameter);
SmartExecutorScheduler smartExecutorScheduler = SmartExecutorScheduler.getInstance(); SmartExecutorScheduler smartExecutorScheduler = SmartExecutorScheduler.getInstance();
UUID uuid = smartExecutorScheduler.schedule(parameter); UUID uuid = smartExecutorScheduler.schedule(parameter);
logger.debug(String.format("The Plugin named %s with UUID %s has been launched with the provided inputs", parameter.getPluginName(), uuid)); logger.info(
String.format(
"The Plugin named %s with UUID %s has been launched %s",
parameter.getPluginName(), uuid.toString(), parameter));
return uuid.toString(); return uuid.toString();
} }
@ -62,20 +60,21 @@ public class SmartExecutorImpl implements SmartExecutor {
/**{@inheritDoc}*/ /**{@inheritDoc}*/
@Override @Override
public boolean stop(String executionIdentifier) throws ExecutorException { public boolean stop(String executionIdentifier) throws ExecutorException {
return unSchedule(executionIdentifier, true, false); logger.info("Stop requested for {}", executionIdentifier);
} boolean ret = unSchedule(executionIdentifier, true, false);
logger.info("{} was{} stopped succesfully", executionIdentifier, ret? "" : " not");
/**{@inheritDoc}*/ return ret;
@Override
public boolean unSchedule(String executionIdentifier) throws ExecutorException {
return unSchedule(executionIdentifier, false, false);
} }
/**{@inheritDoc}*/ /**{@inheritDoc}*/
@Override @Override
public boolean unSchedule(String executionIdentifier, boolean globally) public boolean unSchedule(String executionIdentifier, boolean globally)
throws ExecutorException { throws ExecutorException {
return unSchedule(executionIdentifier, false, globally); logger.info("UnSchedule requested for {} globally : {}",
executionIdentifier, globally);
boolean ret = unSchedule(executionIdentifier, false, globally);
logger.info("{} was{} unscheduled {} succesfully", executionIdentifier, ret? "" : " not", globally? "globally": "locally");
return ret;
} }
// TODO Manage better exception to to advise the caller // TODO Manage better exception to to advise the caller
@ -85,41 +84,70 @@ public class SmartExecutorImpl implements SmartExecutor {
SmartExecutorScheduler smartExecutorScheduler = SmartExecutorScheduler.getInstance(); SmartExecutorScheduler smartExecutorScheduler = SmartExecutorScheduler.getInstance();
UUID uuid = UUID.fromString(executionIdentifier); UUID uuid = UUID.fromString(executionIdentifier);
smartExecutorScheduler.stop(uuid, stopOnly, globally); smartExecutorScheduler.stop(uuid, stopOnly, globally);
} catch (SchedulerNotFoundException snfe) { } catch (SchedulerNotFoundException e) {
currentStopped = true; // currentStopped = true;
logger.error("Error unscheduling task {}", executionIdentifier, snfe);
} catch(SchedulerException e){
currentStopped = false;
logger.error("Error unscheduling task {}", executionIdentifier, e); logger.error("Error unscheduling task {}", executionIdentifier, e);
} catch(SchedulePersistenceException ex){ throw new ExecutorException(e);
currentStopped = true; } catch(SchedulerException e){
logger.error("Error removing scheduled task from persistence.", ex); // currentStopped = false;
logger.error("Error unscheduling task {}", executionIdentifier, e);
throw new ExecutorException(e);
} catch(SchedulePersistenceException e){
// currentStopped = true;
logger.error("Error removing scheduled task from persistence.", e);
} catch (Exception e) {
// currentStopped = false;
logger.error("Error unscheduling task {}", executionIdentifier, e);
throw new ExecutorException(e);
} }
return currentStopped; return currentStopped;
} }
/**{@inheritDoc}*/ /**{@inheritDoc}*/
@Override @Override
public PluginState getState(String executionIdentifier) @Deprecated
public PluginState getState(String executionIdentifier)
throws PluginInstanceNotFoundException, ExecutorException { throws PluginInstanceNotFoundException, ExecutorException {
return getStateEvolution(executionIdentifier).getPluginState();
}
/**{@inheritDoc}*/
@Override
public PluginStateEvolution getStateEvolution(String executionIdentifier)
throws PluginInstanceNotFoundException, ExecutorException {
logger.info("getStateEvolution() requested for {}", executionIdentifier);
try { try {
SmartExecutorPersistenceConnector persistenceConnector = SmartExecutorPersistenceFactory.getPersistenceConnector(); SmartExecutorPersistenceConnector persistenceConnector = SmartExecutorPersistenceFactory.getPersistenceConnector();
return persistenceConnector.getLastPluginInstanceState(UUID.fromString(executionIdentifier)); PluginStateEvolution pluginStateEvolution = persistenceConnector.getLastPluginInstanceState(UUID.fromString(executionIdentifier));
logger.info("getState() for {} is : {}", executionIdentifier, pluginStateEvolution);
return pluginStateEvolution;
} catch (Exception e) { } catch (Exception e) {
throw new PluginInstanceNotFoundException(); throw new PluginInstanceNotFoundException(e);
} }
} }
/**{@inheritDoc}*/ /**{@inheritDoc}*/
@Override @Override
@Deprecated
public PluginState getIterationState(String executionIdentifier, int iterationNumber) public PluginState getIterationState(String executionIdentifier, int iterationNumber)
throws PluginInstanceNotFoundException, ExecutorException { throws PluginInstanceNotFoundException, ExecutorException {
return getIterationStateEvolution(executionIdentifier, iterationNumber).getPluginState();
}
/**{@inheritDoc}*/
@Override
public PluginStateEvolution getIterationStateEvolution(String executionIdentifier, int iterationNumber)
throws PluginInstanceNotFoundException, ExecutorException {
logger.info("getIterationStateEvolution() requested for {} (iteration n. {})", executionIdentifier, iterationNumber);
try { try {
SmartExecutorPersistenceConnector persistenceConnector = SmartExecutorPersistenceFactory.getPersistenceConnector(); SmartExecutorPersistenceConnector persistenceConnector = SmartExecutorPersistenceFactory.getPersistenceConnector();
return persistenceConnector.getPluginInstanceState(UUID.fromString(executionIdentifier), iterationNumber); PluginStateEvolution pluginStateEvolution = persistenceConnector.getPluginInstanceState(UUID.fromString(executionIdentifier), iterationNumber);
logger.info("getIterationState() for {} (iteration n. {}) is : {}", executionIdentifier, iterationNumber, pluginStateEvolution);
return pluginStateEvolution;
} catch (Exception e) { } catch (Exception e) {
throw new PluginInstanceNotFoundException(); throw new PluginInstanceNotFoundException(e);
} }
} }
} }

220
src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java
View File

@ -1,22 +1,14 @@
/**
*
*/
package org.gcube.vremanagement.executor; package org.gcube.vremanagement.executor;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import javax.xml.bind.annotation.XmlRootElement; import org.gcube.common.authorization.client.Constants;
import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.resources.gcore.Resource; import org.gcube.common.resources.gcore.Resource;
import org.gcube.common.resources.gcore.Resources; import org.gcube.common.resources.gcore.Resources;
import org.gcube.common.resources.gcore.ScopeGroup;
import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.Profile; import org.gcube.common.resources.gcore.ServiceEndpoint.Profile;
@ -25,17 +17,15 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Runtime;
import org.gcube.common.resources.gcore.common.Platform; import org.gcube.common.resources.gcore.common.Platform;
import org.gcube.common.resources.gcore.utils.Group; import org.gcube.common.resources.gcore.utils.Group;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.informationsystem.publisher.AdvancedScopedPublisher; import org.gcube.informationsystem.publisher.RegistryPublisher;
import org.gcube.informationsystem.publisher.RegistryPublisherFactory; import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
import org.gcube.informationsystem.publisher.ScopedPublisher;
import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException; import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException;
import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
import org.gcube.resources.discovery.icclient.ICFactory; import org.gcube.resources.discovery.icclient.ICFactory;
import org.gcube.smartgears.ApplicationManager;
import org.gcube.smartgears.ContextProvider;
import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.configuration.container.ContainerConfiguration;
import org.gcube.smartgears.context.application.ApplicationContext;
import org.gcube.smartgears.handlers.application.ApplicationLifecycleEvent;
import org.gcube.smartgears.handlers.application.ApplicationLifecycleHandler;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory;
import org.gcube.vremanagement.executor.plugin.PluginDeclaration; import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
@ -48,8 +38,7 @@ import org.slf4j.LoggerFactory;
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
* *
*/ */
@XmlRootElement(name = "plugin-registration-handler") public class SmartExecutorInitializator implements ApplicationManager {
public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
/** /**
* Logger * Logger
@ -58,38 +47,15 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
public static final long JOIN_TIMEOUT = 1000; public static final long JOIN_TIMEOUT = 1000;
/* * public static String getScopeFromToken(){
* Contains the ServiceEnpoint Resource to be published/unpublished on IS String token = SecurityTokenProvider.instance.get();
* / AuthorizationEntry authorizationEntry;
private static ServiceEndpoint serviceEndpoint; try {
*/ authorizationEntry = Constants.authorizationService().get(token);
} catch (Exception e) {
/* * return ScopeProvider.instance.get();
* The application context }
* / return authorizationEntry.getContext();
protected static ApplicationContext ctx;
/**
* @return the ctx
* /
public static ApplicationContext getCtx() {
return ctx;
}
*/
/*
protected static ScheduledTaskConfiguration launchConfiguration;
/**
* @return the configuredTasks
* /
public static ScheduledTaskConfiguration getConfiguredTasks() {
return launchConfiguration;
}
*/
public static String getCurrentScope(){
return ScopeProvider.instance.get();
} }
/** /**
@ -99,15 +65,16 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
* @throws RegistryNotFoundException if the Registry is not found so the * @throws RegistryNotFoundException if the Registry is not found so the
* resource has not be published * resource has not be published
*/ */
private static void publishScopedResource(Resource resource, List<String> scopes) throws RegistryNotFoundException, Exception { private static void publishResource(Resource resource) throws Exception {
StringWriter stringWriter = new StringWriter(); StringWriter stringWriter = new StringWriter();
Resources.marshal(resource, stringWriter); Resources.marshal(resource, stringWriter);
ScopedPublisher scopedPublisher = RegistryPublisherFactory.scopedPublisher(); RegistryPublisher registryPublisher = RegistryPublisherFactory.create();
try { try {
logger.debug("Trying to publish to {}:\n{}", scopes, stringWriter); logger.debug("Trying to publish to {}:\n{}", getScopeFromToken(), stringWriter);
scopedPublisher.create(resource, scopes); registryPublisher.create(resource);
} catch (RegistryNotFoundException e) { } catch (Exception e) {
logger.error("The resource was not published", e); logger.error("The resource was not published", e);
throw e; throw e;
} }
@ -119,18 +86,16 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
* @throws RegistryNotFoundException if the Registry is not found so the * @throws RegistryNotFoundException if the Registry is not found so the
* resource has not be published * resource has not be published
*/ */
private static void unPublishScopedResource(Resource resource) throws RegistryNotFoundException, Exception { private static void unPublishResource(Resource resource) throws Exception {
//StringWriter stringWriter = new StringWriter(); //StringWriter stringWriter = new StringWriter();
//Resources.marshal(resource, stringWriter); //Resources.marshal(resource, stringWriter);
ScopedPublisher scopedPublisher = RegistryPublisherFactory.scopedPublisher(); RegistryPublisher registryPublisher = RegistryPublisherFactory.create();
AdvancedScopedPublisher advancedScopedPublisher = new AdvancedScopedPublisher(scopedPublisher);
String id = resource.id(); String id = resource.id();
logger.debug("Trying to remove {} with ID {} from {}", resource.getClass().getSimpleName(), id, ScopeProvider.instance.get()); logger.debug("Trying to remove {} with ID {} from {}", resource.getClass().getSimpleName(), id, getScopeFromToken());
//scopedPublisher.remove(resource, scopes); registryPublisher.remove(resource);
advancedScopedPublisher.forceRemove(resource);
logger.debug("{} with ID {} removed successfully", resource.getClass().getSimpleName(), id); logger.debug("{} with ID {} removed successfully", resource.getClass().getSimpleName(), id);
} }
@ -192,13 +157,13 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
logger.debug("Creating ServiceEndpoint to publish on IS available plugins and their own supported capabilities"); logger.debug("Creating ServiceEndpoint to publish on IS available plugins and their own supported capabilities");
ServiceEndpoint serviceEndpoint = new ServiceEndpoint(); ServiceEndpoint serviceEndpoint = new ServiceEndpoint();
Profile profile = serviceEndpoint.newProfile(); Profile profile = serviceEndpoint.newProfile();
profile.category(SmartExecutorImpl.ctx.configuration().serviceClass()); profile.category(ContextProvider.get().configuration().serviceClass());
profile.name(SmartExecutorImpl.ctx.configuration().name()); profile.name(ContextProvider.get().configuration().name());
String version = SmartExecutorImpl.ctx.configuration().version(); String version = ContextProvider.get().configuration().version();
profile.version(version); profile.version(version);
profile.description(SmartExecutorImpl.ctx.configuration().description()); profile.description(ContextProvider.get().configuration().description());
String runningOn = getRunningOn(SmartExecutorImpl.ctx.container().configuration()); String runningOn = getRunningOn(ContextProvider.get().container().configuration());
Platform platform = profile.newPlatform(); Platform platform = profile.newPlatform();
platform.name(runningOn); platform.name(runningOn);
@ -210,7 +175,7 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
Runtime runtime = profile.newRuntime(); Runtime runtime = profile.newRuntime();
runtime.hostedOn(runningOn); runtime.hostedOn(runningOn);
runtime.status(SmartExecutorImpl.ctx.configuration().mode().toString()); runtime.status(ContextProvider.get().configuration().mode().toString());
Group<AccessPoint> accessPoints = profile.accessPoints(); Group<AccessPoint> accessPoints = profile.accessPoints();
Map<String, PluginDeclaration> availablePlugins = pluginManager.getAvailablePlugins(); Map<String, PluginDeclaration> availablePlugins = pluginManager.getAvailablePlugins();
@ -245,34 +210,12 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
return serviceEndpoint; return serviceEndpoint;
} }
public static List<String> getScopes(ApplicationContext applicationContext){ private void cleanServiceEndpoints(){
Collection<String> scopes;
ScopeGroup<String> scopeGroup = applicationContext.profile(GCoreEndpoint.class).scopes();
if(scopeGroup==null || scopeGroup.isEmpty()){
Set<String> applicationScopes = applicationContext.configuration().startScopes();
Set<String> containerScopes = applicationContext.container().configuration().startScopes();
if(applicationScopes==null || applicationScopes.isEmpty()){
scopes = containerScopes;
logger.debug("Application Scopes ({}). The Container Scopes ({}) will be used.", applicationScopes, scopes);
} else{
logger.debug("Container Scopes ({}). Application Scopes ({}) will be used.", containerScopes, applicationScopes);
scopes = new HashSet<String>(applicationScopes);
}
}else {
scopes = scopeGroup.asCollection();
}
return new ArrayList<String>(scopes);
}
private void cleanServiceEndpoints(String scope){
try { try {
SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class) SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class)
.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", SmartExecutorImpl.ctx.configuration().serviceClass())) .addCondition(String.format("$resource/Profile/Category/text() eq '%s'", ContextProvider.get().configuration().serviceClass()))
.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", SmartExecutorImpl.ctx.configuration().name())) .addCondition(String.format("$resource/Profile/Name/text() eq '%s'", ContextProvider.get().configuration().name()))
.addCondition(String.format("$resource/Profile/RunTime/HostedOn/text() eq '%s'", getRunningOn(SmartExecutorImpl.ctx.container().configuration()))) .addCondition(String.format("$resource/Profile/RunTime/HostedOn/text() eq '%s'", getRunningOn(ContextProvider.get().container().configuration())))
.setResult("$resource"); .setResult("$resource");
DiscoveryClient<ServiceEndpoint> client = ICFactory.clientFor(ServiceEndpoint.class); DiscoveryClient<ServiceEndpoint> client = ICFactory.clientFor(ServiceEndpoint.class);
@ -281,11 +224,11 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
for (ServiceEndpoint serviceEndpoint : serviceEndpoints) { for (ServiceEndpoint serviceEndpoint : serviceEndpoints) {
try { try {
logger.debug("Trying to unpublish the old ServiceEndpoint with ID {} from scope {}", logger.debug("Trying to unpublish the old ServiceEndpoint with ID {} from scope {}",
serviceEndpoint.id(), scope); serviceEndpoint.id(), getScopeFromToken());
unPublishScopedResource(serviceEndpoint); unPublishResource(serviceEndpoint);
} catch(Exception e){ } catch(Exception e){
logger.debug("Exception tryng to unpublish the old ServiceEndpoint with ID {} from scope {}", logger.debug("Exception tryng to unpublish the old ServiceEndpoint with ID {} from scope {}",
serviceEndpoint.id(), scope, e); serviceEndpoint.id(), getScopeFromToken(), e);
} }
} }
}catch(Exception e){ }catch(Exception e){
@ -301,37 +244,31 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
* Furthermore create/connect to DB * Furthermore create/connect to DB
*/ */
@Override @Override
public void onStart(ApplicationLifecycleEvent.Start applicationLifecycleEventStart) { public void onInit() {
String scope = getScopeFromToken();
logger.trace( logger.trace(
"\n-------------------------------------------------------\n" "\n-------------------------------------------------------\n"
+ "Smart Executor is Starting\n" + "Smart Executor is Starting on scope {}\n"
+ "-------------------------------------------------------"); + "-------------------------------------------------------",
scope);
SmartExecutorImpl.ctx = applicationLifecycleEventStart.context();
ServiceEndpoint serviceEndpoint = createServiceEndpoint(); ServiceEndpoint serviceEndpoint = createServiceEndpoint();
// Checking if there are old unpublished ServiceEndpoints related to cleanServiceEndpoints();
// this vHN and trying to unpublish them
List<String> scopes = getScopes(SmartExecutorImpl.ctx);
for(String scope : scopes){
ScopeProvider.instance.set(scope);
cleanServiceEndpoints(scope);
try {
SmartExecutorPersistenceFactory.getPersistenceConnector();
} catch (Exception e) {
logger.error("Unable to isntantiate {} for scope {}",
SmartExecutorPersistenceConnector.class.getSimpleName(), scope, e);
throw new RuntimeException(e);
}
}
// TODO set task that are still on running state on DB to have a clear
// room
try { try {
publishScopedResource(serviceEndpoint, scopes); SmartExecutorPersistenceFactory.getPersistenceConnector(scope);
} catch (Exception e) {
logger.error("Unable to instantiate {} for scope {}",
SmartExecutorPersistenceConnector.class.getSimpleName(), scope, e);
throw new RuntimeException(e);
}
// TODO set task that are still on running state to FAILED state on
// Persistence to clean previous situation of a failure of HostingNode
try {
publishResource(serviceEndpoint);
} catch (RegistryNotFoundException e) { } catch (RegistryNotFoundException e) {
logger.error("Unable to Create ServiceEndpoint. the Service will be aborted", e); logger.error("Unable to Create ServiceEndpoint. the Service will be aborted", e);
return; return;
@ -342,12 +279,10 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
logger.trace( logger.trace(
"\n-------------------------------------------------------\n" "\n-------------------------------------------------------\n"
+ "Smart Executor Started Successfully\n" + "Smart Executor Started Successfully on scope {}\n"
+ "-------------------------------------------------------"); + "-------------------------------------------------------", scope);
// TODO Launch initializer thread
// TODO Launch repetitive thread for global task take over
} }
/** /**
@ -357,31 +292,32 @@ public class SmartExecutorInitializator extends ApplicationLifecycleHandler {
* Furthermore close the connection to DB. * Furthermore close the connection to DB.
*/ */
@Override @Override
public void onStop(ApplicationLifecycleEvent.Stop applicationLifecycleEventStop) { public void onShutdown(){
logger.trace( logger.trace(
"\n-------------------------------------------------------\n" "\n-------------------------------------------------------\n"
+ "Smart Executor is Stopping\n" + "Smart Executor is Stopping on scope {}\n"
+ "-------------------------------------------------------"); + "-------------------------------------------------------",
getScopeFromToken());
SmartExecutorScheduler.getInstance().stopAll(); SmartExecutorScheduler.getInstance().stopAll();
List<String> scopes = getScopes(SmartExecutorImpl.ctx); cleanServiceEndpoints();
try {
for(String scope : scopes){ SmartExecutorPersistenceFactory.getPersistenceConnector().close();
ScopeProvider.instance.set(scope); } catch (Exception e) {
cleanServiceEndpoints(scope); logger.error("Unable to correctly close {} for scope {}",
try { SmartExecutorPersistenceConnector.class.getSimpleName(),
SmartExecutorPersistenceFactory.getPersistenceConnector().close(); getScopeFromToken(), e);
} catch (Exception e) {
logger.error("Unable to correctly close {} for scope {}",
SmartExecutorPersistenceConnector.class.getSimpleName(), scope, e);
}
} }
logger.trace( logger.trace(
"\n-------------------------------------------------------\n" "\n-------------------------------------------------------\n"
+ "Smart Executor Stopped Successfully\n" + "Smart Executor Stopped Successfully on scope {}\n"
+ "-------------------------------------------------------"); + "-------------------------------------------------------",
getScopeFromToken());
} }
} }

46
src/main/java/org/gcube/vremanagement/executor/configuration/OrphanTaskMonitor.java
View File

@ -1,46 +0,0 @@
/**
*
*/
package org.gcube.vremanagement.executor.configuration;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/
public class OrphanTaskMonitor implements Runnable {
private final static Logger logger = LoggerFactory.getLogger(OrphanTaskMonitor.class);
protected final ScheduledExecutorService scheduler;
public final static int INITIAL_DELAY = 1;
public final static int DELAY = 5;
public final static TimeUnit TIME_UNIT = TimeUnit.MINUTES;
public OrphanTaskMonitor(){
this.scheduler = Executors.newScheduledThreadPool(1);
this.scheduler.scheduleAtFixedRate(this, INITIAL_DELAY, DELAY, TimeUnit.MINUTES);
}
protected void check(){
// TODO Insert Code Here
}
/* (non-Javadoc)
* @see java.lang.Runnable#run()
*/
@Override
public void run() {
logger.debug("Looking for orphan task to take in charge");
check();
}
}

3
src/main/java/org/gcube/vremanagement/executor/configuration/ScheduledTaskConfiguration.java
View File

@ -10,9 +10,6 @@ import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.exception.SchedulePersistenceException; import org.gcube.vremanagement.executor.exception.SchedulePersistenceException;
/** /**
* Every implementation MUST take in account to store/query the records
* on the current scope which is not passed as argument but MUST be retrieved
* from thread local
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/ */
public interface ScheduledTaskConfiguration { public interface ScheduledTaskConfiguration {

6
src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/FileScheduledTaskConfiguration.java
View File

@ -13,8 +13,7 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
//import org.gcube.smartgears.ContextProvider; import org.gcube.smartgears.ContextProvider;
import org.gcube.vremanagement.executor.SmartExecutorImpl;
import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.api.types.Scheduling;
import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration; import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration;
@ -45,8 +44,7 @@ public class FileScheduledTaskConfiguration implements ScheduledTaskConfiguratio
public static final String CONFIG_TASK_FILENAME = "definedTasks.json"; public static final String CONFIG_TASK_FILENAME = "definedTasks.json";
public FileScheduledTaskConfiguration() throws Exception { public FileScheduledTaskConfiguration() throws Exception {
this(SmartExecutorImpl.getCtx().persistence().location()); this(ContextProvider.get().persistence().location());
//this(ContextProvider.get().persistence().location());
} }
public FileScheduledTaskConfiguration(String location) throws IOException, JSONException { public FileScheduledTaskConfiguration(String location) throws IOException, JSONException {

12
src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/JSONLaunchParameter.java
View File

@ -48,23 +48,23 @@ public class JSONLaunchParameter extends LaunchParameter {
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs) { public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs) {
super(pluginName, pluginCapabilities, inputs); super(pluginName, pluginCapabilities, inputs);
this.scope = SmartExecutorInitializator.getCurrentScope(); this.scope = SmartExecutorInitializator.getScopeFromToken();
} }
public JSONLaunchParameter(String pluginName, Map<String, Object> inputs, Scheduling scheduling) throws ParseException { public JSONLaunchParameter(String pluginName, Map<String, Object> inputs, Scheduling scheduling) throws ParseException {
super(pluginName, inputs, scheduling); super(pluginName, inputs, scheduling);
this.scope = SmartExecutorInitializator.getCurrentScope(); this.scope = SmartExecutorInitializator.getScopeFromToken();
} }
public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs, Scheduling scheduling) throws ParseException { public JSONLaunchParameter(String pluginName, Map<String, String> pluginCapabilities, Map<String, Object> inputs, Scheduling scheduling) throws ParseException {
super(pluginName, pluginCapabilities, inputs, scheduling); super(pluginName, pluginCapabilities, inputs, scheduling);
this.scope = SmartExecutorInitializator.getCurrentScope(); this.scope = SmartExecutorInitializator.getScopeFromToken();
} }
public JSONLaunchParameter(LaunchParameter parameter) throws ParseException { public JSONLaunchParameter(LaunchParameter parameter) throws ParseException {
super(parameter.getPluginName(), parameter.getPluginCapabilities(), parameter.getInputs(), parameter.getScheduling()); super(parameter.getPluginName(), parameter.getPluginCapabilities(), parameter.getInputs(), parameter.getScheduling());
this.scheduling = new JSONScheduling(parameter.getScheduling()); this.scheduling = new JSONScheduling(parameter.getScheduling());
this.scope = SmartExecutorInitializator.getCurrentScope(); this.scope = SmartExecutorInitializator.getScopeFromToken();
} }
public JSONLaunchParameter(JSONObject jsonObject) throws JSONException, ParseException, ScopeNotMatchException { public JSONLaunchParameter(JSONObject jsonObject) throws JSONException, ParseException, ScopeNotMatchException {
@ -100,7 +100,7 @@ public class JSONLaunchParameter extends LaunchParameter {
this.usedBy = jsonObject.getString(USED_BY); this.usedBy = jsonObject.getString(USED_BY);
} }
this.scope = SmartExecutorInitializator.getCurrentScope(); this.scope = SmartExecutorInitializator.getScopeFromToken();
if(jsonObject.has(SCOPE)){ if(jsonObject.has(SCOPE)){
String jsonScope = jsonObject.getString(SCOPE); String jsonScope = jsonObject.getString(SCOPE);
if(jsonScope.compareTo(scope)!=0){ if(jsonScope.compareTo(scope)!=0){
@ -163,7 +163,7 @@ public class JSONLaunchParameter extends LaunchParameter {
try { try {
return toJSON().toString(); return toJSON().toString();
} catch (JSONException e) { } catch (JSONException e) {
return String.format("{} : {}", this.getClass().getSimpleName(), return String.format("%s : %s", this.getClass().getSimpleName(),
super.toString()); super.toString());
} }
} }

33
src/main/java/org/gcube/vremanagement/executor/exception/InvalidPluginStateEvolutionException.java Normal file
View File

@ -0,0 +1,33 @@
/**
*
*/
package org.gcube.vremanagement.executor.exception;
/**
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*
*/
public class InvalidPluginStateEvolutionException extends Exception {
/**
* Generated Serial Version UID
*/
private static final long serialVersionUID = -7730594422282391883L;
public InvalidPluginStateEvolutionException() {
super();
}
public InvalidPluginStateEvolutionException(String message) {
super(message);
}
public InvalidPluginStateEvolutionException(Throwable throwable){
super(throwable);
}
public InvalidPluginStateEvolutionException(String message, Throwable cause) {
super(message, cause);
}
}

2
src/main/java/org/gcube/vremanagement/executor/persistence/SmartExecutorPersistenceConfiguration.java
View File

@ -126,7 +126,7 @@ public class SmartExecutorPersistenceConfiguration {
List<ServiceEndpoint> serviceEndpoints = client.submit(query); List<ServiceEndpoint> serviceEndpoints = client.submit(query);
if(serviceEndpoints.size()>1){ if(serviceEndpoints.size()>1){
query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Name/text() eq '%s'", TARGET_SCOPE)); query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Name/text() eq '%s'", TARGET_SCOPE));
query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Value/text() eq '%s'", SmartExecutorInitializator.getCurrentScope())); query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Value/text() eq '%s'", SmartExecutorInitializator.getScopeFromToken()));
serviceEndpoints = client.submit(query); serviceEndpoints = client.submit(query);
} }
return serviceEndpoints.get(0); return serviceEndpoints.get(0);

17
src/main/java/org/gcube/vremanagement/executor/persistence/SmartExecutorPersistenceConnector.java
View File

@ -3,22 +3,25 @@
*/ */
package org.gcube.vremanagement.executor.persistence; package org.gcube.vremanagement.executor.persistence;
import java.util.HashMap;
import java.util.UUID; import java.util.UUID;
import org.gcube.vremanagement.executor.plugin.Plugin; import org.gcube.vremanagement.executor.plugin.Plugin;
import org.gcube.vremanagement.executor.plugin.PluginState; import org.gcube.vremanagement.executor.plugin.PluginState;
import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
import org.gcube.vremanagement.executor.plugin.PluginStateNotification; import org.gcube.vremanagement.executor.plugin.PluginStateNotification;
/** /**
* Model the connector which create or open the connection to DB. * Model the connector which create or open the connection to DB.
* Every implementation MUST take in account to store/query the records
* on the current scope which is not passed as argument but MUSt be retrieved
* from thread local.
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/ */
public abstract class SmartExecutorPersistenceConnector implements PluginStateNotification { public abstract class SmartExecutorPersistenceConnector extends PluginStateNotification {
/** public SmartExecutorPersistenceConnector() {
super(new HashMap<String, String>());
}
/**
* Close the connection to DB * Close the connection to DB
* @throws Exception if fails * @throws Exception if fails
*/ */
@ -32,7 +35,7 @@ public abstract class SmartExecutorPersistenceConnector implements PluginStateNo
* @return the actual/last {@link PluginState} of the Plugin * @return the actual/last {@link PluginState} of the Plugin
* @throws Exception if fails * @throws Exception if fails
*/ */
public abstract PluginState getPluginInstanceState(UUID uuid, int iterationNumber) public abstract PluginStateEvolution getPluginInstanceState(UUID uuid, int iterationNumber)
throws Exception; throws Exception;
/** /**
* Retrieve the status of the iterationNumber of the last running/run {@link Plugin} which is/was identified * Retrieve the status of the iterationNumber of the last running/run {@link Plugin} which is/was identified
@ -41,7 +44,7 @@ public abstract class SmartExecutorPersistenceConnector implements PluginStateNo
* @return the actual/last {@link PluginState} of the Plugin * @return the actual/last {@link PluginState} of the Plugin
* @throws Exception if fails * @throws Exception if fails
*/ */
public abstract PluginState getLastPluginInstanceState(UUID uuid) public abstract PluginStateEvolution getLastPluginInstanceState(UUID uuid)
throws Exception; throws Exception;
} }

17
src/main/java/org/gcube/vremanagement/executor/persistence/SmartExecutorPersistenceFactory.java
View File

@ -25,7 +25,7 @@ public abstract class SmartExecutorPersistenceFactory {
persistenceConnectors = new HashMap<String, SmartExecutorPersistenceConnector>(); persistenceConnectors = new HashMap<String, SmartExecutorPersistenceConnector>();
} }
private static SmartExecutorPersistenceConnector getPersistenceConnector(String scope){ public static SmartExecutorPersistenceConnector getPersistenceConnector(String scope){
if(scope==null){ if(scope==null){
String error = "No Scope available."; String error = "No Scope available.";
logger.error(error); logger.error(error);
@ -42,28 +42,31 @@ public abstract class SmartExecutorPersistenceFactory {
* @return the persistenceConnector * @return the persistenceConnector
*/ */
public static synchronized SmartExecutorPersistenceConnector getPersistenceConnector() throws Exception { public static synchronized SmartExecutorPersistenceConnector getPersistenceConnector() throws Exception {
String scope = SmartExecutorInitializator.getCurrentScope(); String scope = SmartExecutorInitializator.getScopeFromToken();
SmartExecutorPersistenceConnector persistence = SmartExecutorPersistenceConnector persistence =
getPersistenceConnector(SmartExecutorInitializator.getCurrentScope()); getPersistenceConnector(scope);
if(persistence==null){ if(persistence==null){
logger.trace("Retrieving {} for scope {} not found on internal {}. Intializing it.", logger.trace("Retrieving {} for scope {} not found on internal {}. Intializing it.",
SmartExecutorPersistenceConnector.class.getSimpleName(), scope, Map.class.getSimpleName()); SmartExecutorPersistenceConnector.class.getSimpleName(),
scope, Map.class.getSimpleName());
String className = CouchDBPersistenceConnector.class.getSimpleName(); String className = CouchDBPersistenceConnector.class.getSimpleName();
SmartExecutorPersistenceConfiguration configuration = SmartExecutorPersistenceConfiguration configuration =
new SmartExecutorPersistenceConfiguration(className); new SmartExecutorPersistenceConfiguration(className);
persistence = new CouchDBPersistenceConnector(configuration); persistence = new CouchDBPersistenceConnector(configuration);
persistenceConnectors.put(scope, persistence); persistenceConnectors.put(SmartExecutorInitializator.getScopeFromToken(),
persistence);
} }
return persistence; return persistence;
} }
public static synchronized void closePersistenceConnector() throws Exception { public static synchronized void closePersistenceConnector() throws Exception {
String scope = SmartExecutorInitializator.getCurrentScope(); String scope = SmartExecutorInitializator.getScopeFromToken();
SmartExecutorPersistenceConnector persistence = getPersistenceConnector(scope); SmartExecutorPersistenceConnector persistence =
getPersistenceConnector(scope);
if(persistence!=null){ if(persistence!=null){
persistence.close(); persistence.close();
persistenceConnectors.remove(scope); persistenceConnectors.remove(scope);

25
src/main/java/org/gcube/vremanagement/executor/persistence/couchdb/CouchDBPersistenceConnector.java
View File

@ -38,7 +38,6 @@ import org.gcube.vremanagement.executor.exception.ScopeNotMatchException;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConfiguration; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConfiguration;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector;
import org.gcube.vremanagement.executor.plugin.PluginDeclaration; import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
import org.gcube.vremanagement.executor.plugin.PluginState;
import org.gcube.vremanagement.executor.plugin.PluginStateEvolution; import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -131,7 +130,7 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public void pluginStateEvolution(PluginStateEvolution pluginStateEvolution) throws Exception { public void pluginStateEvolution(PluginStateEvolution pluginStateEvolution, Exception e) throws Exception {
ObjectNode objectNode = PluginStateEvolutionObjectNode.getObjectMapper(pluginStateEvolution); ObjectNode objectNode = PluginStateEvolutionObjectNode.getObjectMapper(pluginStateEvolution);
createItem(objectNode, null); createItem(objectNode, null);
} }
@ -141,7 +140,7 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
*/ */
@Override @Override
@Deprecated @Deprecated
public PluginState getPluginInstanceState(UUID uuid, int iterationNumber) public PluginStateEvolution getPluginInstanceState(UUID uuid, int iterationNumber)
throws Exception { throws Exception {
return reallyQuery(null, uuid, iterationNumber); return reallyQuery(null, uuid, iterationNumber);
} }
@ -151,7 +150,7 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
*/ */
@Override @Override
@Deprecated @Deprecated
public PluginState getLastPluginInstanceState(UUID uuid) throws Exception { public PluginStateEvolution getLastPluginInstanceState(UUID uuid) throws Exception {
return reallyQuery(null, uuid, LAST); return reallyQuery(null, uuid, LAST);
} }
@ -200,12 +199,12 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
* @return * @return
* @throws Exception * @throws Exception
*/ */
protected PluginState reallyQuery(PluginDeclaration pluginDeclaration, UUID uuid, int iterationNumber) protected PluginStateEvolution reallyQuery(PluginDeclaration pluginDeclaration, UUID uuid, int iterationNumber)
throws Exception { throws Exception {
ViewQuery query = new ViewQuery().designDocId(String.format("%s%s", MAP_REDUCE__DESIGN, PLUGIN_STATE_DOCUMENT)); ViewQuery query = new ViewQuery().designDocId(String.format("%s%s", MAP_REDUCE__DESIGN, PLUGIN_STATE_DOCUMENT));
String scope = SmartExecutorInitializator.getCurrentScope(); String scope = SmartExecutorInitializator.getScopeFromToken();
ArrayNode startKey = new ObjectMapper().createArrayNode(); ArrayNode startKey = new ObjectMapper().createArrayNode();
startKey.add(scope); startKey.add(scope);
ArrayNode endKey = new ObjectMapper().createArrayNode(); ArrayNode endKey = new ObjectMapper().createArrayNode();
@ -238,19 +237,21 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
query.reduce(false); query.reduce(false);
PluginState pluginState = null; PluginStateEvolution pluginStateEvolution = null;
ViewResult viewResult = query(query); ViewResult viewResult = query(query);
for (ViewResult.Row row : viewResult) { for (ViewResult.Row row : viewResult) {
//JsonNode key = row.getKeyAsNode(); //JsonNode key = row.getKeyAsNode();
JsonNode value = row.getValueAsNode(); JsonNode value = row.getValueAsNode();
pluginState = PluginState.valueOf(value.findValue("state").getTextValue()); pluginStateEvolution = PluginStateEvolutionObjectNode.getPluginStateEvolution(value);
} }
if(pluginState==null){ if(pluginStateEvolution==null){
throw new PluginStateNotRetrievedException(); throw new PluginStateNotRetrievedException();
} }
return pluginState; return pluginStateEvolution;
} }
@ -273,7 +274,7 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
ViewQuery query = new ViewQuery().designDocId(String.format("%s%s", MAP_REDUCE__DESIGN, SCHEDULED_TASKS_DOCUMENT)); ViewQuery query = new ViewQuery().designDocId(String.format("%s%s", MAP_REDUCE__DESIGN, SCHEDULED_TASKS_DOCUMENT));
query = query.viewName(ORPHAN_VIEW); query = query.viewName(ORPHAN_VIEW);
String scope = SmartExecutorInitializator.getCurrentScope(); String scope = SmartExecutorInitializator.getScopeFromToken();
ArrayNode startKey = new ObjectMapper().createArrayNode(); ArrayNode startKey = new ObjectMapper().createArrayNode();
startKey.add(scope); startKey.add(scope);
ArrayNode endKey = new ObjectMapper().createArrayNode(); ArrayNode endKey = new ObjectMapper().createArrayNode();
@ -316,7 +317,7 @@ public class CouchDBPersistenceConnector extends SmartExecutorPersistenceConnect
JSONObject obj = jlp.toJSON(); JSONObject obj = jlp.toJSON();
obj.append(TYPE_JSON_FIELD, SCHEDULED_TASK_TYPE); obj.append(TYPE_JSON_FIELD, SCHEDULED_TASK_TYPE);
obj.append(USED_BY_FIELD, consumerID); obj.append(USED_BY_FIELD, consumerID);
obj.append(ScheduledTaskConfiguration.SCOPE, SmartExecutorInitializator.getCurrentScope()); obj.append(ScheduledTaskConfiguration.SCOPE, SmartExecutorInitializator.getScopeFromToken());
createItem(obj, uuid.toString()); createItem(obj, uuid.toString());
} catch (Exception e) { } catch (Exception e) {
logger.error("Error Adding Scheduled Task UUID : {}, Consumer : {}, LaunchParameter : {}", logger.error("Error Adding Scheduled Task UUID : {}, Consumer : {}, LaunchParameter : {}",

75
src/main/java/org/gcube/vremanagement/executor/persistence/couchdb/PluginStateEvolutionObjectNode.java
View File

@ -3,16 +3,21 @@
*/ */
package org.gcube.vremanagement.executor.persistence.couchdb; package org.gcube.vremanagement.executor.persistence.couchdb;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.ObjectNode; import org.codehaus.jackson.node.ObjectNode;
import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.common.resources.gcore.GCoreEndpoint;
//import org.gcube.smartgears.ContextProvider; import org.gcube.smartgears.ContextProvider;
import org.gcube.vremanagement.executor.SmartExecutorImpl;
import org.gcube.vremanagement.executor.SmartExecutorInitializator; import org.gcube.vremanagement.executor.SmartExecutorInitializator;
import org.gcube.vremanagement.executor.exception.InvalidPluginStateEvolutionException;
import org.gcube.vremanagement.executor.plugin.Plugin;
import org.gcube.vremanagement.executor.plugin.PluginDeclaration; import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
import org.gcube.vremanagement.executor.plugin.PluginState;
import org.gcube.vremanagement.executor.plugin.PluginStateEvolution; import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
/** /**
@ -43,15 +48,15 @@ public class PluginStateEvolutionObjectNode {
public final static String LOCALHOST = "localhost"; public final static String LOCALHOST = "localhost";
public final static String PERCENTAGE = "percentage";
protected static ObjectNode getRunOn(){ protected static ObjectNode getRunOn(){
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
ObjectNode objectNode = objectMapper.createObjectNode(); ObjectNode objectNode = objectMapper.createObjectNode();
try { try {
GCoreEndpoint gCoreEndpoint = SmartExecutorImpl.getCtx().profile(GCoreEndpoint.class); GCoreEndpoint gCoreEndpoint = ContextProvider.get().profile(GCoreEndpoint.class);
//GCoreEndpoint gCoreEndpoint = ContextProvider.get().profile(GCoreEndpoint.class);
objectNode.put(GHN_ID_FIELD, gCoreEndpoint.profile().ghnId()); objectNode.put(GHN_ID_FIELD, gCoreEndpoint.profile().ghnId());
objectNode.put(GHN_HOSTNAME_FIELD, SmartExecutorImpl.getCtx().container().configuration().hostname()); objectNode.put(GHN_HOSTNAME_FIELD, ContextProvider.get().container().configuration().hostname());
//objectNode.put(GHN_HOSTNAME_FIELD, ContextProvider.get().container().configuration().hostname());
}catch(Exception e){ }catch(Exception e){
objectNode.put(GHN_ID_FIELD, LOCALHOST + "_" + UUID.randomUUID()); objectNode.put(GHN_ID_FIELD, LOCALHOST + "_" + UUID.randomUUID());
objectNode.put(GHN_HOSTNAME_FIELD, LOCALHOST); objectNode.put(GHN_HOSTNAME_FIELD, LOCALHOST);
@ -78,8 +83,51 @@ public class PluginStateEvolutionObjectNode {
return objectNode; return objectNode;
} }
protected static PluginDeclaration getPluginDeclaration(final JsonNode jsonNode){
PluginDeclaration pluginDeclaration = new PluginDeclaration() {
@Override
public void init() throws Exception {}
@Override
public String getVersion() {
return jsonNode.get(PLUGIN_DECLARATION_VERSION_FIELD).asText();
}
@Override
public Map<String, String> getSupportedCapabilities() {
Map<String, String> capabilities = new HashMap<>();
JsonNode node = jsonNode.get(PLUGIN_DECLARATION_VERSION_FIELD);
Iterator<String> iterator = node.getFieldNames();
while(iterator.hasNext()) {
String key = iterator.next();
capabilities.put(key, node.get(key).asText());
}
return capabilities;
}
@Override
public Class<? extends Plugin<? extends PluginDeclaration>> getPluginImplementation() {
return null;
}
@Override
public String getName() {
return jsonNode.get(PLUGIN_DECLARATION_NAME_FIELD).asText();
}
@Override
public String getDescription() {
return jsonNode.get(PLUGIN_DECLARATION_DESCRIPTION_FIELD).asText();
}
};
return pluginDeclaration;
}
public static void addScope(ObjectNode objectNode){ public static void addScope(ObjectNode objectNode){
objectNode.put(SCOPE_FIELD, SmartExecutorInitializator.getCurrentScope()); objectNode.put(SCOPE_FIELD, SmartExecutorInitializator.getScopeFromToken());
} }
public static ObjectNode getObjectMapper(PluginStateEvolution pluginStateEvolution){ public static ObjectNode getObjectMapper(PluginStateEvolution pluginStateEvolution){
@ -93,6 +141,8 @@ public class PluginStateEvolutionObjectNode {
objectNode.put(STATE_FIELD, pluginStateEvolution.getPluginState().toString()); objectNode.put(STATE_FIELD, pluginStateEvolution.getPluginState().toString());
objectNode.put(PERCENTAGE, pluginStateEvolution.getPercentage());
addScope(objectNode); addScope(objectNode);
objectNode.put(CouchDBPersistenceConnector.TYPE_JSON_FIELD, EVOLUTION_TYPE); objectNode.put(CouchDBPersistenceConnector.TYPE_JSON_FIELD, EVOLUTION_TYPE);
@ -105,4 +155,15 @@ public class PluginStateEvolutionObjectNode {
return objectNode; return objectNode;
} }
public static PluginStateEvolution getPluginStateEvolution(JsonNode jsonNode)
throws InvalidPluginStateEvolutionException{
UUID uuid = UUID.fromString(jsonNode.get(UUID_FIELD).asText());
int iteration = jsonNode.get(ITERATION_FIELD).asInt();
long timestamp = jsonNode.get(TIMESTAMP_FIELD).asInt();
PluginDeclaration pluginDeclaration = getPluginDeclaration(jsonNode.get(PLUGIN_DECLARATION_FIELD));
PluginState pluginState = PluginState.valueOf(jsonNode.get(STATE_FIELD).asText());
int percentage = jsonNode.get(PERCENTAGE).asInt();
return new PluginStateEvolution(uuid, iteration, timestamp, pluginDeclaration, pluginState, percentage);
}
} }

34
src/main/java/org/gcube/vremanagement/executor/pluginmanager/PercentageSetterImpl.java Normal file
View File

@ -0,0 +1,34 @@
/**
*
*/
package org.gcube.vremanagement.executor.pluginmanager;
import org.gcube.vremanagement.executor.exception.InvalidPluginStateEvolutionException;
import org.gcube.vremanagement.executor.plugin.PercentageSetter;
import org.gcube.vremanagement.executor.plugin.Plugin;
import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
/**
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*
*/
public class PercentageSetterImpl<T extends Plugin<? extends PluginDeclaration>> implements PercentageSetter {
private final RunnablePlugin<T> runnablePlugin;
public PercentageSetterImpl(RunnablePlugin<T> runnablePlugin){
this.runnablePlugin = runnablePlugin;
}
public void setPercentageEvolution(Integer percentage){
try {
if(percentage<0 || percentage>100){
throw new InvalidPluginStateEvolutionException("Percentage must be beetween 0 and 100");
}
this.runnablePlugin.setPercentage(percentage);
} catch(Exception e){
throw new RuntimeException(e);
}
}
}

4
src/main/java/org/gcube/vremanagement/executor/pluginmanager/PluginManager.java
View File

@ -69,7 +69,7 @@ public class PluginManager {
"The class which will run the execution will be %s", "The class which will run the execution will be %s",
plugin.getName())); plugin.getName()));
// Retrieve the Constructor of Plugin to instantiate itPLUGIN // Retrieve the Constructor of Plugin to instantiate it
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
Class[] argTypes = { pluginDeclaration.getClass()}; Class[] argTypes = { pluginDeclaration.getClass()};
@ -77,7 +77,7 @@ public class PluginManager {
Object[] arguments = { pluginDeclaration}; Object[] arguments = { pluginDeclaration};
// logger.debug(String.format("Plugin named %s once instatiated will be identified by the UUID %s", // logger.debug(String.format("Plugin named %s once instantiated will be identified by the UUID %s",
// name, executionIdentifier)); // name, executionIdentifier));
Constructor<? extends Plugin<? extends PluginDeclaration>> executorPluginConstructor; Constructor<? extends Plugin<? extends PluginDeclaration>> executorPluginConstructor;
try { try {

67
src/main/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePlugin.java
View File

@ -3,12 +3,13 @@
*/ */
package org.gcube.vremanagement.executor.pluginmanager; package org.gcube.vremanagement.executor.pluginmanager;
import java.util.Date; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.gcube.vremanagement.executor.exception.AlreadyInFinalStateException; import org.gcube.vremanagement.executor.exception.AlreadyInFinalStateException;
import org.gcube.vremanagement.executor.exception.InvalidPluginStateEvolutionException;
import org.gcube.vremanagement.executor.plugin.Plugin; import org.gcube.vremanagement.executor.plugin.Plugin;
import org.gcube.vremanagement.executor.plugin.PluginDeclaration; import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
import org.gcube.vremanagement.executor.plugin.PluginState; import org.gcube.vremanagement.executor.plugin.PluginState;
@ -40,18 +41,19 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
protected final int iterationNumber; protected final int iterationNumber;
protected final List<PluginStateNotification> pluginStateNotifications; protected final List<PluginStateNotification> pluginStateNotifications;
protected PluginState actualState; protected PluginStateEvolution actualStateEvolution;
public RunnablePlugin(T plugin, Map<String, Object> inputs, public RunnablePlugin(T plugin, Map<String, Object> inputs,
UUID uuid, int iterationNumber, List<PluginStateNotification> pluginStateNotifications){ UUID uuid, int iterationNumber, List<PluginStateNotification> pluginStateNotifications){
this.plugin = plugin; this.plugin = plugin;
this.plugin.setPercentageSetter(new PercentageSetterImpl<T>(this));
this.inputs = inputs; this.inputs = inputs;
this.uuid = uuid; this.uuid = uuid;
this.iterationNumber = iterationNumber; this.iterationNumber = iterationNumber;
this.pluginStateNotifications = pluginStateNotifications; this.pluginStateNotifications = pluginStateNotifications;
try { try {
setState(PluginState.CREATED); setState(PluginState.CREATED);
} catch (AlreadyInFinalStateException e) { } catch (AlreadyInFinalStateException | InvalidPluginStateEvolutionException e) {
logger.error(" --- You should not be here. Seem that the {} is suspended before the istance is created. This is really STRANGE.", logger.error(" --- You should not be here. Seem that the {} is suspended before the istance is created. This is really STRANGE.",
uuid); uuid);
throw new RuntimeException(e); throw new RuntimeException(e);
@ -64,6 +66,7 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
public void run(){ public void run(){
try { try {
setState(PluginState.RUNNING); setState(PluginState.RUNNING);
plugin.launch(inputs); plugin.launch(inputs);
setState(PluginState.DONE); setState(PluginState.DONE);
} catch (AlreadyInFinalStateException e1) { } catch (AlreadyInFinalStateException e1) {
@ -71,12 +74,12 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
} catch(Exception e) { } catch(Exception e) {
logger.trace(String.format("Thread %s failed", this.toString()),e); logger.trace(String.format("Thread %s failed", this.toString()),e);
try { try {
setState(PluginState.FAILED); setState(PluginState.FAILED, e);
} catch (AlreadyInFinalStateException e1) { } catch (AlreadyInFinalStateException | InvalidPluginStateEvolutionException e1) {
return; return;
} }
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
/** /**
@ -93,32 +96,66 @@ public class RunnablePlugin<T extends Plugin<? extends PluginDeclaration>> imple
return inputs; return inputs;
} }
protected synchronized void setPercentage(Integer percentage) throws AlreadyInFinalStateException, InvalidPluginStateEvolutionException {
PluginState pluginState = actualStateEvolution.getPluginState();
if(pluginState != PluginState.RUNNING){
throw new InvalidPluginStateEvolutionException("Percentage can be set only for runnign plugin");
}
setState(pluginState, percentage, null);
}
public synchronized void setState(PluginState pluginState) throws AlreadyInFinalStateException, InvalidPluginStateEvolutionException {
Integer percentage = 0;
if(actualStateEvolution!=null){
percentage = actualStateEvolution.getPercentage();
}
if(pluginState==PluginState.DONE){
percentage = 100;
}
setState(pluginState, percentage, null);
}
public synchronized void setState(PluginState pluginState, Exception e) throws AlreadyInFinalStateException, InvalidPluginStateEvolutionException {
Integer percentage = 0;
if(actualStateEvolution!=null){
percentage = actualStateEvolution.getPercentage();
}
Exception exception = null;
if(pluginState == PluginState.FAILED){
exception = new Exception(e);
}
setState(pluginState, percentage, exception);
}
/** /**
* It is up to the plugin update the State of the Running Plugin using * It is up to the plugin update the State of the Running Plugin using
* this facilities function. * this facilities function.
* @param pluginState * @param pluginState
* @throws Exception * @throws Exception
*/ */
public synchronized void setState(PluginState pluginState) throws AlreadyInFinalStateException { protected void setState(PluginState pluginState, Integer percentage, Exception exception) throws AlreadyInFinalStateException, InvalidPluginStateEvolutionException {
long timestamp = new Date().getTime(); long timestamp = Calendar.getInstance().getTimeInMillis();
if(actualState!=null && actualState.isFinalState()){ if(actualStateEvolution!=null && actualStateEvolution.getPluginState().isFinalState()){
logger.trace("At {} Trying to set {} in {} state, but it was already in the final state {}", timestamp, logger.trace("At {} Trying to set {} in {} state, but it was already in the final state {}", timestamp,
uuid, pluginState.toString(), actualState.toString()); uuid, pluginState.toString(), actualStateEvolution.toString());
throw new AlreadyInFinalStateException(); throw new AlreadyInFinalStateException();
} }
PluginStateEvolution pluginStateEvolution = new PluginStateEvolution(uuid, iterationNumber, timestamp, plugin.getPluginDeclaration(), pluginState, percentage);
actualState = pluginState;
for(PluginStateNotification pluginStateNotification : pluginStateNotifications){ for(PluginStateNotification pluginStateNotification : pluginStateNotifications){
String pluginStateNotificationName = pluginStateNotification.getClass().getSimpleName(); String pluginStateNotificationName = pluginStateNotification.getClass().getSimpleName();
PluginStateEvolution pluginStateEvolution = new PluginStateEvolution(uuid, iterationNumber, timestamp, plugin.getPluginDeclaration(), pluginState);
try { try {
logger.debug("Adding Plugin State Evolution {} with {}.", pluginStateEvolution, pluginStateNotificationName); logger.debug("Notifing Plugin State Evolution {} to {}.", pluginStateEvolution, pluginStateNotificationName);
pluginStateNotification.pluginStateEvolution(pluginStateEvolution); pluginStateNotification.pluginStateEvolution(pluginStateEvolution, exception);
} catch(Exception e) { } catch(Exception e) {
logger.error("Unable to Persist Plugin State Evolution {} with {}.", logger.error("Unable to Notify Plugin State Evolution {} to {}.",
pluginStateEvolution, pluginStateNotificationName); pluginStateEvolution, pluginStateNotificationName);
} }
} }
actualStateEvolution = pluginStateEvolution;
} }
@Override @Override

6
src/main/java/org/gcube/vremanagement/executor/scheduler/JobCompletedNotification.java
View File

@ -3,6 +3,7 @@
*/ */
package org.gcube.vremanagement.executor.scheduler; package org.gcube.vremanagement.executor.scheduler;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.gcube.vremanagement.executor.plugin.PluginState; import org.gcube.vremanagement.executor.plugin.PluginState;
@ -18,7 +19,7 @@ import org.gcube.vremanagement.executor.plugin.PluginStateNotification;
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*/ */
@Deprecated @Deprecated
public class JobCompletedNotification implements PluginStateNotification { public class JobCompletedNotification extends PluginStateNotification {
/** /**
* Maintain the Execution State * Maintain the Execution State
@ -27,11 +28,12 @@ public class JobCompletedNotification implements PluginStateNotification {
protected final Map<Integer, PluginState> executionsState; protected final Map<Integer, PluginState> executionsState;
public JobCompletedNotification(Map<Integer, PluginState> executionsState){ public JobCompletedNotification(Map<Integer, PluginState> executionsState){
super(new HashMap<String, String>());
this.executionsState = executionsState; this.executionsState = executionsState;
} }
@Override @Override
public void pluginStateEvolution(PluginStateEvolution pluginStateEvolution) throws Exception { public void pluginStateEvolution(PluginStateEvolution pluginStateEvolution, Exception e) throws Exception {
executionsState.put(pluginStateEvolution.getIteration(), pluginStateEvolution.getPluginState()); executionsState.put(pluginStateEvolution.getIteration(), pluginStateEvolution.getPluginState());
} }

95
src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorScheduler.java
View File

@ -12,8 +12,7 @@ import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.common.resources.gcore.GCoreEndpoint;
import org.gcube.vremanagement.executor.SmartExecutorImpl; import org.gcube.smartgears.ContextProvider;
//import org.gcube.smartgears.ContextProvider;
import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.api.types.Scheduling;
import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration; import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration;
@ -151,8 +150,7 @@ public class SmartExecutorScheduler {
} }
try { try {
//String runningInstanceID = ContextProvider.get().profile(GCoreEndpoint.class).id(); String runningInstanceID = ContextProvider.get().profile(GCoreEndpoint.class).id();
String runningInstanceID = SmartExecutorImpl.getCtx().profile(GCoreEndpoint.class).id();
logger.debug("Going to persist Scheduled Task {} which will be assigned to Running Instance {}. LaunchParameters : {} ", logger.debug("Going to persist Scheduled Task {} which will be assigned to Running Instance {}. LaunchParameters : {} ",
uuid.toString(), runningInstanceID, parameter); uuid.toString(), runningInstanceID, parameter);
ScheduledTaskConfiguration stc = ScheduledTaskConfigurationFactory.getLaunchConfiguration(); ScheduledTaskConfiguration stc = ScheduledTaskConfigurationFactory.getLaunchConfiguration();
@ -227,17 +225,21 @@ public class SmartExecutorScheduler {
logger.debug("No SmartExecutor Task {} was found. That's all folk.", uuid); logger.debug("No SmartExecutor Task {} was found. That's all folk.", uuid);
throw new SchedulerNotFoundException("Scheduler Not Found"); throw new SchedulerNotFoundException("Scheduler Not Found");
} }
boolean interrupted = scheduler.interrupt(jobKey); boolean interrupted = scheduler.interrupt(jobKey);
if (interrupted) { if (interrupted) {
logger.debug("SmartExecutor Task {} interrupted successfully.", uuid); logger.debug("SmartExecutor Task {} interrupted successfully.", uuid);
} else { } else {
logger.debug("SmartExecutor Task {} was not interrupted.", uuid); List<JobExecutionContext> list = getCurrentlyExecutingJobs(scheduler);
throw new UnableToInterruptTaskException(uuid); if(list!=null && list.size()>0){
logger.debug("SmartExecutor Task {} was not interrupted.", uuid);
throw new UnableToInterruptTaskException(uuid);
}
} }
} catch (UnableToInterruptTaskException e) { } catch (UnableToInterruptTaskException e) {
throw e; throw e;
} catch(Exception e1){ } catch(Exception e){
throw new UnableToInterruptTaskException(uuid, e1); throw new UnableToInterruptTaskException(uuid, e);
} }
} }
@ -272,9 +274,6 @@ public class SmartExecutorScheduler {
protected List<JobExecutionContext> getCurrentlyExecutingJobs(Scheduler scheduler) throws SchedulerException{ protected List<JobExecutionContext> getCurrentlyExecutingJobs(Scheduler scheduler) throws SchedulerException{
logger.trace("Getting {} list", JobExecutionContext.class.getSimpleName()); logger.trace("Getting {} list", JobExecutionContext.class.getSimpleName());
List<JobExecutionContext> cej = scheduler.getCurrentlyExecutingJobs(); List<JobExecutionContext> cej = scheduler.getCurrentlyExecutingJobs();
while (cej.isEmpty()){
cej = scheduler.getCurrentlyExecutingJobs();
}
logger.trace("{} list got {}", JobExecutionContext.class.getSimpleName(), cej); logger.trace("{} list got {}", JobExecutionContext.class.getSimpleName(), cej);
return cej; return cej;
} }
@ -286,6 +285,28 @@ public class SmartExecutorScheduler {
} }
protected void removeFromPersistence(boolean global, UUID uuid, boolean remove) throws SchedulePersistenceException{
try {
ScheduledTaskConfiguration stc = ScheduledTaskConfigurationFactory.getLaunchConfiguration();
if(remove){
logger.debug("Going to remove the SmartExecutor Scheduled Task {} from global scheduling", uuid);
stc.removeScheduledTask(uuid);
}else{
if(global){
logger.debug("Going to release the SmartExecutor Scheduled Task {}. The Task can be take in charge from another SmartExecutor instance", uuid);
stc.releaseScheduledTask(uuid);
}else{
logger.debug("Going to remove the SmartExecutor Scheduled Task {} from local scheduling", uuid);
stc.removeScheduledTask(uuid);
}
}
}catch(Exception e){
throw new SchedulePersistenceException(
String.format("Unable to Remove Scheduled Task %s from global scheduling",
uuid.toString()), e);
}
}
/** /**
* Stop the execution of the Task identified by UUID * Stop the execution of the Task identified by UUID
* @param uuid which identify the Task * @param uuid which identify the Task
@ -306,67 +327,37 @@ public class SmartExecutorScheduler {
Scheduler scheduler = activeSchedulers.get(uuid); Scheduler scheduler = activeSchedulers.get(uuid);
if(scheduler==null){ if(scheduler==null){
logger.debug("No SmartExecutor Task {} was found. That's all folk.", uuid); logger.debug("No SmartExecutor Task {} was found. That's all folk.", uuid);
removeFromPersistence(true, uuid, remove);
return; return;
} }
JobKey jobKey = new JobKey(uuid.toString()); JobKey jobKey = new JobKey(uuid.toString());
boolean exist = scheduler.checkExists(jobKey); boolean exist = scheduler.checkExists(jobKey);
if(!exist){ if(!exist){
logger.trace("SmartExecutor Task {} does not have any instaces associated. Cleaning the envoronment. That's all folk.", uuid); logger.trace("SmartExecutor Task {} does not have any instaces associated. Cleaning the environment. That's all folk.", uuid);
activeSchedulers.remove(uuid); activeSchedulers.remove(uuid);
return; return;
}else{ }else{
logger.trace("SmartExecutor Task {} exist", uuid); logger.trace("SmartExecutor Task {} to stop exist", uuid);
} }
// TODO Check if this call is needed
//getCurrentlyExecutingJobs(scheduler);
stopLastcurrentExecution(scheduler, uuid);
LaunchParameter launchParameter = getLaunchParameter(scheduler, jobKey); LaunchParameter launchParameter = getLaunchParameter(scheduler, jobKey);
Scheduling scheduling = launchParameter.getScheduling(); Scheduling scheduling = launchParameter.getScheduling();
boolean scheduled = launchParameter.getScheduling() != null ? true : false; boolean scheduled = launchParameter.getScheduling() != null ? true : false;
stopLastcurrentExecution(scheduler, uuid);
if(stopOnly){
/*
* When the Task was not Scheduled, also the quartz scheduler
* must be removed.
* If the Task was scheduled, the inputs argument request to stop
* only the last running execution, so that the quartz scheduler
* must be keep alive to run the next execution.
*/
if(scheduled){
deleteScheduler(scheduler, uuid);
}
logger.debug("The request was only to stop the last execution (if any). That's all folk.");
return;
}
try { try {
if(scheduled){ if(stopOnly ^ scheduled){
ScheduledTaskConfiguration stc = ScheduledTaskConfigurationFactory.getLaunchConfiguration(); deleteScheduler(scheduler, uuid);
if(remove){
logger.debug("Going to remove the SmartExecutor Scheduled Task {} from global scheduling", uuid);
stc.removeScheduledTask(uuid);
}else{
if(scheduling.getGlobal()){
logger.debug("Going to release the SmartExecutor Scheduled Task {}. The Task can be take in charge from another SmartExecutor instance", uuid);
stc.releaseScheduledTask(uuid);
}else{
logger.debug("Going to remove the SmartExecutor Scheduled Task {} from local scheduling", uuid);
stc.removeScheduledTask(uuid);
}
}
} }
}catch(Exception e){ }catch(Exception e){
throw new SchedulePersistenceException(e.getCause()); throw e;
} finally { } finally {
deleteScheduler(scheduler, uuid); if(!stopOnly && scheduled){
/* Removing scheduling from persistence */
removeFromPersistence(scheduling.getGlobal(), uuid, remove);
}
} }
} }

45
src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorTask.java
View File

@ -3,6 +3,7 @@
*/ */
package org.gcube.vremanagement.executor.scheduler; package org.gcube.vremanagement.executor.scheduler;
import java.lang.reflect.Constructor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -13,10 +14,12 @@ import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.api.types.Scheduling;
import org.gcube.vremanagement.executor.exception.AlreadyInFinalStateException; import org.gcube.vremanagement.executor.exception.AlreadyInFinalStateException;
import org.gcube.vremanagement.executor.exception.InputsNullException; import org.gcube.vremanagement.executor.exception.InputsNullException;
import org.gcube.vremanagement.executor.exception.InvalidPluginStateEvolutionException;
import org.gcube.vremanagement.executor.exception.PluginNotFoundException; import org.gcube.vremanagement.executor.exception.PluginNotFoundException;
import org.gcube.vremanagement.executor.exception.SchedulePersistenceException; import org.gcube.vremanagement.executor.exception.SchedulePersistenceException;
import org.gcube.vremanagement.executor.exception.SchedulerRemoveException; import org.gcube.vremanagement.executor.exception.SchedulerRemoveException;
import org.gcube.vremanagement.executor.exception.UnableToInterruptTaskException; import org.gcube.vremanagement.executor.exception.UnableToInterruptTaskException;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceFactory;
import org.gcube.vremanagement.executor.plugin.Plugin; import org.gcube.vremanagement.executor.plugin.Plugin;
import org.gcube.vremanagement.executor.plugin.PluginDeclaration; import org.gcube.vremanagement.executor.plugin.PluginDeclaration;
@ -80,7 +83,7 @@ public class SmartExecutorTask implements InterruptableJob {
protected int maxExecutionNumber; protected int maxExecutionNumber;
/**/ /**/
@SuppressWarnings("deprecation") @SuppressWarnings({ "deprecation", "unchecked" })
protected void init(JobDataMap jobDataMap) throws JobExecutionException{ protected void init(JobDataMap jobDataMap) throws JobExecutionException{
uuid = (UUID) jobDataMap.get(UUID); uuid = (UUID) jobDataMap.get(UUID);
launchParameter = (LaunchParameter) jobDataMap.get(LAUNCH_PARAMETER); launchParameter = (LaunchParameter) jobDataMap.get(LAUNCH_PARAMETER);
@ -98,6 +101,7 @@ public class SmartExecutorTask implements InterruptableJob {
Scheduling scheduling = launchParameter.getScheduling(); Scheduling scheduling = launchParameter.getScheduling();
if(scheduling!=null){ if(scheduling!=null){
mustPreviousExecutionsCompleted = scheduling.mustPreviousExecutionsCompleted(); mustPreviousExecutionsCompleted = scheduling.mustPreviousExecutionsCompleted();
if(mustPreviousExecutionsCompleted){ if(mustPreviousExecutionsCompleted){
Map<Integer, PluginState> executionState; Map<Integer, PluginState> executionState;
if(executionsState.containsKey(uuid)){ if(executionsState.containsKey(uuid)){
@ -107,16 +111,39 @@ public class SmartExecutorTask implements InterruptableJob {
executionsState.put(uuid, executionState); executionsState.put(uuid, executionState);
executionState.put(0, PluginState.DONE); executionState.put(0, PluginState.DONE);
} }
// TODO Insert code to dynamically discover notification to
// attach and attach the requested ones.
// The following line of code is just a placeholder and must be
// removed when the previous TO DO has done.
pluginStateNotifications.add(new JobCompletedNotification(executionState)); pluginStateNotifications.add(new JobCompletedNotification(executionState));
} }
maxExecutionNumber = scheduling.getSchedulingTimes(); maxExecutionNumber = scheduling.getSchedulingTimes();
// TODO Insert code to dynamically discover notification to
// attach and attach the requested ones.
// pluginStateNotifications.add(...);
}
Map<String, Map<String, String>> pluginStateNotificationWithInputs = launchParameter.getPluginStateNotifications();
for(String pluginStateNotificationsClassName : pluginStateNotificationWithInputs.keySet()){
if(pluginStateNotificationsClassName.compareTo(SmartExecutorPersistenceConnector.class.getName())==0) {
logger.warn("{} is for internal use only. It will be skypped", pluginStateNotificationsClassName);
continue;
}
if(pluginStateNotificationsClassName.compareTo(JobCompletedNotification.class.getName())==0){
logger.warn("{} is for internal use only. It will be skypped", pluginStateNotificationsClassName);
continue;
}
Class<? extends PluginStateNotification> clazz;
try {
logger.trace("Trying to instantiate {}", pluginStateNotificationsClassName);
clazz = (Class<? extends PluginStateNotification>) Class.forName(pluginStateNotificationsClassName);
Constructor<?> constructor = clazz.getConstructor(Map.class);
Map<String,String> notificationInputs = pluginStateNotificationWithInputs.get(pluginStateNotificationsClassName);
PluginStateNotification pluginStateNotification = (PluginStateNotification) constructor.newInstance(notificationInputs);
logger.trace("{} succesfully instantiated : {}", pluginStateNotificationsClassName, pluginStateNotification);
pluginStateNotifications.add(pluginStateNotification);
} catch (Exception e) {
logger.error("Error instantiating {} : {}. It will be ignored", pluginStateNotificationsClassName, e.getMessage());
}
} }
initialized = true; initialized = true;
@ -128,8 +155,8 @@ public class SmartExecutorTask implements InterruptableJob {
public SmartExecutorTask() throws Exception { public SmartExecutorTask() throws Exception {
this.interrupted = false; this.interrupted = false;
this.initialized = false; this.initialized = false;
pluginStateNotifications = new ArrayList<PluginStateNotification>(); this.pluginStateNotifications = new ArrayList<PluginStateNotification>();
pluginStateNotifications.add(SmartExecutorPersistenceFactory.getPersistenceConnector()); this.pluginStateNotifications.add(SmartExecutorPersistenceFactory.getPersistenceConnector());
} }
/** /**
@ -217,7 +244,7 @@ public class SmartExecutorTask implements InterruptableJob {
notTerminatedExecutionNumber, executionCount); notTerminatedExecutionNumber, executionCount);
try { try {
runnablePlugin.setState(PluginState.DISCARDED); runnablePlugin.setState(PluginState.DISCARDED);
} catch (AlreadyInFinalStateException e) { } } catch (AlreadyInFinalStateException | InvalidPluginStateEvolutionException e) { }
} }
}else{ }else{
runnablePlugin.run(); runnablePlugin.run();

1
src/main/resources/META-INF/services/org.gcube.smartgears.handlers.application.ApplicationHandler
View File

@ -1 +0,0 @@
org.gcube.vremanagement.executor.SmartExecutorInitializator

22
src/test/java/org/gcube/vremanagement/executor/TokenBasedTests.java Normal file
View File

@ -0,0 +1,22 @@
/**
*
*/
package org.gcube.vremanagement.executor;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.junit.Before;
/**
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
*
*/
public class TokenBasedTests {
@Before
public void before(){
SecurityTokenProvider.instance.set("7c66c94c-7f6e-49cd-9a34-909cd3832f3e-98187548");
ScopeProvider.instance.set("/gcube/devNext/NextNext");
}
}

4
src/test/java/org/gcube/vremanagement/executor/configuration/ConfiguredTasksTest.java
View File

@ -12,6 +12,7 @@ import java.util.Map;
import org.acme.HelloWorldPlugin; import org.acme.HelloWorldPlugin;
import org.acme.HelloWorldPluginDeclaration; import org.acme.HelloWorldPluginDeclaration;
import org.gcube.vremanagement.executor.TokenBasedTests;
import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.api.types.Scheduling;
import org.gcube.vremanagement.executor.configuration.jsonbased.FileScheduledTaskConfiguration; import org.gcube.vremanagement.executor.configuration.jsonbased.FileScheduledTaskConfiguration;
@ -27,12 +28,13 @@ import org.slf4j.LoggerFactory;
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
* *
*/ */
public class ConfiguredTasksTest { public class ConfiguredTasksTest extends TokenBasedTests {
private static Logger logger = LoggerFactory.getLogger(ConfiguredTasksTest.class); private static Logger logger = LoggerFactory.getLogger(ConfiguredTasksTest.class);
public static final String TEST = "test"; public static final String TEST = "test";
public void checkOriginal(FileScheduledTaskConfiguration parser, int size){ public void checkOriginal(FileScheduledTaskConfiguration parser, int size){
List<LaunchParameter> configuredTasks = parser.getConfiguredTasks(); List<LaunchParameter> configuredTasks = parser.getConfiguredTasks();
Assert.assertEquals(size, configuredTasks.size()); Assert.assertEquals(size, configuredTasks.size());

9
src/test/java/org/gcube/vremanagement/executor/persistence/SmartExecutorPersistenceConnectorTest.java
View File

@ -9,6 +9,7 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.acme.HelloWorldPluginDeclaration; import org.acme.HelloWorldPluginDeclaration;
import org.gcube.vremanagement.executor.TokenBasedTests;
import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.LaunchParameter;
import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration; import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration;
import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfigurationFactory; import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfigurationFactory;
@ -24,7 +25,7 @@ import org.slf4j.LoggerFactory;
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
* *
*/ */
public class SmartExecutorPersistenceConnectorTest { public class SmartExecutorPersistenceConnectorTest extends TokenBasedTests {
private static Logger logger = LoggerFactory.getLogger(SmartExecutorPersistenceConnectorTest.class); private static Logger logger = LoggerFactory.getLogger(SmartExecutorPersistenceConnectorTest.class);
@ -45,8 +46,8 @@ public class SmartExecutorPersistenceConnectorTest {
for(int i=0; i<states.length; i++){ for(int i=0; i<states.length; i++){
long timestamp = new Date().getTime(); long timestamp = new Date().getTime();
PluginStateEvolution pluginStateEvolution = new PluginStateEvolution(uuid, 1, timestamp, HelloWorldPluginDeclaration.class.newInstance(), states[i]); PluginStateEvolution pluginStateEvolution = new PluginStateEvolution(uuid, 1, timestamp, HelloWorldPluginDeclaration.class.newInstance(), states[i], 0);
persistenceConnector.pluginStateEvolution(pluginStateEvolution); persistenceConnector.pluginStateEvolution(pluginStateEvolution, null);
long startTime = Calendar.getInstance().getTimeInMillis(); long startTime = Calendar.getInstance().getTimeInMillis();
long endTime = startTime; long endTime = startTime;
@ -54,7 +55,7 @@ public class SmartExecutorPersistenceConnectorTest {
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
PluginState ps = persistenceConnector.getPluginInstanceState(uuid, 1); PluginState ps = persistenceConnector.getPluginInstanceState(uuid, 1).getPluginState();
Assert.assertEquals(states[i], ps); Assert.assertEquals(states[i], ps);
} }

4
src/test/java/org/gcube/vremanagement/executor/pluginmanager/RunnablePluginTest.java
View File

@ -85,7 +85,7 @@ public class RunnablePluginTest {
while(endTime <= (startTime + 1000)){ while(endTime <= (startTime + 1000)){
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
Assert.assertEquals(PluginState.CREATED, persistenceConnector.getPluginInstanceState(uuid, 1)); Assert.assertTrue(PluginState.CREATED == persistenceConnector.getPluginInstanceState (uuid, 1).getPluginState());
rp.run(); rp.run();
@ -94,7 +94,7 @@ public class RunnablePluginTest {
while(endTime <= (startTime + 1000)){ while(endTime <= (startTime + 1000)){
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
Assert.assertEquals(PluginState.DONE, persistenceConnector.getPluginInstanceState(uuid, 1)); Assert.assertTrue(PluginState.DONE == persistenceConnector.getPluginInstanceState(uuid, 1).getPluginState());
} }

93
src/test/java/org/gcube/vremanagement/executor/pluginmanager/SmartExecutorSchedulerTest.java
View File

@ -16,6 +16,7 @@ import org.gcube.vremanagement.executor.exception.PluginStateNotRetrievedExcepti
import org.gcube.vremanagement.executor.exception.UnableToInterruptTaskException; import org.gcube.vremanagement.executor.exception.UnableToInterruptTaskException;
import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector; import org.gcube.vremanagement.executor.persistence.SmartExecutorPersistenceConnector;
import org.gcube.vremanagement.executor.plugin.PluginState; import org.gcube.vremanagement.executor.plugin.PluginState;
import org.gcube.vremanagement.executor.plugin.PluginStateEvolution;
import org.gcube.vremanagement.executor.scheduler.SmartExecutorScheduler; import org.gcube.vremanagement.executor.scheduler.SmartExecutorScheduler;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -88,8 +89,8 @@ public class SmartExecutorSchedulerTest {
while(endTime <= (startTime + 12000)){ while(endTime <= (startTime + 12000)){
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
PluginState pluginState = pc.getLastPluginInstanceState(uuid); PluginStateEvolution pluginStateEvolution = pc.getLastPluginInstanceState(uuid);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
@Test @Test
@ -110,8 +111,8 @@ public class SmartExecutorSchedulerTest {
} }
try{ try{
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
}catch(PluginStateNotRetrievedException e){ }catch(PluginStateNotRetrievedException e){
// OK // OK
logger.error("PluginStateNotRetrievedException this can be acceptable in some tests", e); logger.error("PluginStateNotRetrievedException this can be acceptable in some tests", e);
@ -137,8 +138,8 @@ public class SmartExecutorSchedulerTest {
while(endTime <= (startTime + 10000)){ while(endTime <= (startTime + 10000)){
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
PluginState pluginState = pc.getLastPluginInstanceState(uuid); PluginStateEvolution pluginStateEvolution = pc.getLastPluginInstanceState(uuid);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
} }
@Test @Test
@ -152,8 +153,8 @@ public class SmartExecutorSchedulerTest {
} }
smartExecutorScheduler.stop(uuid, true, false); smartExecutorScheduler.stop(uuid, true, false);
PluginState pluginState = pc.getLastPluginInstanceState(uuid); PluginStateEvolution pluginStateEvolution = pc.getLastPluginInstanceState(uuid);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
@ -177,11 +178,11 @@ public class SmartExecutorSchedulerTest {
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
PluginState pluginState = pc.getLastPluginInstanceState(first); PluginStateEvolution pluginStateEvolution = pc.getLastPluginInstanceState(first);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
pluginState = pc.getLastPluginInstanceState(second); pluginStateEvolution = pc.getLastPluginInstanceState(second);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
@Test @Test
@ -204,12 +205,12 @@ public class SmartExecutorSchedulerTest {
} }
for(int i=1; i<5; i++){ for(int i=1; i<5; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
} }
@ -233,16 +234,16 @@ public class SmartExecutorSchedulerTest {
} }
for(int i=1; i<5; i++){ for(int i=1; i<5; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i);
if(i%2!=0){ if(i%2!=0){
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
}else{ }else{
Assert.assertEquals(PluginState.DISCARDED, pluginState); Assert.assertEquals(PluginState.DISCARDED, pluginStateEvolution.getPluginState());
} }
} }
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
} }
@ -273,12 +274,12 @@ public class SmartExecutorSchedulerTest {
}; };
for(int i=0; i<expectedStates.length; i++){ for(int i=0; i<expectedStates.length; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i+1); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i+1);
Assert.assertEquals(expectedStates[i], pluginState); Assert.assertEquals(expectedStates[i], pluginStateEvolution.getPluginState());
} }
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.DISCARDED, pluginState); Assert.assertEquals(PluginState.DISCARDED, pluginStateEvolution.getPluginState());
} }
@ -294,8 +295,8 @@ public class SmartExecutorSchedulerTest {
} }
for(int i=0; i<3; i++){ for(int i=0; i<3; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i+1); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i+1);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
pc.getPluginInstanceState(uuid, 4); pc.getPluginInstanceState(uuid, 4);
@ -323,8 +324,8 @@ public class SmartExecutorSchedulerTest {
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
PluginState pluginState = pc.getPluginInstanceState(uuid, 1); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 1);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
pc.getPluginInstanceState(uuid, 2); pc.getPluginInstanceState(uuid, 2);
@ -353,13 +354,13 @@ public class SmartExecutorSchedulerTest {
} }
for(int i=1; i<5; i++){ for(int i=1; i<5; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
try{ try{
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
}catch(PluginStateNotRetrievedException e){ }catch(PluginStateNotRetrievedException e){
// OK // OK
} }
@ -387,16 +388,16 @@ public class SmartExecutorSchedulerTest {
} }
for(int i=1; i<5; i++){ for(int i=1; i<5; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i);
if(i%2!=0){ if(i%2!=0){
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
}else{ }else{
Assert.assertEquals(PluginState.DISCARDED, pluginState); Assert.assertEquals(PluginState.DISCARDED, pluginStateEvolution.getPluginState());
} }
} }
try{ try{
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.STOPPED, pluginState); Assert.assertEquals(PluginState.STOPPED, pluginStateEvolution.getPluginState());
}catch(PluginStateNotRetrievedException e){ }catch(PluginStateNotRetrievedException e){
// OK // OK
} }
@ -432,13 +433,13 @@ public class SmartExecutorSchedulerTest {
for(int i=0; i<expectedStates.length; i++){ for(int i=0; i<expectedStates.length; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i+1); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i+1);
Assert.assertEquals(expectedStates[i], pluginState); Assert.assertEquals(expectedStates[i], pluginStateEvolution.getPluginState());
} }
try{ try{
PluginState pluginState = pc.getPluginInstanceState(uuid, 5); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 5);
Assert.assertEquals(PluginState.DISCARDED, pluginState); Assert.assertEquals(PluginState.DISCARDED, pluginStateEvolution.getPluginState());
}catch(PluginStateNotRetrievedException e){ }catch(PluginStateNotRetrievedException e){
// OK // OK
} }
@ -457,8 +458,8 @@ public class SmartExecutorSchedulerTest {
} }
for(int i=0; i<3; i++){ for(int i=0; i<3; i++){
PluginState pluginState = pc.getPluginInstanceState(uuid, i+1); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, i+1);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
} }
pc.getPluginInstanceState(uuid, 4); pc.getPluginInstanceState(uuid, 4);
@ -485,8 +486,8 @@ public class SmartExecutorSchedulerTest {
endTime = Calendar.getInstance().getTimeInMillis(); endTime = Calendar.getInstance().getTimeInMillis();
} }
PluginState pluginState = pc.getPluginInstanceState(uuid, 1); PluginStateEvolution pluginStateEvolution = pc.getPluginInstanceState(uuid, 1);
Assert.assertEquals(PluginState.DONE, pluginState); Assert.assertEquals(PluginState.DONE, pluginStateEvolution.getPluginState());
pc.getPluginInstanceState(uuid, 2); pc.getPluginInstanceState(uuid, 2);