This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from a19f974705 remove stale comments
add a4da3a3622 persist workflows in sensor
add 83ec6fc551 better distinguish different classes of interruption
add 44f4e71e49 replay workflow from specified points or current point
add a689819231 ensure workflow effector sets the internal workflow state
sensor synchronously
add b3d00859fe can replay workflow after shutdown
add 2a6fa16a8f allow replay-from-last to descend into nested workflow
add 5ef6f163ee after rebind, mark workflows that were running as shutdown
failed, then replay from failure point
add 827effe77b better info on test failing in jenkins but passing locally
add 1c980f02cc REST API for workflows
add 7473f0519c minor additions to workflow
add 14f24039fc when logbook is queried for descendants of a task, also
include workflow it was part of
add df2299d8bb store all task IDs for a workflow and subworkflow IDs
add 4fa37b8b59 better cancellation for tasks, and REST API supports
cancelling task
add ebfa455d01 change workflow api to match activities and others
add e9b43c734c store more info on workflow replays and other metadata on
steps
add 126c9fd2fa use tags for entity initialization tasks, top-level tasks
add 5440e64770 support replay in backend, with some refactor
add 74150e6997 tidy task extended summary
add 5a1ebfbcca minor fixes for replay
add 0ae2c7d728 error handler for workflow
add 64c9153060 more DslPredicates to support errors -- java-instance-of
more powerful
add c52df620cc error-cause is working
add 33d14867e1 add error field lookup
add 32402f5299 change error-cause to be a filter, with default
add 3de540267b timeout and onError working, for steps and workflow
add 52e0a4bd0c require ... for multimatch, and allow inline before a
literal
add 4012c75093 tidy logging and task naming for error handling
add 42f443636a make ssh workflow step easier to be reused (eg for ansible
ssh workflow step)
add 397de8c3e1 retry step working, with tests
add d72df592d7 support workflow for software process entities
add 500e4ead73 add retry backoff, and test and fix on-error retry behaviour
new a50296510d address code review comments, improve https support
new 84876d12fd make step output available on errors, and improve short
name metadata for types
new a33153f6c8 block type instantiation for steps
new ccf3cc8e65 REST API to run workflow, and tidy workflow submission
metadata
new 286eb0d4a0 fix typo
new 5b2c5aa310 ensure ssh workflow step fails if non-zero exit code
new bed78cd487 use constants for special steps -1 -2
new 89c2662604 fix bug where location tags get set as config on some
locations
new 6d47a190ef merge master - fix location tags
new 4062c3ab7d misc workflow fixes - more details, including error and
rest calls
new b35bab6dcd workflow basic expiry, and more workflow fixes
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../brooklyn/api/entity/EntityInitializer.java | 7 +-
.../brooklyn/camp/brooklyn/LocationsYamlTest.java | 15 +-
.../camp/brooklyn/WorkflowExpressionsYamlTest.java | 4 +-
.../brooklyn/camp/brooklyn/WorkflowYamlTest.java | 88 +-
.../brooklyn/core/effector/AbstractEffector.java | 2 +-
.../brooklyn/core/effector/EffectorTasks.java | 6 +-
.../apache/brooklyn/core/effector/Effectors.java | 30 +-
.../brooklyn/core/entity/AbstractEntity.java | 2 +-
.../org/apache/brooklyn/core/entity/Entities.java | 1 +
.../core/location/BasicLocationRegistry.java | 23 +-
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 106 ++-
.../brooklyn/core/mgmt/internal/EffectorUtils.java | 4 +-
.../mgmt/internal/EntityManagementSupport.java | 193 +++--
.../core/mgmt/internal/LocalManagementContext.java | 10 +-
.../brooklyn/core/mgmt/rebind/RebindIteration.java | 4 +-
.../core/mgmt/rebind/RebindManagerImpl.java | 2 +-
.../resolve/jackson/AsPropertyIfAmbiguous.java | 31 +-
.../resolve/jackson/CommonTypesSerialization.java | 29 +-
.../jackson/JsonPassThroughDeserializer.java | 59 ++
.../core/workflow/DanglingWorkflowException.java | 19 +-
.../brooklyn/core/workflow/ShorthandProcessor.java | 162 ++--
.../core/workflow/WorkflowCommonConfig.java | 19 +-
.../brooklyn/core/workflow/WorkflowEffector.java | 76 +-
.../core/workflow/WorkflowErrorHandling.java | 146 ++++
.../core/workflow/WorkflowExecutionContext.java | 919 ++++++++++++++++++---
.../workflow/WorkflowExpressionResolution.java | 31 +-
.../core/workflow/WorkflowReplayUtils.java | 236 ++++++
.../brooklyn/core/workflow/WorkflowSensor.java | 4 +-
.../core/workflow/WorkflowStepDefinition.java | 144 +++-
.../WorkflowStepInstanceExecutionContext.java | 106 ++-
.../core/workflow/WorkflowStepResolution.java | 46 +-
.../core/workflow/steps/CustomWorkflowStep.java | 101 ++-
.../core/workflow/steps/EntityValueToSet.java | 2 +
.../core/workflow/steps/HttpWorkflowStep.java | 14 +-
.../workflow/steps/InvokeEffectorWorkflowStep.java | 55 +-
.../core/workflow/steps/LogWorkflowStep.java | 2 +-
.../core/workflow/steps/RetryWorkflowStep.java | 280 +++++++
.../core/workflow/steps/ReturnWorkflowStep.java | 2 +-
.../core/workflow/steps/SetConfigWorkflowStep.java | 9 +-
.../core/workflow/steps/SetSensorWorkflowStep.java | 24 +-
.../workflow/steps/SetVariableWorkflowStep.java | 59 +-
.../core/workflow/steps/SshWorkflowStep.java | 35 +-
.../core/workflow/steps/TypedValueToSet.java | 2 +
.../core/workflow/steps/WaitWorkflowStep.java | 167 +---
.../store/WorkflowStatePersistenceViaSensors.java | 123 +++
.../brooklyn/util/core/config/ConfigBag.java | 8 +-
.../util/core/internal/ssh/sshj/SshjTool.java | 2 +-
.../util/core/logbook/DelegatingLogStore.java | 6 +
.../brooklyn/util/core/logbook/LogStore.java | 47 +-
.../util/core/logbook/file/FileLogStore.java | 21 +-
.../logbook/opensearch/OpenSearchLogStore.java | 17 +-
.../util/core/predicates/DslPredicates.java | 162 +++-
.../apache/brooklyn/util/core/task/BasicTask.java | 360 ++++----
.../util/core/task/DynamicSequentialTask.java | 2 +-
.../brooklyn/util/core/task/ScheduledTask.java | 38 +-
.../brooklyn/util/core/task/TaskBuilder.java | 20 +-
.../org/apache/brooklyn/util/core/task/Tasks.java | 11 +-
.../brooklyn/util/core/text/TemplateProcessor.java | 16 +-
.../core/effector/SampleManyTasksEffector.java | 16 +-
.../core/mgmt/rebind/RebindLocationTest.java | 3 +-
.../core/mgmt/rebind/RebindTestFixture.java | 15 +-
.../core/workflow/ShorthandProcessorTest.java | 13 +
.../brooklyn/core/workflow/WorkflowBasicTest.java | 31 +-
.../core/workflow/WorkflowBeefyStepTest.java | 53 +-
.../workflow/WorkflowInputOutputExtensionTest.java | 30 +
.../workflow/WorkflowPersistReplayErrorsTest.java | 662 +++++++++++++++
.../brooklyn/core/workflow/WorkflowRetryTest.java | 324 ++++++++
.../logbook/opensearch/OpenSearchLogStoreTest.java | 28 +-
.../util/core/predicates/DslPredicateTest.java | 101 ++-
karaf/init/src/main/resources/catalog.bom | 32 +-
.../org/apache/brooklyn/rest/api/ActivityApi.java | 16 +
.../org/apache/brooklyn/rest/api/EntityApi.java | 91 ++
.../brooklyn/rest/resources/ActivityResource.java | 8 +
.../brooklyn/rest/resources/EntityResource.java | 84 +-
.../brooklyn/rest/resources/ActivityRestTest.java | 440 ++++++----
.../rest/resources/EntityWorkflowsRestTest.java | 127 +++
.../util/json/BrooklynJacksonSerializerTest.java | 5 +-
...laProcess.java => WorkflowSoftwareProcess.java} | 42 +-
...ver.java => WorkflowSoftwareProcessDriver.java} | 2 +-
...sImpl.java => WorkflowSoftwareProcessImpl.java} | 4 +-
.../base/WorkflowSoftwareProcessSshDriver.java | 150 ++++
.../tasks/kubectl/ContainerWorkflowStep.java | 9 +-
.../software/base/WorkflowSoftwareProcessTest.java | 142 ++++
.../brooklyn/location/winrm/WinrmWorkflowStep.java | 4 +-
.../java/org/apache/brooklyn/test/Asserts.java | 21 +-
.../brooklyn/util/exceptions/Exceptions.java | 37 +-
.../exceptions/RuntimeInterruptedException.java | 26 +-
.../brooklyn/util/http/executor/HttpConfig.java | 5 +
.../brooklyn/util/http/executor/HttpRequest.java | 2 +-
.../executor/apacheclient/HttpExecutorImpl.java | 3 +-
.../org/apache/brooklyn/util/time/Duration.java | 11 +
91 files changed, 5579 insertions(+), 1067 deletions(-)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/JsonPassThroughDeserializer.java
copy
rest/rest-server/src/main/java/org/apache/brooklyn/rest/NopSecurityHandler.java
=>
core/src/main/java/org/apache/brooklyn/core/workflow/DanglingWorkflowException.java
(63%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowErrorHandling.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowReplayUtils.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/RetryWorkflowStep.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/store/WorkflowStatePersistenceViaSensors.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowRetryTest.java
create mode 100644
rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/EntityWorkflowsRestTest.java
copy
software/base/src/main/java/org/apache/brooklyn/entity/software/base/{AbstractVanillaProcess.java
=> WorkflowSoftwareProcess.java} (57%)
copy
software/base/src/main/java/org/apache/brooklyn/entity/software/base/{VanillaSoftwareProcessDriver.java
=> WorkflowSoftwareProcessDriver.java} (91%)
copy
software/base/src/main/java/org/apache/brooklyn/entity/software/base/{VanillaSoftwareProcessImpl.java
=> WorkflowSoftwareProcessImpl.java} (94%)
create mode 100644
software/base/src/main/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcessSshDriver.java
create mode 100644
software/base/src/test/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcessTest.java
