mirror of
https://github.com/vale981/ray
synced 2025-03-07 02:51:39 -05:00

* WIP: removing OL, OI, TT on client exit; no saving yet. * ray_redis_module.cc: update header comment. * Cleanup: just the removal. * Reformat via yapf: use pep8 style instead of google. * Checkpoint addressing comments (partially) * Add 'b' marker before strings (py3 compat) * Add MonitorTest. * Use `isort` to sort imports. * Remove some loggings * Fix flake8 noqa marker runtest.py * Try to separate tests out to monitor_test.py * Rework cleanup algorithm: correct logic * Extend tests to cover multi-shard cases * Add some small comments and formatting changes.
93 lines
3.2 KiB
Python
93 lines
3.2 KiB
Python
from __future__ import absolute_import
|
|
from __future__ import division
|
|
from __future__ import print_function
|
|
|
|
import multiprocessing
|
|
import subprocess
|
|
import time
|
|
import unittest
|
|
|
|
import ray
|
|
|
|
|
|
class MonitorTest(unittest.TestCase):
|
|
def _testCleanupOnDriverExit(self, num_redis_shards):
|
|
stdout = subprocess.check_output([
|
|
"ray",
|
|
"start",
|
|
"--head",
|
|
"--num-redis-shards",
|
|
str(num_redis_shards),
|
|
]).decode("ascii")
|
|
lines = [m.strip() for m in stdout.split("\n")]
|
|
init_cmd = [m for m in lines if m.startswith("ray.init")]
|
|
self.assertEqual(1, len(init_cmd))
|
|
redis_address = init_cmd[0].split("redis_address=\"")[-1][:-2]
|
|
|
|
def StateSummary():
|
|
obj_tbl_len = len(ray.global_state.object_table())
|
|
task_tbl_len = len(ray.global_state.task_table())
|
|
func_tbl_len = len(ray.global_state.function_table())
|
|
return obj_tbl_len, task_tbl_len, func_tbl_len
|
|
|
|
def Driver(success):
|
|
success.value = True
|
|
# Start driver.
|
|
ray.init(redis_address=redis_address)
|
|
summary_start = StateSummary()
|
|
if (0, 1) != summary_start[:2]:
|
|
success.value = False
|
|
|
|
# Two new objects.
|
|
ray.get(ray.put(1111))
|
|
ray.get(ray.put(1111))
|
|
if (2, 1, summary_start[2]) != StateSummary():
|
|
success.value = False
|
|
|
|
@ray.remote
|
|
def f():
|
|
ray.put(1111) # Yet another object.
|
|
return 1111 # A returned object as well.
|
|
|
|
# 1 new function.
|
|
if (2, 1, summary_start[2] + 1) != StateSummary():
|
|
success.value = False
|
|
|
|
ray.get(f.remote())
|
|
if (4, 2, summary_start[2] + 1) != StateSummary():
|
|
success.value = False
|
|
|
|
ray.worker.cleanup()
|
|
|
|
success = multiprocessing.Value('b', False)
|
|
driver = multiprocessing.Process(target=Driver, args=(success, ))
|
|
driver.start()
|
|
# Wait for client to exit.
|
|
driver.join()
|
|
time.sleep(5)
|
|
|
|
# Just make sure Driver() is run and succeeded. Note(rkn), if the below
|
|
# assertion starts failing, then the issue may be that the summary
|
|
# values computed in the Driver function are being updated slowly and
|
|
# so the call to StateSummary() is getting outdated values. This could
|
|
# be fixed by looping until StateSummary() returns the desired values.
|
|
self.assertTrue(success.value)
|
|
# Check that objects, tasks, and functions are cleaned up.
|
|
ray.init(redis_address=redis_address)
|
|
# The assertion below can fail if the monitor is too slow to clean up
|
|
# the global state.
|
|
self.assertEqual((0, 1), StateSummary()[:2])
|
|
|
|
ray.worker.cleanup()
|
|
subprocess.Popen(["ray", "stop"]).wait()
|
|
|
|
def testCleanupOnDriverExitSingleRedisShard(self):
|
|
self._testCleanupOnDriverExit(num_redis_shards=1)
|
|
|
|
def testCleanupOnDriverExitManyRedisShards(self):
|
|
self._testCleanupOnDriverExit(num_redis_shards=5)
|
|
self._testCleanupOnDriverExit(num_redis_shards=31)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main(verbosity=2)
|