gCubeSystem
/
resource-registry-handlers
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added explicit invocation of addEserviceToContext 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/resource-registry-handlers@148246 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2017-05-02 15:55:29 +00:00
parent 2f56c934df
commit 7453f3239d
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
View File

@ -335,16 +335,6 @@ public class EServiceManager extends ApplicationLifecycleHandler {
try { try {
eService = resourceRegistryPublisher.createResource(EService.class, eService = resourceRegistryPublisher.createResource(EService.class,
eService); eService);
try {
createHostsRelation(eService, resourceRegistryPublisher);
} catch (Exception ex) {
String error = String.format(
"Unable to Create %s relation from % to % (%s : %s)",
Hosts.NAME, HostingNode.NAME, EService.NAME,
applicationContext.name(), eService.getHeader().getUUID());
logger.error(error, ex);
throw new ResourceRegistryException(error, ex);
}
} catch (ResourceAlreadyPresentException e) { } catch (ResourceAlreadyPresentException e) {
ResourceRegistryClient registryClient = ResourceRegistryClientFactory.create(); ResourceRegistryClient registryClient = ResourceRegistryClientFactory.create();
eService = registryClient.getInstance(EService.class, eService.getHeader().getUUID()); eService = registryClient.getInstance(EService.class, eService.getHeader().getUUID());
@ -352,11 +342,27 @@ public class EServiceManager extends ApplicationLifecycleHandler {
logger.debug("Moving app {} to {}", applicationContext.name(), state); logger.debug("Moving app {} to {}", applicationContext.name(), state);
createOrUpdateServiceStateFacet(eService, state); createOrUpdateServiceStateFacet(eService, state);
} catch (ResourceAvailableInAnotherContextException e) { } catch (ResourceAvailableInAnotherContextException e) {
// Adding the HostingNode I also add the EService thanks to propagationConstraint // Adding the HostingNode I also add the EService thanks to propagationConstraint
String token = SecurityTokenProvider.instance.get();
// If hosts was not created we need to add eService and HostingNode, otherwise
// addHostingnode is sufficient. Because we cannot be sure of it we invoke both
addToContext(eService, token);
addHostingNodeToCurrentContext(); addHostingNodeToCurrentContext();
ResourceRegistryClient registryClient = ResourceRegistryClientFactory.create(); ResourceRegistryClient registryClient = ResourceRegistryClientFactory.create();
eService = registryClient.getInstance(EService.class, eService.getHeader().getUUID()); eService = registryClient.getInstance(EService.class, eService.getHeader().getUUID());
} }
try {
createHostsRelation(eService, resourceRegistryPublisher);
} catch (Exception ex) {
String error = String.format(
"Unable to Create %s relation from % to % (%s : %s)",
Hosts.NAME, HostingNode.NAME, EService.NAME,
applicationContext.name(), eService.getHeader().getUUID());
logger.error(error, ex);
throw new ResourceRegistryException(error, ex);
}
return eService; return eService;
} }
@ -540,6 +546,7 @@ public class EServiceManager extends ApplicationLifecycleHandler {
Thread.currentThread().setContextClassLoader(contextCL); Thread.currentThread().setContextClassLoader(contextCL);
} }
} }
*/
private void addToContext(EService eService, String token) { private void addToContext(EService eService, String token) {
ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
@ -574,7 +581,6 @@ public class EServiceManager extends ApplicationLifecycleHandler {
Thread.currentThread().setContextClassLoader(contextCL); Thread.currentThread().setContextClassLoader(contextCL);
} }
} }
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")