Fix instance filtering by backend to use base backend (dstackai#2324)

Author: r4victor

src/dstack/_internal/server/background/tasks/process_instances.py

@@ -45,7 +45,6 @@
     InstanceOfferWithAvailability,
     InstanceRuntime,
     InstanceStatus,
-    InstanceType,
     RemoteConnectionInfo,
     SSHKey,
 )
@@ -695,7 +694,8 @@ async def _check_instance(instance: InstanceModel) -> None:
 
     if instance.status == InstanceStatus.PROVISIONING and instance.started_at is not None:
         provisioning_deadline = _get_provisioning_deadline(
-            instance, job_provisioning_data.instance_type
+            instance=instance,
+            job_provisioning_data=job_provisioning_data,
         )
         if get_current_datetime() > provisioning_deadline:
             instance.status = InstanceStatus.TERMINATING
@@ -737,7 +737,8 @@ async def _wait_for_instance_provisioning_data(
         instance.name,
     )
     provisioning_deadline = _get_provisioning_deadline(
-        instance, job_provisioning_data.instance_type
+        instance=instance,
+        job_provisioning_data=job_provisioning_data,
     )
     if get_current_datetime() > provisioning_deadline:
         logger.warning(
@@ -959,9 +960,13 @@ def _get_retry_duration_deadline(instance: InstanceModel, retry: Retry) -> datet
 
 
 def _get_provisioning_deadline(
-    instance: InstanceModel, instance_type: InstanceType
+    instance: InstanceModel,
+    job_provisioning_data: JobProvisioningData,
 ) -> datetime.datetime:
-    timeout_interval = _get_instance_timeout_interval(instance.backend, instance_type.name)
+    timeout_interval = _get_instance_timeout_interval(
+        backend_type=job_provisioning_data.get_base_backend(),
+        instance_type_name=job_provisioning_data.instance_type.name,
+    )
     return instance.started_at.replace(tzinfo=datetime.timezone.utc) + timeout_interval
 
 

src/dstack/_internal/server/services/pools.py

@@ -487,24 +487,23 @@ def filter_pool_instances(
             continue
         if status is not None and instance.status != status:
             continue
-        if backend_types is not None and instance.backend not in backend_types:
-            continue
-        if regions is not None and instance.region not in regions:
-            continue
         jpd = get_instance_provisioning_data(instance)
-        if (
-            jpd is not None
-            and profile.instance_types is not None
-            and jpd.instance_type.name not in profile.instance_types
-        ):
-            continue
-        if (
-            jpd is not None
-            and jpd.availability_zone is not None
-            and zones is not None
-            and jpd.availability_zone not in zones
-        ):
-            continue
+        if jpd is not None:
+            if backend_types is not None and jpd.get_base_backend() not in backend_types:
+                continue
+            if regions is not None and jpd.region not in regions:
+                continue
+            if (
+                profile.instance_types is not None
+                and jpd.instance_type.name not in profile.instance_types
+            ):
+                continue
+            if (
+                jpd.availability_zone is not None
+                and zones is not None
+                and jpd.availability_zone not in zones
+            ):
+                continue
         if instance.total_blocks is None:
             # Still provisioning, we don't know yet if it shared or not
             continue