revert using constants for cancel

skypilot-org · Aug 27, 2024 · 7a26edc · 7a26edc
1 parent 68af033
commit 7a26edc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/sky/cli.py b/sky/cli.py
@@ -2257,7 +2257,7 @@ def autostop(
             'Only one of --idle-minutes and --cancel should be specified. '
             f'cancel: {cancel}, idle_minutes: {idle_minutes}')
     if cancel:
-        idle_minutes = constants.IDLE_MINUTES_TO_AUTOSTOP_FOR_CANCEL
+        idle_minutes = -1
     elif idle_minutes is None:
         idle_minutes = 5
     _down_or_stop_clusters(clusters,
@@ -2704,8 +2704,7 @@ def _down_or_stop_clusters(
 
     operation = 'Terminating' if down else 'Stopping'
     if idle_minutes_to_autostop is not None:
-        is_cancel = (idle_minutes_to_autostop ==
-                     constants.IDLE_MINUTES_TO_AUTOSTOP_FOR_CANCEL)
+        is_cancel = idle_minutes_to_autostop < 0
         verb = 'Cancelling' if is_cancel else 'Scheduling'
         option_str = 'down' if down else 'stop'
         if is_cancel:

diff --git a/sky/core.py b/sky/core.py
@@ -453,7 +453,7 @@ def autostop(
         sky.exceptions.CloudUserIdentityError: if we fail to get the current
           user identity.
     """
-    is_cancel = idle_minutes == constants.IDLE_MINUTES_TO_AUTOSTOP_FOR_CANCEL
+    is_cancel = idle_minutes < 0
     verb = 'Cancelling' if is_cancel else 'Scheduling'
     option_str = 'down' if down else 'stop'
     if is_cancel:

diff --git a/sky/provision/kubernetes/utils.py b/sky/provision/kubernetes/utils.py
@@ -1849,8 +1849,8 @@ def set_autodown_annotations(handle: 'backends.CloudVmRayResourceHandle',
                                      annotation=annotation,
                                      namespace=namespace)
 
-        elif (idle_minutes_to_autostop is not None and idle_minutes_to_autostop
-              == constants.IDLE_MINUTES_TO_AUTOSTOP_FOR_CANCEL):
+        elif (idle_minutes_to_autostop is not None and
+              idle_minutes_to_autostop < 0):
             for annotation_key in annotation_keys:
                 _remove_pod_annotations(pod=pod,
                                         annotation_key=annotation_key,

diff --git a/sky/skylet/constants.py b/sky/skylet/constants.py
@@ -248,9 +248,7 @@
 # controller and sky serve controller.
 # TODO(tian): Refactor to controller_utils. Current blocker: circular import.
 CONTROLLER_IDLE_MINUTES_TO_AUTOSTOP = 10
-# idle_minutes_to_autostop value used to indicate cancellation on registered
-# autostop/down.
-IDLE_MINUTES_TO_AUTOSTOP_FOR_CANCEL = -1
+
 # Due to the CPU/memory usage of the controller process launched with sky jobs (
 # use ray job under the hood), we need to reserve some CPU/memory for each jobs/
 # serve controller process.