From 2c41936a39814a897736f46437e994fe1bdf06f2 Mon Sep 17 00:00:00 2001
From: "DK.Pino" <loushang.ls@antfin.com>
Date: Wed, 10 Nov 2021 16:53:42 +0800
Subject: [PATCH] [Placement Group] [Test] Fix pg.ready hang forever when gcs
 restarting (#20063)

* fixed

* lint

* fix comment

* revert previous fix code
---
 python/ray/tests/test_placement_group_3.py | 3 ---
 src/ray/raylet/node_manager.cc             | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/ray/tests/test_placement_group_3.py b/python/ray/tests/test_placement_group_3.py
index e2be11acb..ba2a44516 100644
--- a/python/ray/tests/test_placement_group_3.py
+++ b/python/ray/tests/test_placement_group_3.py
@@ -36,9 +36,6 @@ def get_ray_status_output(address):
     }
 
 
-@pytest.mark.skip(
-    reason=("Flaky in the master. The feature is not officially "
-            "supported yet, so we just disable it."))
 @pytest.mark.parametrize(
     "ray_start_cluster_head", [
         generate_system_config_map(
diff --git a/src/ray/raylet/node_manager.cc b/src/ray/raylet/node_manager.cc
index 02d0fcfbc..b70634e93 100644
--- a/src/ray/raylet/node_manager.cc
+++ b/src/ray/raylet/node_manager.cc
@@ -409,6 +409,9 @@ ray::Status NodeManager::RegisterGcs() {
     const auto &resources_changed =
         [this](const rpc::NodeResourceChange &resource_notification) {
           auto id = NodeID::FromBinary(resource_notification.node_id());
+          if (id == self_node_id_) {
+            return;
+          }
           if (resource_notification.updated_resources_size() != 0) {
             ResourceSet resource_set(
                 MapFromProtobuf(resource_notification.updated_resources()));