Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed reservation problem in concurrent execution

This commit is contained in:
Robert von Burg 2017-10-09 12:31:02 +02:00
parent efb15f305c
commit c7fc11f563
6 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li.strolch.service/src/main/java/li/strolch/execution/DelayedExecutionTimer.java
View File

@ -31,7 +31,7 @@ public interface DelayedExecutionTimer {
/** /**
* Cancels any delayed execution for the given {@link Locator} * Cancels any delayed execution for the given {@link Locator}
* *
* @param actionLocator * @param locator
* the {@link Action}'s {@link Locator} * the {@link Action}'s {@link Locator}
*/ */
void cancel(Locator locator); void cancel(Locator locator);

36
li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
View File

@ -33,7 +33,7 @@ import li.strolch.utils.dbc.DBC;
/** /**
* The event based execution handler waits for events in that the {@link ExecutionPolicy} implementations must call the * The event based execution handler waits for events in that the {@link ExecutionPolicy} implementations must call the
* relevant methods when the work is complete. Afterwards the next {@link Action} in the procedure is executed * relevant methods when the work is complete. Afterwards the next {@link Action} in the procedure is executed
* *
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */
public class EventBasedExecutionHandler extends ExecutionHandler { public class EventBasedExecutionHandler extends ExecutionHandler {
@ -70,9 +70,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
logger.info("Not restarting execution of activities."); logger.info("Not restarting execution of activities.");
} else { } else {
logger.info("Restarting execution of activities."); logger.info("Restarting execution of activities.");
runAsAgent(ctx -> { runAsAgent(this::restartActivityExecution);
restartActivityExecution(ctx);
});
} }
super.start(); super.start();
@ -182,7 +180,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
if (getContainer().hasComponent(OperationsLog.class)) { if (getContainer().hasComponent(OperationsLog.class)) {
getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION, getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION,
ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.execution") ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.execution")
.value("reason", e)); .value("reason", e));
} }
} }
}); });
@ -201,7 +199,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
if (getContainer().hasComponent(OperationsLog.class)) { if (getContainer().hasComponent(OperationsLog.class)) {
getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION, getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION,
ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.executed") ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.executed")
.value("reason", e)); .value("reason", e));
} }
} }
}); });
@ -220,7 +218,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
if (getContainer().hasComponent(OperationsLog.class)) { if (getContainer().hasComponent(OperationsLog.class)) {
getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION, getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION,
ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.stopped") ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.stopped")
.value("reason", e)); .value("reason", e));
} }
} }
}); });
@ -239,7 +237,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
if (getContainer().hasComponent(OperationsLog.class)) { if (getContainer().hasComponent(OperationsLog.class)) {
getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION, getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION,
ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.error") ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.error")
.value("reason", e)); .value("reason", e));
} }
} }
}); });
@ -258,7 +256,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
if (getContainer().hasComponent(OperationsLog.class)) { if (getContainer().hasComponent(OperationsLog.class)) {
getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION, getComponent(OperationsLog.class).addMessage(new LogMessage(realm, locator, LogSeverity.EXCEPTION,
ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.warning") ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.warning")
.value("reason", e)); .value("reason", e));
} }
} }
}); });
@ -294,10 +292,10 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
logger.error("Failed to archive " + activityLoc + " due to " + e.getMessage(), e); logger.error("Failed to archive " + activityLoc + " due to " + e.getMessage(), e);
if (getContainer().hasComponent(OperationsLog.class)) { if (getContainer().hasComponent(OperationsLog.class)) {
getComponent(OperationsLog.class) getComponent(OperationsLog.class).addMessage(
.addMessage(new LogMessage(realm, activityLoc, LogSeverity.EXCEPTION, new LogMessage(realm, activityLoc, LogSeverity.EXCEPTION,
ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.archive") ResourceBundle.getBundle("strolch-service"), "execution.handler.failed.archive")
.value("reason", e)); .value("reason", e));
} }
} }
}); });
@ -320,7 +318,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
ExecuteActivityCommand command = new ExecuteActivityCommand(getContainer(), tx); ExecuteActivityCommand command = new ExecuteActivityCommand(getContainer(), tx);
command.setActivity(activity); command.setActivity(activity);
tx.addCommand(command); command.doCommand();
tx.commitOnClose(); tx.commitOnClose();
} }
@ -339,7 +337,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
// set this action to executed // set this action to executed
SetActionToExecutedCommand command = new SetActionToExecutedCommand(getContainer(), tx); SetActionToExecutedCommand command = new SetActionToExecutedCommand(getContainer(), tx);
command.setAction(action); command.setAction(action);
tx.addCommand(command); command.doCommand();
// flush so we can see that changes performed // flush so we can see that changes performed
tx.flush(); tx.flush();
@ -361,9 +359,9 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
ExecuteActivityCommand execCommand = new ExecuteActivityCommand(getContainer(), tx); ExecuteActivityCommand execCommand = new ExecuteActivityCommand(getContainer(), tx);
execCommand.setActivity(activity); execCommand.setActivity(activity);
tx.addCommand(execCommand); execCommand.doCommand();
// flush so we can see that changes performed // flush so we can see the changes performed
tx.flush(); tx.flush();
} }
@ -384,7 +382,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
SetActionToWarningCommand command = new SetActionToWarningCommand(getContainer(), tx); SetActionToWarningCommand command = new SetActionToWarningCommand(getContainer(), tx);
command.setAction((Action) elem); command.setAction((Action) elem);
tx.addCommand(command); command.doCommand();
tx.commitOnClose(); tx.commitOnClose();
} }
@ -400,7 +398,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
SetActionToErrorCommand command = new SetActionToErrorCommand(getContainer(), tx); SetActionToErrorCommand command = new SetActionToErrorCommand(getContainer(), tx);
command.setAction((Action) elem); command.setAction((Action) elem);
tx.addCommand(command); command.doCommand();
tx.commitOnClose(); tx.commitOnClose();
} }
@ -416,7 +414,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
SetActionToStoppedCommand command = new SetActionToStoppedCommand(getContainer(), tx); SetActionToStoppedCommand command = new SetActionToStoppedCommand(getContainer(), tx);
command.setAction((Action) elem); command.setAction((Action) elem);
tx.addCommand(command); command.doCommand();
tx.commitOnClose(); tx.commitOnClose();
} }

