Change default spot_policy to on-demand (#1657)

dstackai · Sep 4, 2024 · b4a5a76 · b4a5a76
1 parent 1537163
commit b4a5a76
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/dstack/_internal/core/models/fleets.py b/src/dstack/_internal/core/models/fleets.py
@@ -183,7 +183,7 @@ def _merged_profile(cls, values) -> Dict:
             if conf_val is not None:
                 setattr(merged_profile, key, conf_val)
         if merged_profile.spot_policy is None:
-            merged_profile.spot_policy = SpotPolicy.AUTO
+            merged_profile.spot_policy = SpotPolicy.ONDEMAND
         if merged_profile.retry is None:
             merged_profile.retry = False
         if merged_profile.termination_policy is None:

diff --git a/src/dstack/_internal/core/models/runs.py b/src/dstack/_internal/core/models/runs.py
@@ -366,9 +366,8 @@ class PoolInstanceOffers(CoreModel):
 
 
 def get_policy_map(spot_policy: Optional[SpotPolicy], default: SpotPolicy) -> Optional[bool]:
-    """Map profile.spot_policy[SpotPolicy|None] to requirements.spot[bool|None]
-    - SpotPolicy.AUTO by default for `dstack run`
-    - SpotPolicy.ONDEMAND by default for `dstack pool add`
+    """
+    Map profile.spot_policy[SpotPolicy|None] to requirements.spot[bool|None]
     """
     if spot_policy is None:
         spot_policy = default

diff --git a/src/dstack/_internal/server/services/fleets.py b/src/dstack/_internal/server/services/fleets.py
@@ -180,7 +180,7 @@ async def create_fleet_instance_model(
     requirements = Requirements(
         resources=spec.configuration.resources or ResourcesSpec(),
         max_price=profile.max_price,
-        spot=get_policy_map(profile.spot_policy, default=SpotPolicy.AUTO),
+        spot=get_policy_map(profile.spot_policy, default=SpotPolicy.ONDEMAND),
     )
     instance_model = await pools_services.create_instance_model(
         session=session,

diff --git a/src/dstack/_internal/server/services/jobs/configurators/service.py b/src/dstack/_internal/server/services/jobs/configurators/service.py
@@ -15,7 +15,7 @@ def _default_max_duration(self) -> Optional[int]:
         return None
 
     def _spot_policy(self) -> SpotPolicy:
-        return self.run_spec.merged_profile.spot_policy or SpotPolicy.AUTO
+        return self.run_spec.merged_profile.spot_policy or SpotPolicy.ONDEMAND
 
     def _ports(self) -> List[PortMapping]:
         return []

diff --git a/src/dstack/_internal/server/services/jobs/configurators/task.py b/src/dstack/_internal/server/services/jobs/configurators/task.py
@@ -29,7 +29,7 @@ def _default_max_duration(self) -> Optional[int]:
         return DEFAULT_MAX_DURATION_SECONDS
 
     def _spot_policy(self) -> SpotPolicy:
-        return self.run_spec.merged_profile.spot_policy or SpotPolicy.AUTO
+        return self.run_spec.merged_profile.spot_policy or SpotPolicy.ONDEMAND
 
     def _ports(self) -> List[PortMapping]:
         return self.run_spec.configuration.ports