Make ray.get(timeout=0) to throw timeout error

python/ray/_private/worker.py

@@ -664,7 +664,7 @@ def get_objects(self, object_refs: list, timeout: Optional[float] = None):
                     "which is not an ray.ObjectRef."
                 )
 
-        timeout_ms = int(timeout * 1000) if timeout else -1
+        timeout_ms = int(timeout * 1000) if timeout is not None else -1
         data_metadata_pairs = self.core_worker.get_objects(
             object_refs, self.current_task_id, timeout_ms
         )

python/ray/tests/test_basic_2.py

@@ -384,6 +384,10 @@ def test_get_with_timeout(ray_start_regular_shared):
     with pytest.raises(TimeoutError):
         ray.get(result_id, timeout=0.1)
 
+    # timeout of 0 should raise an error
+    with pytest.raises(GetTimeoutError):
+        ray.get(result_id, timeout=0)
+
     # Check that a subsequent get() returns early.
     ray.get(signal.send.remote())
     start = time.time()

python/ray/tests/test_object_spilling.py

@@ -319,7 +319,7 @@ def test_spill_objects_automatically(fs_only_object_spilling_config, shutdown_on
         index = random.choice(list(range(buffer_length)))
         ref = replay_buffer[index]
         solution = solution_buffer[index]
-        sample = ray.get(ref, timeout=0)
+        sample = ray.get(ref, timeout=None)
         assert np.array_equal(sample, solution)
     assert_no_thrashing(address["address"])
 
@@ -359,7 +359,7 @@ def test_unstable_spill_objects_automatically(unstable_spilling_config, shutdown
         index = random.choice(list(range(buffer_length)))
         ref = replay_buffer[index]
         solution = solution_buffer[index]
-        sample = ray.get(ref, timeout=0)
+        sample = ray.get(ref, timeout=None)
         assert np.array_equal(sample, solution)
     assert_no_thrashing(address["address"])
 
@@ -397,7 +397,7 @@ def test_slow_spill_objects_automatically(slow_spilling_config, shutdown_only):
         index = random.choice(list(range(buffer_length)))
         ref = replay_buffer[index]
         solution = solution_buffer[index]
-        sample = ray.get(ref, timeout=0)
+        sample = ray.get(ref, timeout=None)
         assert np.array_equal(sample, solution)
     assert_no_thrashing(address["address"])
 

python/ray/tests/test_object_spilling_2.py

@@ -77,7 +77,7 @@ def test_delete_objects_delete_while_creating(object_spilling_config, shutdown_o
     # Do random sampling.
     for _ in range(200):
         ref = random.choice(replay_buffer)
-        sample = ray.get(ref, timeout=0)
+        sample = ray.get(ref, timeout=None)
         assert np.array_equal(sample, arr)
 
     # After all, make sure all objects are killed without race condition.
@@ -126,7 +126,7 @@ def create_objects(self):
             # Do random sampling.
             for _ in range(200):
                 ref = random.choice(self.replay_buffer)
-                sample = ray.get(ref, timeout=0)
+                sample = ray.get(ref, timeout=None)
                 assert np.array_equal(sample, arr)
 
     a = Actor.remote()
@@ -288,7 +288,7 @@ def test_fusion_objects(fs_only_object_spilling_config, shutdown_only):
         index = random.choice(list(range(buffer_length)))
         ref = replay_buffer[index]
         solution = solution_buffer[index]
-        sample = ray.get(ref, timeout=0)
+        sample = ray.get(ref, timeout=None)
         assert np.array_equal(sample, solution)
 
     is_test_passing = False

python/ray/tests/test_object_spilling_3.py

@@ -315,7 +315,7 @@ def test_spill_deadlock(object_spilling_config, shutdown_only):
         if random.randint(0, 9) < 5:
             for _ in range(5):
                 ref = random.choice(replay_buffer)
-                sample = ray.get(ref, timeout=0)
+                sample = ray.get(ref, timeout=None)
                 assert np.array_equal(sample, arr)
     assert_no_thrashing(address["address"])