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

[Fix] Ensure updating read-only activities

This commit is contained in:
Robert von Burg 2023-07-20 16:33:22 +02:00
parent e35436b38d
commit 5e02e2a639
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
2 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
service/src/main/java/li/strolch/execution/Controller.java
View File

@ -1,12 +1,5 @@
package li.strolch.execution;
import static java.util.Collections.synchronizedMap;
import static li.strolch.execution.EventBasedExecutionHandler.PROP_LOCK_RETRIES;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import li.strolch.agent.api.ObserverEvent;
import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.StrolchLockException;
@ -26,6 +19,13 @@ import li.strolch.runtime.privilege.PrivilegedRunnableWithResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import static java.util.Collections.synchronizedMap;
import static li.strolch.execution.EventBasedExecutionHandler.PROP_LOCK_RETRIES;
public class Controller {
protected static final Logger logger = LoggerFactory.getLogger(Controller.class);
@ -165,8 +165,7 @@ public class Controller {
/**
* Executes the activity in the given TX. Keeps executing till no {@link Action} was set to {@link State#EXECUTED}
*
* @param tx
* the TX
* @param tx the TX
*/
public void execute(StrolchTransaction tx) {
lockWithRetries(tx);
@ -185,8 +184,7 @@ public class Controller {
/**
* Executes the activity in the given TX by calling the {@link PlanAndExecuteActivityCommand}
*
* @param tx
* the TX
* @param tx the TX
*
* @return true if execute should be called again, i.e. the
* {@link PlanAndExecuteActivityCommand#needsRetriggerOfExecution()} returns true and the activity isn't complete
@ -220,8 +218,7 @@ public class Controller {
* Completes the execution of the given {@link Action} with the given {@link Locator}, executing next
* {@link Action Actions} if possible
*
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to executed
* @param actionLoc the {@link Locator} of the {@link Action} to set to executed
*/
public void toExecuted(Locator actionLoc) throws Exception {
runAsAgent(ctx -> {
@ -244,10 +241,8 @@ public class Controller {
/**
* Completes the execution of the given {@link Action}. No further processing is done.
*
* @param tx
* the TX
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to executed
* @param tx the TX
* @param actionLoc the {@link Locator} of the {@link Action} to set to executed
*/
public void toExecuted(StrolchTransaction tx, Locator actionLoc) {
if (invalidActionContext(tx, actionLoc))
@ -271,10 +266,8 @@ public class Controller {
* {@link #toExecuted(StrolchTransaction, Locator)}. This method expects the associated {@link Activity} to already
* be locked, and validated that this action is in execution</p>
*
* @param tx
* the TX
* @param action
* the Action to set to executed
* @param tx the TX
* @param action the Action to set to executed
*/
public void setToExecuted(StrolchTransaction tx, Action action) {
@ -295,8 +288,7 @@ public class Controller {
* {@link State#EXECUTION}. Thus the execution thread stays with this activity, keeping resources bound to it, till
* we can wait and allow other activities to execute</p>
*
* @param tx
* the TX
* @param tx the TX
*/
protected void triggerExecute(StrolchTransaction tx) {
boolean trigger;
@ -308,8 +300,7 @@ public class Controller {
/**
* Sets the state of the {@link Action} with the given {@link Locator} to {@link State#STOPPED}
*
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to stopped
* @param actionLoc the {@link Locator} of the {@link Action} to set to stopped
*/
public void toStopped(Locator actionLoc) throws Exception {
runAsAgent(ctx -> {
@ -331,10 +322,8 @@ public class Controller {
/**
* Sets the state of the {@link Action} to {@link State#STOPPED}
*
* @param tx
* the TX
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to stopped
* @param tx the TX
* @param actionLoc the {@link Locator} of the {@link Action} to set to stopped
*/
public void toStopped(StrolchTransaction tx, Locator actionLoc) {
lockWithRetries(tx);
@ -355,8 +344,7 @@ public class Controller {
/**
* Sets the state of the {@link Action} with the given {@link Locator} to {@link State#ERROR}
*
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to executed
* @param actionLoc the {@link Locator} of the {@link Action} to set to executed
*/
public void toError(Locator actionLoc) throws Exception {
runAsAgent(ctx -> {
@ -377,10 +365,8 @@ public class Controller {
/**
* Sets the state of the {@link Action} to {@link State#ERROR}
*
* @param tx
* the TX
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to error
* @param tx the TX
* @param actionLoc the {@link Locator} of the {@link Action} to set to error
*/
public void toError(StrolchTransaction tx, Locator actionLoc) {
if (invalidActionContext(tx, actionLoc))
@ -401,8 +387,7 @@ public class Controller {
/**
* Sets the state of the {@link Action} with the given {@link Locator} to {@link State#WARNING}
*
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to warning
* @param actionLoc the {@link Locator} of the {@link Action} to set to warning
*/
public void toWarning(Locator actionLoc) throws Exception {
runAsAgent(ctx -> {
@ -425,10 +410,8 @@ public class Controller {
/**
* Sets the state of the {@link Action} with the given {@link Locator} to {@link State#WARNING}
*
* @param tx
* the TX
* @param actionLoc
* the {@link Locator} of the {@link Action} to set to error
* @param tx the TX
* @param actionLoc the {@link Locator} of the {@link Action} to set to error
*/
public void toWarning(StrolchTransaction tx, Locator actionLoc) {
if (invalidActionContext(tx, actionLoc))
@ -460,8 +443,8 @@ public class Controller {
} catch (StrolchLockException e) {
tries++;
if (tries >= this.lockRetries) {
logger.error("Failed to lock " + this.locator + ". Max retries " + tries
+ " reached, throwing exception!");
logger.error("Failed to lock " + this.locator + ". Max retries " + tries +
" reached, throwing exception!");
throw e;
}
@ -478,7 +461,7 @@ public class Controller {
return;
ObserverEvent observerEvent = new ObserverEvent();
observerEvent.updated.addElement(Tags.CONTROLLER, this.activity);
observerEvent.updated.addElement(Tags.CONTROLLER, this.activity.ensureReadOnly());
realm.getObserverHandler().notify(observerEvent);
}

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

@ -535,7 +535,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
return;
ObserverEvent observerEvent = new ObserverEvent();
observerEvent.added.addElement(Tags.CONTROLLER, controller.getActivity());
observerEvent.added.addElement(Tags.CONTROLLER, controller.getActivity().ensureReadOnly());
realm.getObserverHandler().notify(observerEvent);
}
@ -545,7 +545,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
return;
ObserverEvent observerEvent = new ObserverEvent();
observerEvent.removed.addElement(Tags.CONTROLLER, controller.getActivity());
observerEvent.removed.addElement(Tags.CONTROLLER, controller.getActivity().ensureReadOnly());
realm.getObserverHandler().notify(observerEvent);
}
@ -556,7 +556,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
ObserverEvent observerEvent = new ObserverEvent();
for (Controller controller : removed.values()) {
observerEvent.removed.addElement(Tags.CONTROLLER, controller.getActivity());
observerEvent.removed.addElement(Tags.CONTROLLER, controller.getActivity().ensureReadOnly());
}
realm.getObserverHandler().notify(observerEvent);
}