23
li.strolch.service/src/main/java/li/strolch/execution/command/ExecutionCommand.java
View File

@ -19,8 +19,6 @@ import li.strolch.model.activity.TimeOrderingVisitor;
import li.strolch.model.policy.PolicyDef; import li.strolch.model.policy.PolicyDef;
import li.strolch.model.visitor.IActivityElementVisitor; import li.strolch.model.visitor.IActivityElementVisitor;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.persistence.api.UpdateActivityCommand;
import li.strolch.persistence.api.UpdateOrderCommand;
import li.strolch.policy.PolicyHandler; import li.strolch.policy.PolicyHandler;
import li.strolch.service.api.Command; import li.strolch.service.api.Command;
import li.strolch.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
@ -39,8 +37,7 @@ public abstract class ExecutionCommand extends Command implements TimeOrderingVi
if (StringHelper.isEmpty(resourceType) || resourceType.equals(DASH)) if (StringHelper.isEmpty(resourceType) || resourceType.equals(DASH))
throw new StrolchException("No resourceType defined on action " + action.getLocator()); throw new StrolchException("No resourceType defined on action " + action.getLocator());
Resource resource = tx.getResourceBy(resourceType, resourceId, true); return tx.getResourceBy(resourceType, resourceId, true);
return resource;
} }
protected void updateOrderState(Activity rootElement, State currentState, State newState) { protected void updateOrderState(Activity rootElement, State currentState, State newState) {
@ -56,9 +53,7 @@ public abstract class ExecutionCommand extends Command implements TimeOrderingVi
order.setState(rootElement.getState()); order.setState(rootElement.getState());
UpdateOrderCommand cmd = new UpdateOrderCommand(getContainer(), tx()); tx().update(order);
cmd.setOrder(order);
cmd.doCommand();
} }
protected ExecutionPolicy getExecutionPolicy(Action action) { protected ExecutionPolicy getExecutionPolicy(Action action) {
@ -89,8 +84,8 @@ public abstract class ExecutionCommand extends Command implements TimeOrderingVi
// in series we can never have two Actions in execution, so if we found the action in execution, we stop // in series we can never have two Actions in execution, so if we found the action in execution, we stop
if (element instanceof Action // if (element instanceof Action //
&& (state == State.EXECUTION // && (state == State.EXECUTION //
|| state == State.WARNING // || state == State.WARNING //
|| state == State.ERROR)) { || state == State.ERROR)) {
break; break;
} }
@ -155,7 +150,11 @@ public abstract class ExecutionCommand extends Command implements TimeOrderingVi
public Void visitAction(Action action) { public Void visitAction(Action action) {
ExecutionPolicy executionPolicy = getExecutionPolicy(action); ExecutionPolicy executionPolicy = getExecutionPolicy(action);
if (executionPolicy.isExecutable(action)) { if (!executionPolicy.isExecutable(action)) {
logger.info("Action " + action.getLocator() + " is not yet executable.");
} else {
logger.info("Action " + action.getLocator() + " is now being executed...");
// we catch all exceptions because we can't undo, thus need to set the state to ERROR in this case // we catch all exceptions because we can't undo, thus need to set the state to ERROR in this case
// this is only required because we execute actions in same TX as we set to executed any previous actions // this is only required because we execute actions in same TX as we set to executed any previous actions
@ -166,9 +165,7 @@ public abstract class ExecutionCommand extends Command implements TimeOrderingVi
logger.error("Failed to set " + action.getLocator() + " to execution due to " + e.getMessage(), e); logger.error("Failed to set " + action.getLocator() + " to execution due to " + e.getMessage(), e);
action.setState(State.ERROR); action.setState(State.ERROR);
UpdateActivityCommand command = new UpdateActivityCommand(getContainer(), tx()); tx().update(action.getRootElement());
command.setActivity(action.getRootElement());
command.doCommand();
getConfirmationPolicy(action).toError(action); getConfirmationPolicy(action).toError(action);
} }

12
li.strolch.service/src/main/java/li/strolch/execution/policy/ExecutionPolicy.java
View File

@ -9,7 +9,6 @@ import li.strolch.model.State;
import li.strolch.model.activity.Action; import li.strolch.model.activity.Action;
import li.strolch.model.activity.Activity; import li.strolch.model.activity.Activity;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.persistence.api.UpdateActivityCommand;
import li.strolch.policy.StrolchPolicy; import li.strolch.policy.StrolchPolicy;
import li.strolch.privilege.base.PrivilegeException; import li.strolch.privilege.base.PrivilegeException;
import li.strolch.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
@ -123,9 +122,7 @@ public abstract class ExecutionPolicy extends StrolchPolicy {
action.setState(state); action.setState(state);
UpdateActivityCommand command = new UpdateActivityCommand(getContainer(), tx()); tx().update(action.getRootElement());
command.setActivity(action.getRootElement());
command.doCommand();
String msg = "Action " + action.getLocator() + " is now in state " + state; String msg = "Action " + action.getLocator() + " is now in state " + state;
if (state == State.ERROR) if (state == State.ERROR)
@ -158,9 +155,6 @@ public abstract class ExecutionPolicy extends StrolchPolicy {
* {@link ComponentContainer#getRealm(Certificate)}. This transaction should be used in a try-with-resource clause * {@link ComponentContainer#getRealm(Certificate)}. This transaction should be used in a try-with-resource clause
* so it is properly closed. * so it is properly closed.
* *
* @param action
* the action to use for the opened TX
*
* @return the open {@link StrolchTransaction} * @return the open {@link StrolchTransaction}
* *
* @throws StrolchException * @throws StrolchException
@ -175,12 +169,12 @@ public abstract class ExecutionPolicy extends StrolchPolicy {
} }
/** /**
* Performs the given {@link PrivilegedRunnable} as the system user {@link StrolchConstants#SYSTEM_USER_EXECUTION} * Performs the given {@link PrivilegedRunnable} as the system user {@link StrolchConstants#SYSTEM_USER_AGENT}
* *
* @param runnable * @param runnable
* the runnable to perform * the runnable to perform
* *
* @throws PrivilegeException * @throws PrivilegeException if the agent is missing the privilege
*/ */
protected void runAsAgent(PrivilegedRunnable runnable) throws PrivilegeException { protected void runAsAgent(PrivilegedRunnable runnable) throws PrivilegeException {
getContainer().getPrivilegeHandler().runAs(StrolchConstants.SYSTEM_USER_AGENT, runnable); getContainer().getPrivilegeHandler().runAs(StrolchConstants.SYSTEM_USER_AGENT, runnable);

22
li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExection.java
View File

@ -8,7 +8,6 @@ import li.strolch.model.State;
import li.strolch.model.activity.Action; import li.strolch.model.activity.Action;
import li.strolch.model.parameter.BooleanParameter; import li.strolch.model.parameter.BooleanParameter;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.persistence.api.UpdateResourceCommand;
/** /**
* <p> * <p>
@ -17,12 +16,12 @@ import li.strolch.persistence.api.UpdateResourceCommand;
* and only allows execution if the value is false, in which case the {@link #toExecution(Action)} method sets the value * and only allows execution if the value is false, in which case the {@link #toExecution(Action)} method sets the value
* to true, and the {@link #toExecuted(Action)} method returns the value to false. * to true, and the {@link #toExecuted(Action)} method returns the value to false.
* </p> * </p>
* *
* <p> * <p>
* <b>Note:</b> the reservation is done for {@link Action} of type {@link #TYPE_RESERVE} and releasing is done for * <b>Note:</b> the reservation is done for {@link Action} of type {@link #TYPE_RESERVE} and releasing is done for
* {@link Action} of type {@link #TYPE_RELEASE} * {@link Action} of type {@link #TYPE_RELEASE}
* </p> * </p>
* *
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */
public class ReservationExection extends DurationExecution { public class ReservationExection extends DurationExecution {
@ -39,6 +38,8 @@ public class ReservationExection extends DurationExecution {
@Override @Override
public boolean isExecutable(Action action) { public boolean isExecutable(Action action) {
tx().lock(getResource(action));
// only check if reserve // only check if reserve
if (!action.getType().equals(TYPE_RESERVE) && !action.getType().equals(TYPE_RELEASE)) { if (!action.getType().equals(TYPE_RESERVE) && !action.getType().equals(TYPE_RELEASE)) {
// otherwise delegate to super class // otherwise delegate to super class
@ -56,16 +57,19 @@ public class ReservationExection extends DurationExecution {
Resource resource = getResource(action); Resource resource = getResource(action);
if (!resource.hasParameter(BAG_PARAMETERS, PARAM_RESERVED)) if (!resource.hasParameter(BAG_PARAMETERS, PARAM_RESERVED))
throw new StrolchModelException("Parameter " + PARAM_RESERVED + " on bag " + BAG_PARAMETERS + " missing on " throw new StrolchModelException(
+ resource.getLocator()); "Parameter " + PARAM_RESERVED + " on bag " + BAG_PARAMETERS + " missing on " + resource
.getLocator());
BooleanParameter reservedP = resource.getParameter(BAG_PARAMETERS, PARAM_RESERVED); BooleanParameter reservedP = resource.getParameter(BAG_PARAMETERS, PARAM_RESERVED);
return reservedP.getValue().booleanValue(); return reservedP.getValue();
} }
@Override @Override
public void toExecution(Action action) { public void toExecution(Action action) {
tx().lock(getResource(action));
// only do if reserve // only do if reserve
if (!action.getType().equals(TYPE_RESERVE) && !action.getType().equals(TYPE_RELEASE)) { if (!action.getType().equals(TYPE_RESERVE) && !action.getType().equals(TYPE_RELEASE)) {
// otherwise delegate to super class // otherwise delegate to super class
@ -86,6 +90,8 @@ public class ReservationExection extends DurationExecution {
@Override @Override
public void toExecuted(Action action) { public void toExecuted(Action action) {
tx().lock(getResource(action));
// only do if release // only do if release
if (!action.getType().equals(TYPE_RESERVE) && !action.getType().equals(TYPE_RELEASE)) { if (!action.getType().equals(TYPE_RESERVE) && !action.getType().equals(TYPE_RELEASE)) {
// otherwise delegate to super class // otherwise delegate to super class
@ -109,8 +115,6 @@ public class ReservationExection extends DurationExecution {
reservedP.setValue(reserved); reservedP.setValue(reserved);
// save changes // save changes
UpdateResourceCommand command = new UpdateResourceCommand(getContainer(), tx()); tx().update(resource);
command.setResource(resource);
command.doCommand();
} }
} }

8
li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java
View File

@ -13,7 +13,7 @@ import li.strolch.persistence.api.StrolchTransaction;
* The {@link ToErrorReservationExecution} executes same as {@link ReservationExection} with the difference that * The {@link ToErrorReservationExecution} executes same as {@link ReservationExection} with the difference that
* {@link #isExecutable(Action)} always returns true, and if the action's resource is currently reserved, the execution * {@link #isExecutable(Action)} always returns true, and if the action's resource is currently reserved, the execution
* fails and the state is set to ERROR * fails and the state is set to ERROR
* *
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */
public class ToErrorReservationExecution extends ReservationExection { public class ToErrorReservationExecution extends ReservationExection {
@ -28,6 +28,8 @@ public class ToErrorReservationExecution extends ReservationExection {
@Override @Override
public boolean isExecutable(Action action) { public boolean isExecutable(Action action) {
tx().lock(getResource(action));
if (action.getType().equals(TYPE_RESERVE)) { if (action.getType().equals(TYPE_RESERVE)) {
return true; return true;
} }
@ -38,11 +40,13 @@ public class ToErrorReservationExecution extends ReservationExection {
@Override @Override
public void toExecution(Action action) { public void toExecution(Action action) {
tx().lock(getResource(action));
if (action.getType().equals(TYPE_RESERVE) && isReserved(action)) { if (action.getType().equals(TYPE_RESERVE) && isReserved(action)) {
setActionState(action, State.EXECUTION); setActionState(action, State.EXECUTION);
toError(new LogMessage(tx().getRealmName(), action.getLocator(), LogSeverity.ERROR, toError(new LogMessage(tx().getRealmName(), action.getLocator(), LogSeverity.ERROR,
ResourceBundle.getBundle("strolch-service"), "execution.policy.reservation.alreadyReserved") ResourceBundle.getBundle("strolch-service"), "execution.policy.reservation.alreadyReserved")
.value("resourceLoc", getResource(action).getLocator().toString())); .value("resourceLoc", getResource(action).getLocator().toString()));
} else { } else {
super.toExecution(action); super.toExecution(action);
} }