From 3bf80839cb06d2e0e3779f242cf4b4e12e70fa02 Mon Sep 17 00:00:00 2001 From: Melih Elibol Date: Fri, 6 Apr 2018 17:20:52 -0700 Subject: [PATCH] Remove all runtime errors. (#1840) --- src/ray/object_manager/connection_pool.h | 4 +--- src/ray/object_manager/object_directory.h | 6 ++---- src/ray/object_manager/object_store_notification_manager.cc | 2 +- src/ray/object_manager/test/object_manager_stress_test.cc | 4 +--- src/ray/object_manager/test/object_manager_test.cc | 4 +--- src/ray/object_manager/transfer_queue.h | 6 +++--- src/ray/raylet/object_manager_integration_test.cc | 4 +--- 7 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/ray/object_manager/connection_pool.h b/src/ray/object_manager/connection_pool.h index 700d4b884..4ce2133d4 100644 --- a/src/ray/object_manager/connection_pool.h +++ b/src/ray/object_manager/connection_pool.h @@ -86,9 +86,7 @@ class ConnectionPool { ray::Status RemoveSender(ConnectionType type, std::shared_ptr conn); /// This object cannot be copied for thread-safety. - ConnectionPool &operator=(const ConnectionPool &o) { - throw std::runtime_error("Can't copy ConnectionPool."); - } + RAY_DISALLOW_COPY_AND_ASSIGN(ConnectionPool); private: /// A container type that maps ClientID to a connection type. diff --git a/src/ray/object_manager/object_directory.h b/src/ray/object_manager/object_directory.h index 59731c336..e320d90a5 100644 --- a/src/ray/object_manager/object_directory.h +++ b/src/ray/object_manager/object_directory.h @@ -110,10 +110,8 @@ class ObjectDirectory : public ObjectDirectoryInterface { /// Ray only (not part of the OD interface). ObjectDirectory(std::shared_ptr gcs_client); - /// This object cannot be copied for thread-safety. - ObjectDirectory &operator=(const ObjectDirectory &o) { - throw std::runtime_error("Can't copy ObjectDirectory."); - } + /// ObjectDirectory should not be copied. + RAY_DISALLOW_COPY_AND_ASSIGN(ObjectDirectory); private: /// Callbacks associated with a call to GetLocations. diff --git a/src/ray/object_manager/object_store_notification_manager.cc b/src/ray/object_manager/object_store_notification_manager.cc index 7f3aea274..e6bc1a4b4 100644 --- a/src/ray/object_manager/object_store_notification_manager.cc +++ b/src/ray/object_manager/object_store_notification_manager.cc @@ -47,7 +47,7 @@ void ObjectStoreNotificationManager::ProcessStoreLength( void ObjectStoreNotificationManager::ProcessStoreNotification( const boost::system::error_code &error) { if (error) { - throw std::runtime_error("ObjectStore may have died."); + RAY_LOG(FATAL) << error.message(); } const auto &object_info = flatbuffers::GetRoot(notification_.data()); diff --git a/src/ray/object_manager/test/object_manager_stress_test.cc b/src/ray/object_manager/test/object_manager_stress_test.cc index b90530612..7936bf5b6 100644 --- a/src/ray/object_manager/test/object_manager_stress_test.cc +++ b/src/ray/object_manager/test/object_manager_stress_test.cc @@ -103,9 +103,7 @@ class TestObjectManagerBase : public ::testing::Test { " 1> /dev/null 2> /dev/null &"; RAY_LOG(DEBUG) << plasma_command; int ec = system(plasma_command.c_str()); - if (ec != 0) { - throw std::runtime_error("failed to start plasma store."); - }; + RAY_CHECK(ec == 0); return store_id; } diff --git a/src/ray/object_manager/test/object_manager_test.cc b/src/ray/object_manager/test/object_manager_test.cc index 7a64c219c..b2feb1b1c 100644 --- a/src/ray/object_manager/test/object_manager_test.cc +++ b/src/ray/object_manager/test/object_manager_test.cc @@ -94,9 +94,7 @@ class TestObjectManager : public ::testing::Test { " 1> /dev/null 2> /dev/null &"; RAY_LOG(DEBUG) << plasma_command; int ec = system(plasma_command.c_str()); - if (ec != 0) { - throw std::runtime_error("failed to start plasma store."); - }; + RAY_CHECK(ec == 0); return store_id; } diff --git a/src/ray/object_manager/transfer_queue.h b/src/ray/object_manager/transfer_queue.h index 50645fe93..8570d1ec8 100644 --- a/src/ray/object_manager/transfer_queue.h +++ b/src/ray/object_manager/transfer_queue.h @@ -55,6 +55,8 @@ class TransferQueue { } }; + TransferQueue() = default; + /// Queues a send. /// /// \param client_id The ClientID to which the object needs to be sent. @@ -103,9 +105,7 @@ class TransferQueue { ray::Status RemoveContext(const UniqueID &id); /// This object cannot be copied for thread-safety. - TransferQueue &operator=(const TransferQueue &o) { - throw std::runtime_error("Can't copy TransferQueue."); - } + RAY_DISALLOW_COPY_AND_ASSIGN(TransferQueue); private: // TODO(hme): make this a shared mutex. diff --git a/src/ray/raylet/object_manager_integration_test.cc b/src/ray/raylet/object_manager_integration_test.cc index 629c08b58..19495d5f0 100644 --- a/src/ray/raylet/object_manager_integration_test.cc +++ b/src/ray/raylet/object_manager_integration_test.cc @@ -24,9 +24,7 @@ class TestObjectManagerBase : public ::testing::Test { " 1> /dev/null 2> /dev/null &"; RAY_LOG(INFO) << plasma_command; int ec = system(plasma_command.c_str()); - if (ec != 0) { - throw std::runtime_error("failed to start plasma store."); - }; + RAY_CHECK(ec == 0); return store_id; }