Update arrow and remove plasma_manager references. (#3545)

python/ray/experimental/sgd/sgd_worker.py

@@ -113,8 +113,6 @@ class SGDWorker(object):
         if plasma_op:
             store_socket = (
                 ray.worker.global_worker.plasma_client.store_socket_name)
-            manager_socket = (
-                ray.worker.global_worker.plasma_client.manager_socket_name)
             ensure_plasma_tensorflow_op()
 
             # For fetching grads -> plasma
@@ -129,8 +127,7 @@ class SGDWorker(object):
                     plasma_grad = plasma.tf_plasma_op.tensor_to_plasma(
                         [grad],
                         self.plasma_in_grads_oids[j],
-                        plasma_store_socket_name=store_socket,
-                        plasma_manager_socket_name=manager_socket)
+                        plasma_store_socket_name=store_socket)
                 self.plasma_in_grads.append(plasma_grad)
 
             # For applying grads <- plasma
@@ -147,8 +144,7 @@ class SGDWorker(object):
                         grad_ph = plasma.tf_plasma_op.plasma_to_tensor(
                             self.plasma_out_grads_oids[j],
                             dtype=tf.float32,
-                            plasma_store_socket_name=store_socket,
-                            plasma_manager_socket_name=manager_socket)
+                            plasma_store_socket_name=store_socket)
                 grad_ph = tf.reshape(grad_ph,
                                      self.packed_grads_and_vars[0][j][0].shape)
                 logger.debug("Packed tensor {}".format(grad_ph))

python/ray/services.py

@@ -1585,8 +1585,7 @@ def start_ray_node(node_ip_address,
             this node (typically just one).
         num_workers (int): The number of workers to start.
         num_local_schedulers (int): The number of local schedulers to start.
-            This is also the number of plasma stores and plasma managers to
-            start.
+            This is also the number of plasma stores and raylets to start.
         object_store_memory (int): The maximum amount of memory (in bytes) to
             let the plasma store use.
         redis_password (str): Prevents external clients without the password

python/ray/test/test_utils.py

@@ -19,8 +19,7 @@ EVENT_KEY = "RAY_MULTI_NODE_TEST_KEY"
 def _wait_for_nodes_to_join(num_nodes, timeout=20):
     """Wait until the nodes have joined the cluster.
 
-    This will wait until exactly num_nodes have joined the cluster and each
-    node has a local scheduler and a plasma manager.
+    This will wait until exactly num_nodes have joined the cluster.
 
     Args:
         num_nodes: The number of nodes to wait for.
@@ -35,10 +34,6 @@ def _wait_for_nodes_to_join(num_nodes, timeout=20):
         client_table = ray.global_state.client_table()
         num_ready_nodes = len(client_table)
         if num_ready_nodes == num_nodes:
-            # Check that for each node, a local scheduler and a plasma manager
-            # are present.
-            # In raylet mode, this is a list of map.
-            # The GCS info will appear as a whole instead of part by part.
             return
         if num_ready_nodes > num_nodes:
             # Too many nodes have joined. Something must be wrong.

python/ray/worker.py

@@ -1916,7 +1916,7 @@ def connect(info,
 
     Args:
         info (dict): A dictionary with address of the Redis server and the
-            sockets of the plasma store, plasma manager, and local scheduler.
+            sockets of the plasma store and raylet.
         object_id_seed: A seed to use to make the generation of object IDs
             deterministic.
         mode: The mode of the worker. One of SCRIPT_MODE, WORKER_MODE, and
@@ -2061,7 +2061,7 @@ def connect(info,
 
     # Create an object store client.
     worker.plasma_client = thread_safe_client(
-        plasma.connect(info["store_socket_name"], ""))
+        plasma.connect(info["store_socket_name"]))
 
     raylet_socket = info["raylet_socket_name"]