Skip to content

Commit 165b4aa

Browse files
[Data][Cherry-pick] Fixed min_scheduling_resources to fallback to incremental_resource_usage by default (#60998)
Cherry-pick of #60997 Signed-off-by: Alexey Kudinkin <ak@anyscale.com>
1 parent 6835277 commit 165b4aa

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

python/ray/data/_internal/execution/interfaces/physical_operator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ def min_scheduling_resources(
510510
For regular tasks, this is the resources required to schedule a task. For actor
511511
tasks, this is the resources required to schedule an actor.
512512
"""
513-
return ExecutionResources.zero()
513+
return self.incremental_resource_usage()
514514

515515
def progress_str(self) -> str:
516516
"""Return any extra status to be displayed in the operator progress bar.

python/ray/data/_internal/execution/operators/hash_shuffle.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,9 @@ def incremental_resource_usage(self) -> ExecutionResources:
10471047
gpu=0,
10481048
)
10491049

1050+
def min_scheduling_resources(self) -> ExecutionResources:
1051+
return self.incremental_resource_usage()
1052+
10501053
def has_completed(self) -> bool:
10511054
# TODO separate marking as completed from the check
10521055
return self._is_finalized() and super().has_completed()

0 commit comments

Comments
 (0)