fix

Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
ray-project · Sep 26, 2024 · cd706f8 · cd706f8
1 parent a617af4
commit cd706f8
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 24 deletions.
diff --git a/src/ray/gcs/gcs_client/accessor.h b/src/ray/gcs/gcs_client/accessor.h
@@ -932,13 +932,6 @@ class InternalKVAccessor {
                         const int64_t timeout_ms,
                         bool &exists);
 
-  /// Get the internal config string from GCS.
-  ///
-  /// \param callback Processes a map of config options
-  /// \return Status
-  virtual Status AsyncGetInternalConfig(
-      const OptionalItemCallback<std::string> &callback);
-
  private:
   GcsClient *client_impl_;
 };

diff --git a/src/ray/gcs/gcs_server/gcs_kv_manager.cc b/src/ray/gcs/gcs_server/gcs_kv_manager.cc
@@ -141,8 +141,6 @@ void GcsInternalKVManager::HandleInternalKVKeys(
   }
 }
 
-std::string GcsInternalKVManager::DebugString() const { return ""; }
-
 Status GcsInternalKVManager::ValidateKey(const std::string &key) const {
   constexpr std::string_view kNamespacePrefix = "@namespace_";
   if (absl::StartsWith(key, kNamespacePrefix)) {

diff --git a/src/ray/gcs/gcs_server/gcs_kv_manager.h b/src/ray/gcs/gcs_server/gcs_kv_manager.h
@@ -14,7 +14,6 @@
 
 #pragma once
 #include <memory>
-#include <string_view>
 
 #include "absl/container/btree_map.h"
 #include "absl/synchronization/mutex.h"
@@ -101,7 +100,6 @@ class InternalKVInterface {
 /// This implementation class of `InternalKVHandler`.
 class GcsInternalKVManager : public rpc::InternalKVHandler {
  public:
-  // `raylet_config_list` must outlive this class.
   explicit GcsInternalKVManager(std::unique_ptr<InternalKVInterface> kv_instance)
       : kv_instance_(std::move(kv_instance)) {}
 
@@ -131,8 +129,6 @@ class GcsInternalKVManager : public rpc::InternalKVHandler {
 
   InternalKVInterface &GetInstance() { return *kv_instance_; }
 
-  std::string DebugString() const;
-
  private:
   std::unique_ptr<InternalKVInterface> kv_instance_;
   Status ValidateKey(const std::string &key) const;

diff --git a/src/ray/gcs/gcs_server/gcs_server.cc b/src/ray/gcs/gcs_server/gcs_server.cc
@@ -809,8 +809,7 @@ std::string GcsServer::GetDebugState() const {
          << gcs_placement_group_manager_->DebugString() << "\n\n"
          << gcs_publisher_->DebugString() << "\n\n"
          << runtime_env_manager_->DebugString() << "\n\n"
-         << gcs_task_manager_->DebugString() << "\n\n"
-         << kv_manager_->DebugString() << "\n\n";
+         << gcs_task_manager_->DebugString() << "\n\n";
   return stream.str();
 }
 

diff --git a/src/ray/gcs/gcs_server/gcs_table_storage.cc b/src/ray/gcs/gcs_server/gcs_table_storage.cc
@@ -208,7 +208,6 @@ template class GcsTable<JobID, ErrorTableData>;
 template class GcsTable<WorkerID, WorkerTableData>;
 template class GcsTable<ActorID, ActorTableData>;
 template class GcsTable<ActorID, TaskSpec>;
-template class GcsTable<UniqueID, StoredConfig>;
 template class GcsTableWithJobId<ActorID, ActorTableData>;
 template class GcsTableWithJobId<ActorID, TaskSpec>;
 template class GcsTable<PlacementGroupID, PlacementGroupTableData>;

diff --git a/src/ray/gcs/gcs_server/gcs_table_storage.h b/src/ray/gcs/gcs_server/gcs_table_storage.h
@@ -32,7 +32,6 @@ using rpc::GcsNodeInfo;
 using rpc::JobTableData;
 using rpc::PlacementGroupTableData;
 using rpc::ResourceUsageBatchData;
-using rpc::StoredConfig;
 using rpc::TaskSpec;
 using rpc::WorkerTableData;
 

diff --git a/src/ray/gcs/gcs_server/test/gcs_autoscaler_state_manager_test.cc b/src/ray/gcs/gcs_server/test/gcs_autoscaler_state_manager_test.cc
@@ -45,7 +45,6 @@ class GcsAutoscalerStateManagerTest : public ::testing::Test {
   GcsAutoscalerStateManagerTest() {}
 
  protected:
-  static constexpr char kRayletConfig[] = R"({"raylet_config":"this is a config"})";
   instrumented_io_context io_service_;
   std::shared_ptr<GcsServerMocker::MockRayletClient> raylet_client_;
   std::shared_ptr<rpc::NodeManagerClientPool> client_pool_;
@@ -66,8 +65,7 @@ class GcsAutoscalerStateManagerTest : public ::testing::Test {
     cluster_resource_manager_ = std::make_unique<ClusterResourceManager>(io_service_);
     gcs_node_manager_ = std::make_shared<MockGcsNodeManager>();
     kv_manager_ = std::make_unique<GcsInternalKVManager>(
-        std::make_unique<StoreClientInternalKV>(std::make_unique<MockStoreClient>()),
-        kRayletConfig);
+        std::make_unique<StoreClientInternalKV>(std::make_unique<MockStoreClient>()));
     function_manager_ = std::make_unique<GcsFunctionManager>(kv_manager_->GetInstance());
     runtime_env_manager_ = std::make_unique<RuntimeEnvManager>(
         [](const std::string &, std::function<void(bool)>) {});

diff --git a/src/ray/protobuf/gcs.proto b/src/ray/protobuf/gcs.proto
@@ -467,10 +467,6 @@ message WorkerDeltaData {
   bytes worker_id = 2;
 }
 
-message StoredConfig {
-  string config = 1;
-}
-
 message PubSubMessage {
   bytes id = 1;
   bytes data = 2;