From 709f61ee0680cdb1866eed99767523db0f81e7c7 Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Mon, 13 Apr 2020 11:21:28 -0700
Subject: [PATCH] [Cleanup] Remove unused method
 `RendezvousMgrInterface::CleanupAll()`.

PiperOrigin-RevId: 306271233
Change-Id: I2cc278deab6bdb9f70d5bb9a7e8678d2969220bd
---
 .../distributed_runtime/base_rendezvous_mgr.cc | 14 --------------
 .../distributed_runtime/base_rendezvous_mgr.h  |  3 ---
 .../rendezvous_mgr_interface.h                 |  3 ---
 .../rpc/rpc_rendezvous_mgr_test.cc             | 18 ------------------
 4 files changed, 38 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc
index ff67ee6f0b2..8b458021910 100644
--- a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc
+++ b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc
@@ -115,20 +115,6 @@ void BaseRendezvousMgr::Cleanup(int64 step_id) {
   }
 }
 
-void BaseRendezvousMgr::CleanupAll() {
-  std::vector<Rendezvous*> rendezs;
-  {
-    mutex_lock l(mu_);
-    for (const auto& entry : table_) {
-      rendezs.push_back(entry.second);
-    }
-    table_.clear();
-  }
-  for (auto rendez : rendezs) {
-    StartAbortRendevous(rendez, errors::Aborted("Shutdown"));
-  }
-}
-
 BaseRemoteRendezvous::BaseRemoteRendezvous(const WorkerEnv* env, int64 step_id)
     : env_(env),
       step_id_(step_id),
diff --git a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h
index ba6528f0494..afa0f74ea2c 100644
--- a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h
+++ b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h
@@ -88,9 +88,6 @@ class BaseRendezvousMgr : public RendezvousMgrInterface {
   // periodically calls CleanupAll().
   void Cleanup(int64 step_id) override;
 
-  // Removed all rendezvous.
-  void CleanupAll() override;
-
  protected:
   virtual BaseRemoteRendezvous* Create(int64 step_id,
                                        const WorkerEnv* worker_env) = 0;
diff --git a/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h b/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h
index 5a6a3ace09a..25f224ae634 100644
--- a/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h
+++ b/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h
@@ -93,9 +93,6 @@ class RendezvousMgrInterface {
   // TODO(zhifengc): Have a background thread in worker that
   // periodically calls CleanupAll().
   virtual void Cleanup(int64 step_id) = 0;
-
-  // Removes all rendezvous.
-  virtual void CleanupAll() = 0;
 };
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc
index 5021853ce23..85923542f73 100644
--- a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc
+++ b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc
@@ -193,24 +193,6 @@ TEST_F(RpcRendezvousMgrTest, CancelAfterReceived) {
   delete cm;
 }
 
-TEST_F(RpcRendezvousMgrTest, CleanupAll) {
-  const Rendezvous::ParsedKey key = MakeKey(Rendezvous::CreateKey(
-      "/job:mnist/replica:1/task:2/cpu:0", 7890,
-      "/job:mnist/replica:1/task:2/cpu:1", "foo", FrameAndIter(0, 0)));
-  {
-    const int64 step_id = 123;
-    RemoteRendezvous* rendez = rmgr_.Find(step_id);
-    TF_ASSERT_OK(rendez->Initialize(&worker_session_));
-    core::ScopedUnref unref(rendez);
-    Rendezvous::Args args;
-    TF_ASSERT_OK(rendez->Send(key, args, V("peach"), false));
-    rmgr_.CleanupAll();
-    Tensor val(DT_STRING);
-    bool val_dead = false;
-    EXPECT_TRUE(errors::IsAborted(rendez->Recv(key, args, &val, &val_dead)));
-  }
-}
-
 class DummyDeviceContext : public DeviceContext {
  public:
   explicit DummyDeviceContext(int stream_id) : stream_id_(stream_id) {}