Skip to content

Commit

Permalink
WFLY-9870 Intermittent failure in InterDeploymentDependenciesEarTestCase
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuartwdouglas
stuartwdouglas committed Feb 20, 2018
1 parent 27b8066 commit e67439a
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 20 deletions.
64 changes: 45 additions & 19 deletions ee/src/main/java/org/jboss/as/ee/component/deployers/ModuleJndiBindingProcessor.java
View file
Expand Up @@ -48,12 +48,18 @@
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.server.deployment.DeploymentUnitProcessor;
import org.jboss.modules.Module;
import org.jboss.msc.service.AbstractServiceListener;
import org.jboss.msc.service.CircularDependencyException;
import org.jboss.msc.service.DuplicateServiceException;
import org.jboss.msc.service.LifecycleEvent;
import org.jboss.msc.service.LifecycleListener;
import org.jboss.msc.service.Service;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
import org.jboss.msc.service.ServiceTarget;
import org.jboss.msc.service.StartContext;
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;

import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -222,14 +228,16 @@ protected void addJndiBinding(final EEModuleConfiguration module, final BindingC
}
} else {
BinderService service;
ServiceController<ManagedReferenceFactory> controller;
try {
service = new BinderService(bindInfo.getBindName(), bindingConfiguration.getSource(), true);
ServiceBuilder<ManagedReferenceFactory> serviceBuilder = phaseContext.getDeploymentUnit().getAttachment(org.jboss.as.server.deployment.Attachments.EXTERNAL_SERVICE_TARGET).addService(bindInfo.getBinderServiceName(), service);
ServiceTarget externalServiceTarget = phaseContext.getDeploymentUnit().getAttachment(org.jboss.as.server.deployment.Attachments.EXTERNAL_SERVICE_TARGET);
ServiceBuilder<ManagedReferenceFactory> serviceBuilder = externalServiceTarget.addService(bindInfo.getBinderServiceName(), service);
bindingConfiguration.getSource().getResourceValue(resolutionContext, serviceBuilder, phaseContext, service.getManagedObjectInjector());
serviceBuilder.addDependency(bindInfo.getParentContextServiceName(), ServiceBasedNamingStore.class, service.getNamingStoreInjector());
serviceBuilder.install();
controller = serviceBuilder.install();
} catch (DuplicateServiceException e) {
final ServiceController<ManagedReferenceFactory> controller = (ServiceController<ManagedReferenceFactory>) CurrentServiceContainer.getServiceContainer().getService(bindInfo.getBinderServiceName());
controller = (ServiceController<ManagedReferenceFactory>) CurrentServiceContainer.getServiceContainer().getService(bindInfo.getBinderServiceName());
if (controller == null)
throw e;
service = (BinderService) controller.getService();
Expand All @@ -238,10 +246,16 @@ protected void addJndiBinding(final EEModuleConfiguration module, final BindingC
}
}
//as these bindings are not child services
//we need to add a listener that released the service when the deployment stops
service.acquire();
ServiceController<?> unitService = CurrentServiceContainer.getServiceContainer().getService(phaseContext.getDeploymentUnit().getServiceName());
unitService.addListener(new BinderReleaseListener(service));
//we instead add another service that is a child service that will release the reference count on stop
//if the reference count hits zero this service will wait till the binding is down to actually stop
//to prevent WFLY-9870 where the undeployment is complete but the binding services are still present
try {
phaseContext.getServiceTarget().addService(phaseContext.getDeploymentUnit().getServiceName().append("sharedBindingReleaseService").append(bindInfo.getBinderServiceName()), new BinderReleaseService(controller, service))
.install();
service.acquire();
} catch (DuplicateServiceException ignore) {
//we ignore this, as it is already managed by this deployment
}
}
} else {
throw EeLogger.ROOT_LOGGER.nullBindingName(bindingConfiguration);
Expand All @@ -255,28 +269,40 @@ public static boolean equals(Object one, Object two) {
public void undeploy(DeploymentUnit context) {
}

private static class BinderReleaseListener<T> extends AbstractServiceListener<T> {
private static class BinderReleaseService implements Service<BinderReleaseService> {

private final ServiceController<ManagedReferenceFactory> sharedBindingController;
private final BinderService binderService;

public BinderReleaseListener(final BinderService binderService) {
private BinderReleaseService(ServiceController<ManagedReferenceFactory> sharedBindingController, BinderService binderService) {
this.sharedBindingController = sharedBindingController;
this.binderService = binderService;
}

@Override
public void listenerAdded(final ServiceController<? extends T> serviceController) {
if (serviceController.getState() == ServiceController.State.DOWN || serviceController.getState() == ServiceController.State.STOPPING) {
binderService.release();
serviceController.removeListener(this);
}
public void start(StartContext context) throws StartException {

}

@Override
public void transition(final ServiceController<? extends T> serviceController, final ServiceController.Transition transition) {
if (transition.getAfter() == ServiceController.Substate.STOPPING) {
binderService.release();
serviceController.removeListener(this);
public void stop(StopContext context) {
if(binderService.release()) {
//we are the last user, it needs to shut down
context.asynchronous();
sharedBindingController.addListener(new LifecycleListener() {
@Override
public void handleEvent(ServiceController<?> controller, LifecycleEvent event) {
if(event == LifecycleEvent.REMOVED) {
context.complete();
}
}
});
}
}

@Override
public BinderReleaseService getValue() throws IllegalStateException, IllegalArgumentException {
return null;
}
}
}
8 changes: 7 additions & 1 deletion naming/src/main/java/org/jboss/as/naming/service/BinderService.java
View file
Expand Up @@ -97,10 +97,16 @@ public void acquire() {
}
}

public void release() {
/**
* Releases the service, returns <code>true</code> if the service is removed as a result, or false otherwise
* @return
*/
public boolean release() {
if (refcnt != null && refcnt.decrementAndGet() <= 0 && controller != null) {
controller.setMode(ServiceController.Mode.REMOVE);
return true;
}
return false;
}

public ServiceName getServiceName() {
Expand Down

0 comments on commit e67439a

Please sign in to comment.