From 58e01fd43bbb6fbd383952705a80d7f98a4a003e Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Tue, 28 Sep 2021 10:23:10 -0700 Subject: [PATCH 01/13] Update build rules and patches for darwin_arm64 platform. Changes include: Update nelhage/rules_boost package from current version (08/5/2020) to 5/27/2021 version. Remove rules_boost-undefine-boost_fallthrough.patch, since BOOST_FALLTHROUGH seems to be defined now. Minor changes to rules_boost-windows-linkopts.patch to use default condition to add -lpthread flag for all platforms. Add darwin_arm64 config to BUILD files for lib civetweb pulled in via prometheu dependency. --- bazel/ray_deps_setup.bzl | 5 +-- .../patches/prometheus-windows-pollfd.patch | 37 +++++++++++++++++-- ...les_boost-undefine-boost_fallthrough.patch | 8 ---- .../rules_boost-windows-linkopts.patch | 21 +++++------ 4 files changed, 44 insertions(+), 27 deletions(-) delete mode 100644 thirdparty/patches/rules_boost-undefine-boost_fallthrough.patch diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl index 1925aedfa4edb..b4226adb11348 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl @@ -161,10 +161,9 @@ def ray_deps_setup(): auto_http_archive( name = "com_github_nelhage_rules_boost", # If you update the Boost version, remember to update the 'boost' rule. - url = "https://github.com/nelhage/rules_boost/archive/2613d04ab3d22dfc4543ea0a083d9adeaa0daf09.tar.gz", - sha256 = "512f913240e026099d4ca4a98b1ce8048c99de77fdc8e8584e9e2539ee119ca2", + url = "https://github.com/nelhage/rules_boost/archive/652b21e35e4eeed5579e696da0facbe8dba52b1f.tar.gz", + sha256 = "c1b8b2adc3b4201683cf94dda7eef3fc0f4f4c0ea5caa3ed3feffe07e1fb5b15", patches = [ - "//thirdparty/patches:rules_boost-undefine-boost_fallthrough.patch", "//thirdparty/patches:rules_boost-windows-linkopts.patch", ], ) diff --git a/thirdparty/patches/prometheus-windows-pollfd.patch b/thirdparty/patches/prometheus-windows-pollfd.patch index 1941b6cb247c0..3b30942bb85f2 100644 --- a/thirdparty/patches/prometheus-windows-pollfd.patch +++ b/thirdparty/patches/prometheus-windows-pollfd.patch @@ -6,17 +6,46 @@ Windows Vista and later SDKs define struct pollfd for WSAPoll(), but it has a pe civetweb provides its own implementation of poll, but it has a conflicting definition for pollfd. Hence we block Windows from defining pollfd (which this project doesn't use). --- - bazel/civetweb.BUILD | 1 + - 1 file changed, 1 insertion(+) + bazel/civetweb.BUILD | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git bazel/civetweb.BUILD bazel/civetweb.BUILD --- bazel/civetweb.BUILD +++ bazel/civetweb.BUILD -@@ -34,5 +34,6 @@ cc_library( +@@ -9,6 +9,11 @@ config_setting( + values = {"cpu": "darwin_x86_64"}, + ) + ++config_setting( ++ name = "darwin_arm64", ++ values = {"cpu": "darwin_arm64"}, ++) ++ + config_setting( + name = "windows", + values = { "cpu": "x64_windows" }, +@@ -34,6 +39,7 @@ cc_library( "-DNO_CACHING", "-DNO_SSL", "-DNO_FILES", + "-D_WIN32_WINNT=0x0502", "-UDEBUG", ], --- + includes = [ +@@ -46,6 +52,7 @@ cc_library( + }) + select({ + ":darwin": [], + ":darwin_x86_64": [], ++ ":darwin_arm64": [], + ":windows": [], + ":windows_msvc": [], + "//conditions:default": ["-lrt"], +@@ -86,6 +93,7 @@ cc_library( + }) + select({ + ":darwin": [], + ":darwin_x86_64": [], ++ ":darwin_arm64": [], + ":windows": [], + ":windows_msvc": [], + "//conditions:default": ["-lrt"], +-- diff --git a/thirdparty/patches/rules_boost-undefine-boost_fallthrough.patch b/thirdparty/patches/rules_boost-undefine-boost_fallthrough.patch deleted file mode 100644 index 9cd53fe60f842..0000000000000 --- a/thirdparty/patches/rules_boost-undefine-boost_fallthrough.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git BUILD.boost BUILD.boost ---- BUILD.boost -+++ BUILD.boost -@@ -1356,3 +1356,2 @@ boost_library( - defines = [ -- "BOOST_FALLTHROUGH", - ], --- diff --git a/thirdparty/patches/rules_boost-windows-linkopts.patch b/thirdparty/patches/rules_boost-windows-linkopts.patch index 28bda4eb06939..204443d3c7186 100644 --- a/thirdparty/patches/rules_boost-windows-linkopts.patch +++ b/thirdparty/patches/rules_boost-windows-linkopts.patch @@ -1,15 +1,12 @@ diff --git BUILD.boost BUILD.boost --- BUILD.boost +++ BUILD.boost -@@ -313,1 +313,9 @@ boost_library(name = "asio", -- linkopts = ["-lpthread"], -+ linkopts = select({ -+ ":linux": [ -+ "-lpthread", -+ ], -+ ":osx_x86_64": [ -+ "-lpthread", -+ ], -+ "//conditions:default": [], -+ }), --- +@@ -428,6 +428,7 @@ boost_library( + }), + linkopts = select({ + ":android": [], ++ ":windows": [], + "//conditions:default": ["-lpthread"], + }), + deps = [ +-- From e1a254fd20d70128ff0c5932ecfaf0e6459c9b24 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 1 Oct 2021 11:28:00 -0700 Subject: [PATCH 02/13] upgrade boost to 1.74.0 from 1.71.0 to match the udpated build file for windows. --- bazel/ray_deps_setup.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl index b4226adb11348..96131feadba41 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl @@ -151,8 +151,8 @@ def ray_deps_setup(): # declaring it here allows us to avoid patching the latter. name = "boost", build_file = "@com_github_nelhage_rules_boost//:BUILD.boost", - sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee", - url = "https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2", + sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1", + url = "https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2", patches = [ "//thirdparty/patches:boost-exception-no_warn_typeid_evaluated.patch", ], From c6dcfbad9435acc245d919dbea40f316cfc3818f Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 1 Oct 2021 23:18:55 -0700 Subject: [PATCH 03/13] Fix ray_cpp_pkg --- cpp/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/BUILD.bazel b/cpp/BUILD.bazel index 9d4e7416cda1b..9603c863546c1 100644 --- a/cpp/BUILD.bazel +++ b/cpp/BUILD.bazel @@ -90,6 +90,7 @@ genrule( mkdir -p "$$PY_CPP_DIR/lib/" && cp -f -r $$WORK_DIR/external/msgpack/include/* "$$PY_CPP_DIR/include" && cp -f -r "$$WORK_DIR/external/boost/boost/archive" "$$BOOST_DIR" && + cp -f -r "$$WORK_DIR/external/boost/boost/assert" "$$BOOST_DIR" && cp -f -r "$$WORK_DIR/external/boost/boost/bind" "$$BOOST_DIR" && cp -f -r "$$WORK_DIR/external/boost/boost/callable_traits" "$$BOOST_DIR" && cp -f -r "$$WORK_DIR/external/boost/boost/concept" "$$BOOST_DIR" && From 0ebad60651d3154fb0333cc17c9a6bdd9705499e Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Thu, 7 Oct 2021 23:49:41 -0700 Subject: [PATCH 04/13] Use boost/bind/bind.hpp boost/bind.hpp and global namespace placeholders are deprecated. --- src/ray/common/client_connection.cc | 2 +- src/ray/common/network_util.h | 2 +- src/ray/core_worker/reference_count.h | 2 +- src/ray/core_worker/reference_count_test.cc | 4 +++- src/ray/core_worker/test/core_worker_test.cc | 2 +- src/ray/gcs/asio.h | 2 +- src/ray/gcs/redis_context.h | 2 +- src/ray/object_manager/object_buffer_pool.h | 2 +- src/ray/object_manager/object_manager.h | 2 +- src/ray/object_manager/plasma/store.cc | 6 ++++-- src/ray/object_manager/pull_manager.h | 2 +- src/ray/raylet/raylet.cc | 2 +- src/ray/raylet/worker.cc | 2 +- streaming/src/queue/queue_handler.h | 2 +- 14 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/ray/common/client_connection.cc b/src/ray/common/client_connection.cc index 73743820b2b9b..7eb51a953e215 100644 --- a/src/ray/common/client_connection.cc +++ b/src/ray/common/client_connection.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ray/common/network_util.h b/src/ray/common/network_util.h index 08bef7ae873af..8f268ec46b389 100644 --- a/src/ray/common/network_util.h +++ b/src/ray/common/network_util.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ray/core_worker/reference_count.h b/src/ray/core_worker/reference_count.h index 58c67a2010213..145e979d2ef00 100644 --- a/src/ray/core_worker/reference_count.h +++ b/src/ray/core_worker/reference_count.h @@ -14,7 +14,7 @@ #pragma once -#include +#include #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" diff --git a/src/ray/core_worker/reference_count_test.cc b/src/ray/core_worker/reference_count_test.cc index eeeb22555e161..276626a0785b8 100644 --- a/src/ray/core_worker/reference_count_test.cc +++ b/src/ray/core_worker/reference_count_test.cc @@ -26,6 +26,8 @@ #include "ray/pubsub/publisher.h" #include "ray/pubsub/subscriber.h" +namespace ph = boost::placeholders; + namespace ray { namespace core { @@ -269,7 +271,7 @@ class MockWorkerClient : public MockCoreWorkerClientInterface { auto borrower_callback = [=]() { auto ref_removed_callback = - boost::bind(&ReferenceCounter::HandleRefRemoved, &rc_, _1); + boost::bind(&ReferenceCounter::HandleRefRemoved, &rc_, ph::_1); rc_.SetRefRemovedCallback(object_id, contained_in_id, owner_address, ref_removed_callback); }; diff --git a/src/ray/core_worker/test/core_worker_test.cc b/src/ray/core_worker/test/core_worker_test.cc index 29d95cb8fa9b8..3e0ddd631d45f 100644 --- a/src/ray/core_worker/test/core_worker_test.cc +++ b/src/ray/core_worker/test/core_worker_test.cc @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "absl/container/flat_hash_map.h" diff --git a/src/ray/gcs/asio.h b/src/ray/gcs/asio.h index fdcbbbf3cc3ef..d37083986ae1e 100644 --- a/src/ray/gcs/asio.h +++ b/src/ray/gcs/asio.h @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include diff --git a/src/ray/gcs/redis_context.h b/src/ray/gcs/redis_context.h index c7244aac80549..443c42f9dee69 100644 --- a/src/ray/gcs/redis_context.h +++ b/src/ray/gcs/redis_context.h @@ -15,7 +15,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/ray/object_manager/object_buffer_pool.h b/src/ray/object_manager/object_buffer_pool.h index 33d665898f7b4..b2722a3eceecc 100644 --- a/src/ray/object_manager/object_buffer_pool.h +++ b/src/ray/object_manager/object_buffer_pool.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ray/object_manager/object_manager.h b/src/ray/object_manager/object_manager.h index 38152dd258060..c0519a38306bd 100644 --- a/src/ray/object_manager/object_manager.h +++ b/src/ray/object_manager/object_manager.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index ff9e98ddb765c..bcc7817e57869 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -53,6 +53,7 @@ #include "ray/object_manager/plasma/protocol.h" #include "ray/util/util.h" +namespace ph = boost::placeholders; namespace fb = plasma::flatbuf; namespace plasma { @@ -297,7 +298,8 @@ void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. auto new_connection = Client::Create( - boost::bind(&PlasmaStore::ProcessMessage, this, _1, _2, _3), std::move(socket_)); + boost::bind(&PlasmaStore::ProcessMessage, this, ph::_1, ph::_2, ph::_3), + std::move(socket_)); } // We're ready to accept another client. DoAccept(); diff --git a/src/ray/object_manager/pull_manager.h b/src/ray/object_manager/pull_manager.h index 9b7f20c14a478..6c5108f111abe 100644 --- a/src/ray/object_manager/pull_manager.h +++ b/src/ray/object_manager/pull_manager.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "absl/container/flat_hash_map.h" diff --git a/src/ray/raylet/raylet.cc b/src/ray/raylet/raylet.cc index b8040b6f8acdc..424b83def75c7 100644 --- a/src/ray/raylet/raylet.cc +++ b/src/ray/raylet/raylet.cc @@ -15,7 +15,7 @@ #include "ray/raylet/raylet.h" #include -#include +#include #include #include diff --git a/src/ray/raylet/worker.cc b/src/ray/raylet/worker.cc index 08331a75f176d..fd2b7b723f755 100644 --- a/src/ray/raylet/worker.cc +++ b/src/ray/raylet/worker.cc @@ -14,7 +14,7 @@ #include "ray/raylet/worker.h" -#include +#include #include "ray/raylet/format/node_manager_generated.h" #include "ray/raylet/raylet.h" diff --git a/streaming/src/queue/queue_handler.h b/streaming/src/queue/queue_handler.h index e04e34b359804..26bd863e85ecc 100644 --- a/streaming/src/queue/queue_handler.h +++ b/streaming/src/queue/queue_handler.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include From 2a1f655e350102087ee08a7cf06a22f2ecbfc5fb Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 8 Oct 2021 11:40:24 -0700 Subject: [PATCH 05/13] lint --- src/ray/object_manager/plasma/store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index bcc7817e57869..459c784df7809 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -299,7 +299,7 @@ void PlasmaStore::ConnectClient(const boost::system::error_code &error) { // Accept a new local client and dispatch it to the node manager. auto new_connection = Client::Create( boost::bind(&PlasmaStore::ProcessMessage, this, ph::_1, ph::_2, ph::_3), - std::move(socket_)); + std::move(socket_)); } // We're ready to accept another client. DoAccept(); From a2f15d78fa636a457b48c5dcadf5c4b852246f47 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 8 Oct 2021 14:28:30 -0700 Subject: [PATCH 06/13] Use absl::bind_front when possible. Otherwise, NOLINT --- src/ray/core_worker/reference_count.h | 2 -- src/ray/core_worker/reference_count_test.cc | 5 ++--- src/ray/object_manager/plasma/store.cc | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ray/core_worker/reference_count.h b/src/ray/core_worker/reference_count.h index 145e979d2ef00..e0a9a783dd657 100644 --- a/src/ray/core_worker/reference_count.h +++ b/src/ray/core_worker/reference_count.h @@ -14,8 +14,6 @@ #pragma once -#include - #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" diff --git a/src/ray/core_worker/reference_count_test.cc b/src/ray/core_worker/reference_count_test.cc index 276626a0785b8..c265bc7af753b 100644 --- a/src/ray/core_worker/reference_count_test.cc +++ b/src/ray/core_worker/reference_count_test.cc @@ -16,6 +16,7 @@ #include +#include "absl/functional/bind_front.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "ray/common/asio/instrumented_io_context.h" @@ -26,8 +27,6 @@ #include "ray/pubsub/publisher.h" #include "ray/pubsub/subscriber.h" -namespace ph = boost::placeholders; - namespace ray { namespace core { @@ -271,7 +270,7 @@ class MockWorkerClient : public MockCoreWorkerClientInterface { auto borrower_callback = [=]() { auto ref_removed_callback = - boost::bind(&ReferenceCounter::HandleRefRemoved, &rc_, ph::_1); + absl::bind_front(&ReferenceCounter::HandleRefRemoved, &rc_); rc_.SetRefRemovedCallback(object_id, contained_in_id, owner_address, ref_removed_callback); }; diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index 459c784df7809..6032cfbae1361 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -298,7 +298,8 @@ void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. auto new_connection = Client::Create( - boost::bind(&PlasmaStore::ProcessMessage, this, ph::_1, ph::_2, ph::_3), + boost::bind(&PlasmaStore::ProcessMessage, + this, ph::_1, ph::_2, ph::_3), // NOLINT std::move(socket_)); } // We're ready to accept another client. From 6f9a857855f7494f4bea0a12c9ac0b1a08a37842 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 8 Oct 2021 14:35:35 -0700 Subject: [PATCH 07/13] lint --- src/ray/object_manager/plasma/store.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index 6032cfbae1361..56d87b7b94645 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -297,10 +297,9 @@ int PlasmaStore::AbortObject(const ObjectID &object_id, void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. - auto new_connection = Client::Create( - boost::bind(&PlasmaStore::ProcessMessage, - this, ph::_1, ph::_2, ph::_3), // NOLINT - std::move(socket_)); + auto new_connection = Client::Create(boost::bind(&PlasmaStore::ProcessMessage, this, + ph::_1, ph::_2, ph::_3), // NOLINT + std::move(socket_)); } // We're ready to accept another client. DoAccept(); From 49f86f57c4bbae346f3bd9b47e568d8f99148e22 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 8 Oct 2021 17:23:17 -0700 Subject: [PATCH 08/13] lint --- src/ray/object_manager/plasma/store.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index 56d87b7b94645..90f2d590519dc 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -297,9 +297,10 @@ int PlasmaStore::AbortObject(const ObjectID &object_id, void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. - auto new_connection = Client::Create(boost::bind(&PlasmaStore::ProcessMessage, this, - ph::_1, ph::_2, ph::_3), // NOLINT - std::move(socket_)); + auto new_connection = Client::Create( + boost::bind(&PlasmaStore::ProcessMessage, this, // NOLINT + ph::_1, ph::_2, ph::_3), + std::move(socket_)); } // We're ready to accept another client. DoAccept(); From 7b981c7ae913b05f5b6719586177d4486b5099c4 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 8 Oct 2021 22:15:23 -0700 Subject: [PATCH 09/13] lint --- src/ray/object_manager/plasma/store.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index 90f2d590519dc..1ef8953e7846f 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -297,10 +297,12 @@ int PlasmaStore::AbortObject(const ObjectID &object_id, void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. - auto new_connection = Client::Create( - boost::bind(&PlasmaStore::ProcessMessage, this, // NOLINT - ph::_1, ph::_2, ph::_3), + // NOLINTBEGIN : handler must be boost::AcceptHandler type. + auto new_connection = + Client::Create(boost::bind(&PlasmaStore::ProcessMessage, this, + ph::_1, ph::_2, ph::_3), std::move(socket_)); + // NOLINTEND } // We're ready to accept another client. DoAccept(); From c028330662b59de9456e9034ea11fc0fda1e58d2 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Fri, 8 Oct 2021 23:02:46 -0700 Subject: [PATCH 10/13] lint --- src/ray/object_manager/plasma/store.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index 1ef8953e7846f..3e450c6408413 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -298,9 +298,8 @@ void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. // NOLINTBEGIN : handler must be boost::AcceptHandler type. - auto new_connection = - Client::Create(boost::bind(&PlasmaStore::ProcessMessage, this, - ph::_1, ph::_2, ph::_3), + auto new_connection = Client::Create( + boost::bind(&PlasmaStore::ProcessMessage, this, ph::_1, ph::_2, ph::_3), std::move(socket_)); // NOLINTEND } From 8d295e2a9764e7d66e00993c55a8c666781a5e6a Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Sat, 9 Oct 2021 09:30:44 -0700 Subject: [PATCH 11/13] more lint --- src/ray/object_manager/plasma/store.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index 3e450c6408413..d33ac6fa97119 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -297,11 +297,10 @@ int PlasmaStore::AbortObject(const ObjectID &object_id, void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. - // NOLINTBEGIN : handler must be boost::AcceptHandler type. auto new_connection = Client::Create( + // NOLINTNEXTLINE : handler must be of boost::AcceptHandler type. boost::bind(&PlasmaStore::ProcessMessage, this, ph::_1, ph::_2, ph::_3), std::move(socket_)); - // NOLINTEND } // We're ready to accept another client. DoAccept(); From ae797cfa96b5180456e97314cc8e6910263fbd29 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Sat, 9 Oct 2021 10:44:35 -0700 Subject: [PATCH 12/13] final lint --- src/ray/object_manager/plasma/store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ray/object_manager/plasma/store.cc b/src/ray/object_manager/plasma/store.cc index d33ac6fa97119..0b8b24dbac56d 100644 --- a/src/ray/object_manager/plasma/store.cc +++ b/src/ray/object_manager/plasma/store.cc @@ -298,7 +298,7 @@ void PlasmaStore::ConnectClient(const boost::system::error_code &error) { if (!error) { // Accept a new local client and dispatch it to the node manager. auto new_connection = Client::Create( - // NOLINTNEXTLINE : handler must be of boost::AcceptHandler type. + // NOLINTNEXTLINE : handler must be of boost::AcceptHandler type. boost::bind(&PlasmaStore::ProcessMessage, this, ph::_1, ph::_2, ph::_3), std::move(socket_)); } From cdd0bef7a7c5c93e0dc33ebe8b28a945ba4fad13 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Sat, 9 Oct 2021 12:03:12 -0700 Subject: [PATCH 13/13] trigger build