[XRay] Register object store and raylet with the GCS (#1860)

python/ray/services.py

@@ -1401,14 +1401,14 @@ def start_ray_processes(address_info=None,
         raylet_stdout_file, raylet_stderr_file = (
             new_log_files("raylet_{}".format(i),
                           redirect_output=redirect_output))
-        address_info["raylet_socket_name"] = start_raylet(
+        address_info["raylet_socket_names"] = [start_raylet(
             redis_address,
             node_ip_address,
             object_store_addresses[i].name,
             worker_path,
             stdout_file=None,
             stderr_file=None,
-            cleanup=cleanup)
+            cleanup=cleanup)]
 
     if not use_raylet:
         # Start any workers that the local scheduler has not already started.

python/ray/worker.py

@@ -1241,11 +1241,12 @@ def get_address_info_from_redis_helper(redis_address, node_ip_address,
                      redis_ip_address == ray.services.get_node_ip_address())):
                 raylets.append(client)
 
-        # TODO(rkn): The ObjectStoreSocketName field does not exist.
         object_store_addresses = [
-            raylet.ObjectStoreSocketName().decode("ascii")
-            for raylet in raylets]
-        raylet_socket_names = [raylet.NodeManagerAddress().decode("ascii") for
+            services.ObjectStoreAddress(
+                name=raylet.ObjectStoreSocketName().decode("ascii"),
+                manager_name=None,
+                manager_port=None) for raylet in raylets]
+        raylet_socket_names = [raylet.RayletSocketName().decode("ascii") for
                                raylet in raylets]
         return {"node_ip_address": node_ip_address,
                 "redis_address": redis_address,
@@ -1515,7 +1516,7 @@ def _init(address_info=None,
                 address_info["local_scheduler_socket_names"][0])
         else:
             driver_address_info["raylet_socket_name"] = (
-                address_info["raylet_socket_name"])
+                address_info["raylet_socket_names"][0])
     connect(driver_address_info, object_id_seed=object_id_seed,
             mode=driver_mode, worker=global_worker, use_raylet=use_raylet)
     return address_info