From baac370099803dd59b37ebd639c64b883cd30469 Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Sun, 15 Sep 2019 09:13:15 -0700
Subject: [PATCH] Deprecate old global state API. (#5484)

* Deprecate old global state API.

* Remove unnecessary returns.
---
 python/ray/state.py | 57 ++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/python/ray/state.py b/python/ray/state.py
index 7581bc7a9..dae0acd7e 100644
--- a/python/ray/state.py
+++ b/python/ray/state.py
@@ -1003,66 +1003,55 @@ class DeprecatedGlobalState(object):
     """A class used to print errors when the old global state API is used."""
 
     def object_table(self, object_id=None):
-        logger.warning(
-            "ray.global_state.object_table() is deprecated and will be "
-            "removed in a subsequent release. Use ray.objects() instead.")
-        return ray.objects(object_id=object_id)
+        raise DeprecationWarning(
+            "ray.global_state.object_table() is deprecated. Use ray.objects() "
+            "instead.")
 
     def task_table(self, task_id=None):
-        logger.warning(
-            "ray.global_state.task_table() is deprecated and will be "
-            "removed in a subsequent release. Use ray.tasks() instead.")
-        return ray.tasks(task_id=task_id)
+        raise DeprecationWarning(
+            "ray.global_state.task_table() is deprecated. Use ray.tasks() "
+            "instead.")
 
     def function_table(self, function_id=None):
         raise DeprecationWarning(
             "ray.global_state.function_table() is deprecated.")
 
     def client_table(self):
-        logger.warning(
-            "ray.global_state.client_table() is deprecated and will be "
-            "removed in a subsequent release. Use ray.nodes() instead.")
-        return ray.nodes()
+        raise DeprecationWarning(
+            "ray.global_state.client_table() is deprecated. Use ray.nodes() "
+            "instead.")
 
     def profile_table(self):
         raise DeprecationWarning(
             "ray.global_state.profile_table() is deprecated.")
 
     def chrome_tracing_dump(self, filename=None):
-        logger.warning(
-            "ray.global_state.chrome_tracing_dump() is deprecated and will be "
-            "removed in a subsequent release. Use ray.timeline() instead.")
-        return ray.timeline(filename=filename)
+        raise DeprecationWarning(
+            "ray.global_state.chrome_tracing_dump() is deprecated. Use "
+            "ray.timeline() instead.")
 
     def chrome_tracing_object_transfer_dump(self, filename=None):
-        logger.warning(
+        raise DeprecationWarning(
             "ray.global_state.chrome_tracing_object_transfer_dump() is "
-            "deprecated and will be removed in a subsequent release. Use "
-            "ray.object_transfer_timeline() instead.")
-        return ray.object_transfer_timeline(filename=filename)
+            "deprecated. Use ray.object_transfer_timeline() instead.")
 
     def workers(self):
         raise DeprecationWarning("ray.global_state.workers() is deprecated.")
 
     def cluster_resources(self):
-        logger.warning(
-            "ray.global_state.cluster_resources() is deprecated and will be "
-            "removed in a subsequent release. Use ray.cluster_resources() "
-            "instead.")
-        return ray.cluster_resources()
+        raise DeprecationWarning(
+            "ray.global_state.cluster_resources() is deprecated. Use "
+            "ray.cluster_resources() instead.")
 
     def available_resources(self):
-        logger.warning(
-            "ray.global_state.available_resources() is deprecated and will be "
-            "removed in a subsequent release. Use ray.available_resources() "
-            "instead.")
-        return ray.available_resources()
+        raise DeprecationWarning(
+            "ray.global_state.available_resources() is deprecated. Use "
+            "ray.available_resources() instead.")
 
     def error_messages(self, all_jobs=False):
-        logger.warning(
-            "ray.global_state.error_messages() is deprecated and will be "
-            "removed in a subsequent release. Use ray.errors() instead.")
-        return ray.errors(all_jobs=all_jobs)
+        raise DeprecationWarning(
+            "ray.global_state.error_messages() is deprecated. Use "
+            "ray.errors() instead.")
 
 
 state = GlobalState()