Redis returns OK when removing a non-existent set entry (#4434)

python/ray/tests/test_basic.py

@@ -2840,3 +2840,23 @@ def test_shutdown_disconnect_global_state():
     with pytest.raises(Exception) as e:
         ray.global_state.object_table()
     assert str(e.value).endswith("ray.init has been called.")
+
+
+@pytest.mark.parametrize(
+    "ray_start_object_store_memory", [10**8], indirect=True)
+def test_redis_lru_with_set(ray_start_object_store_memory):
+    x = np.zeros(8 * 10**7, dtype=np.uint8)
+    x_id = ray.put(x)
+
+    # Remove the object from the object table to simulate Redis LRU eviction.
+    removed = False
+    start_time = time.time()
+    while time.time() < start_time + 10:
+        if ray.global_state.redis_clients[0].delete(b"OBJECT" +
+                                                    x_id.binary()) == 1:
+            removed = True
+            break
+    assert removed
+
+    # Now evict the object from the object store.
+    ray.put(x)  # This should not crash.

python/ray/tests/test_failure.py

@@ -624,14 +624,17 @@ def test_redis_module_failure(ray_start_regular):
                      -1)
     run_failure_test("Index is not a number.", "RAY.TABLE_APPEND", 1, 1, 2, 1,
                      b"a")
-    run_failure_test("The entry to remove doesn't exist.", "RAY.SET_REMOVE", 1,
-                     1, 3, 1)
     run_one_command("RAY.TABLE_APPEND", 1, 1, 2, 1)
     # It's okay to add duplicate entries.
     run_one_command("RAY.TABLE_APPEND", 1, 1, 2, 1)
     run_one_command("RAY.TABLE_APPEND", 1, 1, 2, 1, 0)
     run_one_command("RAY.TABLE_APPEND", 1, 1, 2, 1, 1)
     run_one_command("RAY.SET_ADD", 1, 1, 3, 1)
+    # It's okey to add duplicate entries.
+    run_one_command("RAY.SET_ADD", 1, 1, 3, 1)
+    run_one_command("RAY.SET_REMOVE", 1, 1, 3, 1)
+    # It's okey to remove duplicate entries.
+    run_one_command("RAY.SET_REMOVE", 1, 1, 3, 1)
 
 
 # Note that this test will take at least 10 seconds because it must wait for