Forbid empty database in ydb admin database restore (#14783)

Author: pixcc

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

@@ -70,7 +70,6 @@ TCommandDatabaseRestore::TCommandDatabaseRestore()
 void TCommandDatabaseRestore::Config(TConfig& config) {
     TYdbCommand::Config(config);
     config.SetFreeArgsNum(0);
-    config.AllowEmptyDatabase = true; // it is possible to retrieve database path from dump
 
     config.Opts->AddLongOption('i', "input", "Path in a local filesystem to a directory with dump.")
         .RequiredArgument("PATH")
@@ -91,12 +90,8 @@ int TCommandDatabaseRestore::Run(TConfig& config) {
     log->SetFormatter(GetPrefixLogFormatter(""));
 
     auto settings = NDump::TRestoreDatabaseSettings()
-        .WaitNodesDuration(WaitNodesDuration);
-
-    if (!config.Database.empty()) {
-        settings.Database(config.Database);
-        config.Database.clear(); // always connect directly to cluster
-    }
+        .WaitNodesDuration(WaitNodesDuration)
+        .Database(config.Database);
 
     NDump::TClient client(CreateDriver(config), std::move(log));
     NStatusHelpers::ThrowOnErrorOrPrintIssues(client.RestoreDatabase(FilePath, settings));

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

@@ -571,8 +571,11 @@ TRestoreResult TRestoreClient::FindClusterRootPath() {
         return Result<TRestoreResult>();
     }
 
+    LOG_D("Try to find cluster root path");
+
     auto status = NDump::ListDirectory(SchemeClient, "/");
     if (!status.IsSuccess()) {
+        LOG_E("Error finding cluster root path: " << status.GetIssues().ToOneLineString());
         return status;
     }
 
@@ -806,6 +809,8 @@ TRestoreResult TRestoreClient::RestoreDatabaseImpl(const TString& fsPath, const
     if (auto result = CreateDatabase(CmsClient, dbPath, TCreateDatabaseSettings(dbDesc)); !result.IsSuccess()) {
         if (result.GetStatus() == EStatus::ALREADY_EXISTS) {
             LOG_W("Database " << dbPath.Quote() << " already exists, continue restoring to this database");
+        } else if (result.GetStatus() == EStatus::UNAUTHORIZED) {
+            LOG_W("Not enough rights to create database " << dbPath.Quote() << ", try to restore to existing database");
         } else {
             return result;
         }