kesus: support in recursive rmdir (#16129)

Author: jepett0

ydb/apps/ydb/CHANGELOG.md

@@ -1,4 +1,6 @@
+* Support coordination nodes in `ydb scheme rmdir --recursive`.
 * Fixed return code of command `ydb workload * run --check-canonical` for the case when benchmark query results differ from canonical ones.
+
 ## 2.20.0 ##
 
 * Added support for dual configuration mode in the `ydb admin cluster config fetch` command, allowing it to handle separate cluster and storage config sections.

ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp

@@ -90,8 +90,9 @@ int TCommandRemoveDirectory::Run(TConfig& config) {
         NTable::TTableClient tableClient(driver);
         NTopic::TTopicClient topicClient(driver);
         NQuery::TQueryClient queryClient(driver);
+        NCoordination::TClient coordinationClient(driver);
         const auto prompt = Prompt.GetOrElse(ERecursiveRemovePrompt::Once);
-        NStatusHelpers::ThrowOnErrorOrPrintIssues(RemoveDirectoryRecursive(schemeClient, tableClient, &topicClient, &queryClient, Path, prompt, settings));
+        NStatusHelpers::ThrowOnErrorOrPrintIssues(RemoveDirectoryRecursive(schemeClient, tableClient, &topicClient, &queryClient, &coordinationClient, Path, prompt, settings));
     } else {
         if (Prompt) {
             if (!NConsoleClient::Prompt(*Prompt, Path, NScheme::ESchemeEntryType::Directory)) {

ydb/public/lib/ydb_cli/commands/ydb_workload.cpp

@@ -397,7 +397,7 @@ void TWorkloadCommandBase::CleanTables(NYdbWorkload::IWorkloadQueryGenerator& wo
         if (DryRun) {
             Cout << "Remove " << fullPath << Endl;
         } else {
-            NStatusHelpers::ThrowOnErrorOrPrintIssues(RemovePathRecursive(*SchemeClient, *TableClient, TopicClient.Get(), QueryClient.Get(), fullPath, ERecursiveRemovePrompt::Never, settings));
+            NStatusHelpers::ThrowOnErrorOrPrintIssues(RemovePathRecursive(*SchemeClient, *TableClient, TopicClient.Get(), QueryClient.Get(), nullptr, fullPath, ERecursiveRemovePrompt::Never, settings));
         }
         Cout << "Remove path " << path << "...Ok"  << Endl;
     }

ydb/public/lib/ydb_cli/common/recursive_remove.cpp

@@ -70,6 +70,12 @@ TStatus RemoveTopic(TTopicClient& client, const TString& path, const TDropTopicS
     });
 }
 
+TStatus RemoveCoordinationNode(NCoordination::TClient& client, const TString& path, const NCoordination::TDropNodeSettings& settings) {
+    return RetryFunction([&]() -> TStatus {
+        return client.DropNode(path, settings).ExtractValueSync();
+    });
+}
+
 NYdb::NIssue::TIssues MakeIssues(const TString& error) {
     NYdb::NIssue::TIssues issues;
     issues.AddIssue(NYdb::NIssue::TIssue(error));
@@ -121,8 +127,8 @@ TStatus Remove(TRemoveFunc<TClient, TSettings> func, TSchemeClient& schemeClient
 }
 
 TStatus Remove(
-    TSchemeClient& schemeClient, TTableClient* tableClient, TTopicClient* topicClient, NQuery::TQueryClient* queryClient, const ESchemeEntryType type,
-    const TString& path, ERecursiveRemovePrompt prompt, const TRemoveDirectorySettings& settings)
+    TSchemeClient& schemeClient, TTableClient* tableClient, TTopicClient* topicClient, NQuery::TQueryClient* queryClient, NCoordination::TClient* coordinationClient,
+    const ESchemeEntryType type, const TString& path, ERecursiveRemovePrompt prompt, const TRemoveDirectorySettings& settings)
 {
     switch (type) {
     case ESchemeEntryType::Directory:
@@ -143,6 +149,8 @@ TStatus Remove(
         return Remove(&RemoveExternalTable, schemeClient, tableClient, type, path, prompt, settings);
     case ESchemeEntryType::View:
         return Remove(&RemoveView, schemeClient, queryClient, type, path, prompt, settings);
+    case ESchemeEntryType::CoordinationNode:
+        return Remove(&RemoveCoordinationNode, schemeClient, coordinationClient, type, path, prompt, settings);
 
     default:
         return TStatus(EStatus::UNSUPPORTED, MakeIssues(TStringBuilder()
@@ -155,6 +163,7 @@ TStatus RemoveDirectoryRecursive(
         TTableClient* tableClient,
         TTopicClient* topicClient,
         NQuery::TQueryClient* queryClient,
+        NCoordination::TClient* coordinationClient,
         const TString& path,
         ERecursiveRemovePrompt prompt,
         const TRemoveDirectorySettings& settings,
@@ -179,7 +188,7 @@ TStatus RemoveDirectoryRecursive(
     // output order is: Root, Recursive(children)...
     // we need to reverse it to delete recursively
     for (auto it = recursiveListResult.Entries.rbegin(); it != recursiveListResult.Entries.rend(); ++it) {
-        if (auto result = Remove(schemeClient, tableClient, topicClient, queryClient, it->Type, TString{it->Name}, prompt, settings); !result.IsSuccess()) {
+        if (auto result = Remove(schemeClient, tableClient, topicClient, queryClient, coordinationClient, it->Type, TString{it->Name}, prompt, settings); !result.IsSuccess()) {
             return result;
         }
         if (createProgressBar) {
@@ -198,24 +207,25 @@ TStatus RemoveDirectoryRecursive(
         bool removeSelf,
         bool createProgressBar)
 {
-    return RemoveDirectoryRecursive(schemeClient, &tableClient, nullptr, nullptr, path, ERecursiveRemovePrompt::Never, settings, removeSelf, createProgressBar);
+    return RemoveDirectoryRecursive(schemeClient, &tableClient, nullptr, nullptr, nullptr, path, ERecursiveRemovePrompt::Never, settings, removeSelf, createProgressBar);
 }
 
 TStatus RemoveDirectoryRecursive(
         TSchemeClient& schemeClient,
         TTableClient& tableClient,
         TTopicClient* topicClient,
         NQuery::TQueryClient* queryClient,
+        NCoordination::TClient* coordinationClient,
         const TString& path,
         ERecursiveRemovePrompt prompt,
         const TRemoveDirectorySettings& settings,
         bool removeSelf,
         bool createProgressBar)
 {
-    return RemoveDirectoryRecursive(schemeClient, &tableClient, topicClient, queryClient, path, prompt, settings, removeSelf, createProgressBar);
+    return RemoveDirectoryRecursive(schemeClient, &tableClient, topicClient, queryClient, coordinationClient, path, prompt, settings, removeSelf, createProgressBar);
 }
 
-NYdb::TStatus RemovePathRecursive(NScheme::TSchemeClient& schemeClient, NTable::TTableClient& tableClient, NTopic::TTopicClient* topicClient, NQuery::TQueryClient* queryClient, const TString& path, ERecursiveRemovePrompt prompt, const TRemovePathRecursiveSettings& settings /*= {}*/, bool createProgressBar /*= true*/) {
+NYdb::TStatus RemovePathRecursive(NScheme::TSchemeClient& schemeClient, NTable::TTableClient& tableClient, NTopic::TTopicClient* topicClient, NQuery::TQueryClient* queryClient, NCoordination::TClient* coordinationClient, const TString& path, ERecursiveRemovePrompt prompt, const TRemovePathRecursiveSettings& settings /*= {}*/, bool createProgressBar /*= true*/) {
     auto entity = schemeClient.DescribePath(path).ExtractValueSync();
     if (!entity.IsSuccess()) {
         if (settings.NotExistsIsOk_ && entity.GetStatus() == EStatus::SCHEME_ERROR && entity.GetIssues().ToString().find("Path not found") != TString::npos) {
@@ -226,9 +236,9 @@ NYdb::TStatus RemovePathRecursive(NScheme::TSchemeClient& schemeClient, NTable::
     switch (entity.GetEntry().Type) {
     case ESchemeEntryType::Directory:
     case ESchemeEntryType::ColumnStore:
-        return RemoveDirectoryRecursive(schemeClient, tableClient, topicClient, queryClient, path, prompt, settings, true, createProgressBar);
+        return RemoveDirectoryRecursive(schemeClient, tableClient, topicClient, queryClient, coordinationClient, path, prompt, settings, true, createProgressBar);
     default:
-        return Remove(schemeClient, &tableClient, topicClient, queryClient, entity.GetEntry().Type, path, prompt, settings);
+        return Remove(schemeClient, &tableClient, topicClient, queryClient, coordinationClient, entity.GetEntry().Type, path, prompt, settings);
     }
 }
 }

ydb/public/lib/ydb_cli/common/recursive_remove.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/coordination/coordination.h>
 #include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
 #include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h>
 #include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h>
@@ -32,6 +33,7 @@ TStatus RemoveDirectoryRecursive(
     NTable::TTableClient& tableClient,
     NTopic::TTopicClient* topicClient,
     NQuery::TQueryClient* queryClient,
+    NCoordination::TClient* coordinationClient,
     const TString& path,
     ERecursiveRemovePrompt prompt,
     const NScheme::TRemoveDirectorySettings& settings = {},
@@ -43,6 +45,7 @@ TStatus RemovePathRecursive(
     NTable::TTableClient& tableClient,
     NTopic::TTopicClient* topicClient,
     NQuery::TQueryClient* queryClient,
+    NCoordination::TClient* coordinationClient,
     const TString& path,
     ERecursiveRemovePrompt prompt,
     const TRemovePathRecursiveSettings& settings = {},

ydb/public/lib/ydb_cli/dump/restore_impl.cpp

@@ -497,7 +497,7 @@ TRestoreResult TRestoreClient::Restore(const TString& fsPath, const TString& dbP
 
         switch (entry.Type) {
             case ESchemeEntryType::Directory:
-                result = RemoveDirectoryRecursive(SchemeClient, TableClient, nullptr, &QueryClient,
+                result = RemoveDirectoryRecursive(SchemeClient, TableClient, &TopicClient, &QueryClient, &CoordinationNodeClient,
                     TString{fullPath}, ERecursiveRemovePrompt::Never, {}, true, false);
                 break;
             case ESchemeEntryType::Table:

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/coordination/coordination.h

@@ -198,7 +198,9 @@ struct TCreateNodeSettings : public TNodeSettings<TCreateNodeSettings> {
     TCreateNodeSettings(const Ydb::Coordination::Config& config);
 };
 struct TAlterNodeSettings : public TNodeSettings<TAlterNodeSettings> { };
-struct TDropNodeSettings : public TOperationRequestSettings<TDropNodeSettings> { };
+struct TDropNodeSettings : public TOperationRequestSettings<TDropNodeSettings> {
+    using TOperationRequestSettings<TDropNodeSettings>::TOperationRequestSettings;
+};
 struct TDescribeNodeSettings : public TOperationRequestSettings<TDescribeNodeSettings> { };
 
 ////////////////////////////////////////////////////////////////////////////////