Repository: aurora Updated Branches: refs/heads/master f2acf53ff -> f8a7676b2
Remove maintenance request after a host is drained. Delete the `HostMaintenaceRequest` once the host has been `DRAINED`. Testing Done: ./build-support/jenkins/build.sh ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh Reviewed at https://reviews.apache.org/r/67479/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/f8a7676b Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/f8a7676b Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/f8a7676b Branch: refs/heads/master Commit: f8a7676b28b8cccc98c66eb5b9f2d528dc8400be Parents: f2acf53 Author: Santhosh Kumar Shanmugham <santhoshkuma...@gmail.com> Authored: Wed Jun 6 17:16:11 2018 -0700 Committer: Santhosh Kumar <sshanmug...@twitter.com> Committed: Wed Jun 6 17:16:11 2018 -0700 ---------------------------------------------------------------------- .../apache/aurora/scheduler/maintenance/MaintenanceController.java | 1 + .../scheduler/maintenance/MaintenanceControllerImplTest.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/f8a7676b/src/main/java/org/apache/aurora/scheduler/maintenance/MaintenanceController.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/maintenance/MaintenanceController.java b/src/main/java/org/apache/aurora/scheduler/maintenance/MaintenanceController.java index dd2462d..7fc5990 100644 --- a/src/main/java/org/apache/aurora/scheduler/maintenance/MaintenanceController.java +++ b/src/main/java/org/apache/aurora/scheduler/maintenance/MaintenanceController.java @@ -256,6 +256,7 @@ public interface MaintenanceController { if (Iterables.isEmpty(activeTasks)) { LOG.info("Moving host {} into DRAINED", host); setMaintenanceMode(store, ImmutableSet.of(host), DRAINED); + store.getHostMaintenanceStore().removeHostMaintenanceRequest(host); } else { LOG.info("Host {} is DRAINING with active tasks: {}", host, Tasks.ids(activeTasks)); } http://git-wip-us.apache.org/repos/asf/aurora/blob/f8a7676b/src/test/java/org/apache/aurora/scheduler/maintenance/MaintenanceControllerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/maintenance/MaintenanceControllerImplTest.java b/src/test/java/org/apache/aurora/scheduler/maintenance/MaintenanceControllerImplTest.java index 28c62a1..c9390df 100644 --- a/src/test/java/org/apache/aurora/scheduler/maintenance/MaintenanceControllerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/maintenance/MaintenanceControllerImplTest.java @@ -190,6 +190,8 @@ public class MaintenanceControllerImplTest extends EasyMockTest { expectMaintenanceModeChange(HOST_A, DRAINED); expectMaintenanceModeChange(HOST_A, NONE); storageUtil.hostMaintenanceStore.removeHostMaintenanceRequest(HOST_A); + // end maintenance + storageUtil.hostMaintenanceStore.removeHostMaintenanceRequest(HOST_A); control.replay();
