Update max resource label and give better error message (#5916)

This commit is contained in:
Philipp Moritz
2019-10-16 22:37:01 -07:00
committed by GitHub
parent 6c11b534c8
commit 32b2907457
2 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ PICKLE_OBJECT_WARNING_SIZE = 10**7
# The maximum resource quantity that is allowed. TODO(rkn): This could be
# relaxed, but the current implementation of the node manager will be slower
# for large resource quantities due to bookkeeping of specific resource IDs.
MAX_RESOURCE_QUANTITY = 20000
MAX_RESOURCE_QUANTITY = 40000
# Each memory "resource" counts as this many bytes of memory.
MEMORY_RESOURCE_UNIT_BYTES = 50 * 1024 * 1024
+9 -6
View File
@@ -104,21 +104,24 @@ class ResourceSpec(
}
# Check types.
for _, resource_quantity in resources.items():
for resource_label, resource_quantity in resources.items():
assert (isinstance(resource_quantity, int)
or isinstance(resource_quantity, float))
if (isinstance(resource_quantity, float)
and not resource_quantity.is_integer()):
raise ValueError(
"Resource quantities must all be whole numbers. "
"Received {}.".format(resources))
"Violated by resource '{}' in {}.".format(
resource_label, resources))
if resource_quantity < 0:
raise ValueError("Resource quantities must be nonnegative. "
"Received {}.".format(resources))
"Violated by resource '{}' in {}.".format(
resource_label, resources))
if resource_quantity > ray_constants.MAX_RESOURCE_QUANTITY:
raise ValueError(
"Resource quantities must be at most {}.".format(
ray_constants.MAX_RESOURCE_QUANTITY))
raise ValueError("Resource quantities must be at most {}. "
"Violated by resource '{}' in {}.".format(
ray_constants.MAX_RESOURCE_QUANTITY,
resource_label, resources))
return resources