Branch: refs/heads/storage_workflow Home: https://github.com/rhq-project/rhq Commit: 18cbe1fafd4b9e19ea4c1c1e82ada56fd9c66098 https://github.com/rhq-project/rhq/commit/18cbe1fafd4b9e19ea4c1c1e82ada56fd9... Author: John Sanda jsanda@redhat.com Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/storage/MaintenanceStep.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FailedStepRunner.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/TestStepCalculator.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/DefaultCalculatorLookup.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/FailedRepairCalculator.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/StepCalculator.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/UndeployCalculator.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ResourceOperationStepRunner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RunRepair.java
Log Message: ----------- [BZ 1120418] move creation of new job for failed step into the step runner
Prior to this commit when a step whose failure strategy is CONTINUE fails, we called the StepCalculator to produce a new job for the failed step. The StepRunner now produces the new job. There are a couple of reasons for the change. First, it eliminates branching logic that would be necessary in the StepCalculator. Secondly, the step runner may have info from the failed execution that needs to be included as input to the new job. This is the case with repair. When a repair operation fails, we want to get the failed ranges from the operation history results, and pass those as params to a new job to rerun repair on said ranges. That operation history is already available to the step runner. It would have been difficult to make it availble to the StepCalculator.
rhq-commits@lists.fedorahosted.org
-
John Sanda