Repository: ambari Updated Branches: refs/heads/trunk 259e56298 -> 8dba77e8b
AMBARI-8784 - Unable To Move Manual Task From HOLDING to COMPLETED Via API (tbeerbower) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8dba77e8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8dba77e8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8dba77e8 Branch: refs/heads/trunk Commit: 8dba77e8b50b1189790c9000089fce160d4073a3 Parents: 259e562 Author: tbeerbower <[email protected]> Authored: Thu Dec 18 10:01:15 2014 -0500 Committer: tbeerbower <[email protected]> Committed: Thu Dec 18 10:01:28 2014 -0500 ---------------------------------------------------------------------- .../server/controller/internal/StageResourceProvider.java | 6 ++++-- .../controller/internal/UpgradeItemResourceProvider.java | 6 ++++-- ambari-server/src/main/resources/key_properties.json | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8dba77e8/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java index 24d7b2c..f2ea76d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java @@ -232,12 +232,14 @@ public class StageResourceProvider extends AbstractResourceProvider implements E /** * Update the stage identified by the given stage id with the desired status. * + * @param requestId the request id * @param stageId the stage id * @param desiredStatus the desired stage status */ - public static void updateStageStatus(long stageId, HostRoleStatus desiredStatus) { + public static void updateStageStatus(long requestId, long stageId, HostRoleStatus desiredStatus) { Predicate predicate = - new PredicateBuilder().property(STAGE_STAGE_ID).equals(stageId).toPredicate(); + new PredicateBuilder().property(STAGE_STAGE_ID).equals(stageId). + and().property(STAGE_REQUEST_ID).equals(requestId).toPredicate(); List<StageEntity> entityList = dao.findAll(PropertyHelper.getReadRequest(), predicate); for (StageEntity stageEntity : entityList) { http://git-wip-us.apache.org/repos/asf/ambari/blob/8dba77e8/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java index ad6ae1f..d829e20 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java @@ -117,8 +117,10 @@ public class UpgradeItemResourceProvider extends ReadOnlyResourceProvider { for (Resource resource : resources) { // Set the desired status on the underlying stage. - Long stageId = (Long) resource.getPropertyValue(UPGRADE_ITEM_STAGE_ID); - StageResourceProvider.updateStageStatus(stageId, desiredStatus); + Long requestId = (Long) resource.getPropertyValue(UPGRADE_REQUEST_ID); + Long stageId = (Long) resource.getPropertyValue(UPGRADE_ITEM_STAGE_ID); + + StageResourceProvider.updateStageStatus(requestId, stageId, desiredStatus); } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/8dba77e8/ambari-server/src/main/resources/key_properties.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/key_properties.json b/ambari-server/src/main/resources/key_properties.json index 5b8947f..3898963 100644 --- a/ambari-server/src/main/resources/key_properties.json +++ b/ambari-server/src/main/resources/key_properties.json @@ -40,7 +40,9 @@ "Task": { "Cluster": "Tasks/cluster_name", "Request": "Tasks/request_id", + "Upgrade": "Tasks/request_id", "Stage": "Tasks/stage_id", + "UpgradeItem": "Tasks/stage_id", "Task": "Tasks/id" }, "User": {
