Intermediate changes

6 files changed, 22 insertions, 2 deletions

diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp
index 1c7a61a68a..1089d99179 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp
@@ -519,6 +519,7 @@ TFuture<void> TClient::CreateTableBackup(
     req->set_checkpoint_check_period(ToProto<i64>(options.CheckpointCheckPeriod));
     req->set_checkpoint_check_timeout(ToProto<i64>(options.CheckpointCheckTimeout));
     req->set_force(options.Force);
+    req->set_preserve_account(options.PreserveAccount);
 
     return req->Invoke().As<void>();
 }
@@ -536,6 +537,7 @@ TFuture<void> TClient::RestoreTableBackup(
     req->set_force(options.Force);
     req->set_mount(options.Mount);
     req->set_enable_replicas(options.EnableReplicas);
+    req->set_preserve_account(options.PreserveAccount);
 
     return req->Invoke().As<void>();
 }
diff --git a/yt/yt/client/api/table_client.h b/yt/yt/client/api/table_client.h
index f333788ad2..f4d959e94d 100644
--- a/yt/yt/client/api/table_client.h
+++ b/yt/yt/client/api/table_client.h
@@ -251,6 +251,7 @@ struct TCreateTableBackupOptions
     TDuration CheckpointCheckTimeout = TDuration::Zero();
 
     bool Force = false;
+    bool PreserveAccount = false;
 };
 
 struct TRestoreTableBackupOptions
@@ -259,6 +260,7 @@ struct TRestoreTableBackupOptions
     bool Force = false;
     bool Mount = false;
     bool EnableReplicas = false;
+    bool PreserveAccount = false;
 };
 
 struct TUpdateChaosTableReplicaProgressOptions
diff --git a/yt/yt/client/driver/table_commands.cpp b/yt/yt/client/driver/table_commands.cpp
index 4e4cf3131c..ccd30ac874 100644
--- a/yt/yt/client/driver/table_commands.cpp
+++ b/yt/yt/client/driver/table_commands.cpp
@@ -1549,6 +1549,13 @@ void TCreateTableBackupCommand::Register(TRegistrar registrar)
             return command->Options.Force;
         })
         .Default(false);
+
+    registrar.ParameterWithUniversalAccessor<bool>(
+        "preserve_account",
+        [] (TThis* command) -> auto& {
+            return command->Options.PreserveAccount;
+        })
+        .Default(false);
 }
 
 void TCreateTableBackupCommand::DoExecute(ICommandContextPtr context)
@@ -1585,6 +1592,13 @@ void TRestoreTableBackupCommand::Register(TRegistrar registrar)
             return command->Options.EnableReplicas;
         })
         .Default(false);
+
+    registrar.ParameterWithUniversalAccessor<bool>(
+        "preserve_account",
+        [] (TThis* command) -> auto& {
+            return command->Options.PreserveAccount;
+        })
+        .Default(false);
 }
 
 void TRestoreTableBackupCommand::DoExecute(ICommandContextPtr context)
diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp
index 9388897339..f5ad0c462c 100644
--- a/yt/yt/client/federated/client.cpp
+++ b/yt/yt/client/federated/client.cpp
@@ -762,4 +762,4 @@ IClientPtr CreateClient(
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // NYT::NClient::NFederated
+} // namespace NYT::NClient::NFederated
diff --git a/yt/yt/core/yson/config.h b/yt/yt/core/yson/config.h
index 8e34bc233f..3c5817c5d2 100644
--- a/yt/yt/core/yson/config.h
+++ b/yt/yt/core/yson/config.h
@@ -50,4 +50,4 @@ DEFINE_REFCOUNTED_TYPE(TProtobufInteropDynamicConfig)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // NYT::NYson
+} // namespace NYT::NYson
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index 649d7f6184..a0cef87d82 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -1357,6 +1357,7 @@ message TReqCreateTableBackup
     required uint64 checkpoint_check_period = 3;
     required uint64 checkpoint_check_timeout = 4;
     required bool force = 5;
+    required bool preserve_account = 6;
 }
 
 message TRspCreateTableBackup
@@ -1371,6 +1372,7 @@ message TReqRestoreTableBackup
     required bool force = 2;
     required bool mount = 3;
     required bool enable_replicas = 4;
+    required bool preserve_account = 5;
 }
 
 message TRspRestoreTableBackup