Move the reset operation to the instance manager

Author: jemoreira

base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel

@@ -303,7 +303,6 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/cli:types",
         "//cuttlefish/host/commands/cvd/cli/commands:command_handler",
         "//cuttlefish/host/commands/cvd/instances",
-        "//cuttlefish/host/commands/cvd/instances:reset_client_utils",
         "//cuttlefish/host/commands/cvd/utils",
         "//libbase",
     ],

base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp

@@ -53,7 +53,7 @@ CvdClearCommandHandler::CvdClearCommandHandler(
 
 Result<void> CvdClearCommandHandler::Handle(const CommandRequest& request) {
   CF_EXPECT(CanHandle(request));
-  CF_EXPECT(instance_manager_.CvdClear());
+  CF_EXPECT(instance_manager_.Clear());
   return {};
 }
 

base/cvd/cuttlefish/host/commands/cvd/cli/commands/reset.cpp

@@ -27,14 +27,12 @@
 
 #include <android-base/logging.h>
 
-#include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/flag_parser.h"
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/cvd/cli/command_request.h"
 #include "cuttlefish/host/commands/cvd/cli/commands/command_handler.h"
 #include "cuttlefish/host/commands/cvd/cli/types.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_manager.h"
-#include "cuttlefish/host/commands/cvd/instances/reset_client_utils.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 
 namespace cuttlefish {
@@ -142,15 +140,11 @@ class CvdResetCommandHandler : public CvdCommandHandler {
       return {};
     }
 
-    instance_manager_.CvdClear();
-    // The instance database is obsolete now, clear it.
-    auto instance_db_deleted = RemoveFile(InstanceDatabasePath());
-    if (!instance_db_deleted) {
-      LOG(ERROR) << "Error deleting instance database file";
+    if (options.clean_runtime_dir) {
+      CF_EXPECT(instance_manager_.ResetAndClearInstanceDirs());
+    } else {
+      CF_EXPECT(instance_manager_.Reset());
     }
-
-    CF_EXPECT(KillAllCuttlefishInstances(
-        /* clear_instance_dirs*/ options.clean_runtime_dir));
     return {};
   }
   cvd_common::Args CmdList() const override { return {kResetSubcmd}; }

base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel

@@ -138,6 +138,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances:config_path",
         "//cuttlefish/host/commands/cvd/instances:data_viewer",
         "//cuttlefish/host/commands/cvd/instances:device_name",
+        "//cuttlefish/host/commands/cvd/instances:reset_client_utils",
         "//cuttlefish/host/commands/cvd/instances:run_cvd_proc_collector",
         "//cuttlefish/host/commands/cvd/instances/lock",
         "//cuttlefish/host/commands/cvd/utils",
@@ -165,7 +166,6 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/common/libs/utils:subprocess_managed_stdio",
-        "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:run_cvd_proc_collector",
         "//cuttlefish/host/commands/cvd/utils",
         "//libbase",

base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.cpp

@@ -39,6 +39,7 @@
 #include "cuttlefish/host/commands/cvd/instances/instance_record.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/instance_lock.h"
 #include "cuttlefish/host/commands/cvd/instances/lock/lock_file.h"
+#include "cuttlefish/host/commands/cvd/instances/reset_client_utils.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
@@ -259,7 +260,7 @@ Result<void> InstanceManager::IssueStopCommand(
   return {};
 }
 
-Result<void> InstanceManager::CvdClear() {
+Result<void> InstanceManager::Clear() {
   const std::string config_json_name =
       android::base::Basename(GetGlobalConfigFileLink());
   auto instance_groups =
@@ -289,12 +290,32 @@ Result<void> InstanceManager::CvdClear() {
     RemoveFile(group.HomeDir() + config_json_name);
     RemoveGroupDirectory(group);
   }
-  // TODO(kwstephenkim): we need a better mechanism to make sure that
-  // we clear all run_cvd processes.
   std::cerr << "Stopped all known instances\n";
   return {};
 }
 
+Result<void> InstanceManager::Reset() {
+  CF_EXPECT(Clear());
+  auto instance_db_deleted = RemoveFile(InstanceDatabasePath());
+  if (!instance_db_deleted) {
+    LOG(ERROR) << "Error deleting instance database file";
+  }
+
+  CF_EXPECT(KillAllCuttlefishInstances(false));
+  return {};
+}
+
+Result<void> InstanceManager::ResetAndClearInstanceDirs() {
+  CF_EXPECT(Clear());
+  auto instance_db_deleted = RemoveFile(InstanceDatabasePath());
+  if (!instance_db_deleted) {
+    LOG(ERROR) << "Error deleting instance database file";
+  }
+
+  CF_EXPECT(KillAllCuttlefishInstances(true));
+  return {};
+}
+
 Result<std::vector<LocalInstanceGroup>> InstanceManager::FindGroups(
     const InstanceDatabase::Filter& filter) const {
   return instance_db_.FindGroups(filter);

base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.h

@@ -57,7 +57,12 @@ class InstanceManager {
   Result<void> UpdateInstanceGroup(const LocalInstanceGroup& group);
   Result<bool> RemoveInstanceGroup(LocalInstanceGroup group);
 
-  Result<void> CvdClear();
+  // Stops and removes all known instance instance groups
+  Result<void> Clear();
+  // Similar to Clear(), but also attempts to stop devices owned by the current
+  // user and not tracked in the instance database.
+  Result<void> Reset();
+  Result<void> ResetAndClearInstanceDirs();
 
   Result<std::vector<LocalInstanceGroup>> FindGroups(
       const InstanceDatabase::Filter& filter) const;