Merge 3b5807c into ea09754

Author: stanislav-shchetinin

ydb/core/protos/flat_scheme_op.proto

@@ -1231,6 +1231,7 @@ message TBackupTask {
     }
 
     optional TPathDescription Table = 10; // for further restore
+    repeated TPathDescription ChangefeedUnderlyingTopics = 17; // for further restore
 
     message TScanSettings {
         optional uint64 RowsBatchSize = 1 [default = 0]; // no limit

ydb/core/tx/datashard/backup_restore_traits.cpp

@@ -76,6 +76,14 @@ TString PermissionsKeySuffix() {
     return "permissions.pb";
 }
 
+TString TopicKeySuffix() {
+    return "topic_description.pb";
+}
+
+TString ChangefeedKeySuffix() {
+    return "changefeed_description.pb";
+}
+
 TString SchemeKeySuffix() {
     return "scheme.pb";
 }

ydb/core/tx/datashard/backup_restore_traits.h

@@ -31,6 +31,8 @@ ECompressionCodec NextCompressionCodec(ECompressionCodec cur);
 TString DataFileExtension(EDataFormat format, ECompressionCodec codec);
 
 TString PermissionsKeySuffix();
+TString TopicKeySuffix();
+TString ChangefeedKeySuffix();
 TString SchemeKeySuffix();
 TString MetadataKeySuffix();
 TString DataKeySuffix(ui32 n, EDataFormat format, ECompressionCodec codec);

ydb/core/tx/datashard/export_s3_uploader.cpp

@@ -13,6 +13,8 @@
 #include <ydb/core/wrappers/s3_storage_config.h>
 #include <ydb/core/wrappers/s3_wrapper.h>
 #include <ydb/core/wrappers/events/common.h>
+#include <ydb/core/ydb_convert/table_description.h>
+#include <ydb/core/ydb_convert/topic_description.h>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/hfunc.h>
 #include <ydb/library/actors/http/http_proxy.h>
@@ -35,6 +37,11 @@ namespace NDataShard {
 using namespace NBackup;
 using namespace NBackupRestoreTraits;
 
+struct TChangefeedExportDescriptions {
+    const Ydb::Table::ChangefeedDescription ChangefeedDescription;
+    const Ydb::Topic::DescribeTopicResult Topic;
+};
+
 class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
     using TS3ExternalStorageConfig = NWrappers::NExternalStorage::TS3ExternalStorageConfig;
     using THttpResolverConfig = NKikimrConfig::TS3ProxyResolverConfig::THttpResolverConfig;
@@ -165,6 +172,8 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
             UploadPermissions();
         } else if (!SchemeUploaded) {
             UploadScheme();
+        } else if (!ChangefeedsUploaded) {
+            UploadChangefeed();
         } else {
             this->Become(&TThis::StateUploadData);
 
@@ -214,6 +223,46 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
         this->Become(&TThis::StateUploadPermissions);
     }
 
+    template <typename T>
+    void PutDescription(const google::protobuf::Message& desc, const TString& key, TString& checksum, T stateFunc) {
+        google::protobuf::TextFormat::PrintToString(desc, &Buffer);
+        if (EnableChecksums) {
+            checksum = ComputeChecksum(Buffer);
+        }
+        auto request = Aws::S3::Model::PutObjectRequest()
+            .WithKey(key);
+        this->Send(Client, new TEvExternalStorage::TEvPutObjectRequest(request, std::move(Buffer)));
+        this->Become(stateFunc);
+    }
+
+    void PutChangefeedDescription(const Ydb::Table::ChangefeedDescription& changefeed, const TString& changefeedName) {
+        PutDescription(changefeed, Settings.GetChangefeedKey(changefeedName), ChangefeedChecksum, &TThis::StateUploadChangefeed);
+    }
+
+    void PutTopicDescription(const Ydb::Topic::DescribeTopicResult& topic, const TString& changefeedName) {
+        PutDescription(topic, Settings.GetTopicKey(changefeedName), TopicChecksum, &TThis::StateUploadTopic);
+    }
+
+    const TString& GetCurrentChangefeedName() const {
+        return Changefeeds.at(IndexExportedChangefeed).ChangefeedDescription.Getname();
+    }
+
+    void UploadChangefeed() {
+        if (IndexExportedChangefeed == Changefeeds.size()) {
+            ChangefeedsUploaded = true;
+            if (Scanner) {
+                this->Send(Scanner, new TEvExportScan::TEvFeed());
+            }
+            this->Become(&TThis::StateUploadData);
+            return;
+        }
+        PutChangefeedDescription(Changefeeds[IndexExportedChangefeed].ChangefeedDescription, GetCurrentChangefeedName());
+    }
+
+    void UploadTopic() {
+        PutTopicDescription(Changefeeds[IndexExportedChangefeed].Topic, GetCurrentChangefeedName());
+    }
+
     void UploadMetadata() {
         Y_ABORT_UNLESS(!MetadataUploaded);
 
@@ -256,11 +305,7 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
 
         auto nextStep = [this]() {
             SchemeUploaded = true;
-
-            if (Scanner) {
-                this->Send(Scanner, new TEvExportScan::TEvFeed());
-            }
-            this->Become(&TThis::StateUploadData);
+            UploadChangefeed();
         };
 
         if (EnableChecksums) {
@@ -295,6 +340,51 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
         }
     }
 
+    void HandleChangefeed(TEvExternalStorage::TEvPutObjectResponse::TPtr& ev) {
+        const auto& result = ev->Get()->Result;
+
+        EXPORT_LOG_D("HandleChangefeed TEvExternalStorage::TEvPutObjectResponse"
+            << ": self# " << this->SelfId()
+            << ", result# " << result);
+
+        if (!CheckResult(result, TStringBuf("PutObject (changefeed)"))) {
+            return;
+        }
+
+        auto nextStep = [this]() {
+            UploadTopic();
+        };
+        if (EnableChecksums) {
+            TString checksumKey = ChecksumKey(Settings.GetChangefeedKey(GetCurrentChangefeedName()));
+            UploadChecksum(std::move(ChangefeedChecksum), checksumKey, ChangefeedKeySuffix(), nextStep);
+        } else {
+            nextStep();
+        }
+    }
+
+    void HandleTopic(TEvExternalStorage::TEvPutObjectResponse::TPtr& ev) {
+        const auto& result = ev->Get()->Result;
+
+        EXPORT_LOG_D("HandleTopic TEvExternalStorage::TEvPutObjectResponse"
+            << ": self# " << this->SelfId()
+            << ", result# " << result);
+
+        if (!CheckResult(result, TStringBuf("PutObject (topic)"))) {
+            return;
+        }
+
+        auto nextStep = [this]() {
+            ++IndexExportedChangefeed;
+            UploadChangefeed();
+        };
+        if (EnableChecksums) {
+            TString checksumKey = ChecksumKey(Settings.GetTopicKey(GetCurrentChangefeedName()));
+            UploadChecksum(std::move(TopicChecksum), checksumKey, TopicKeySuffix(), nextStep);
+        } else {
+            nextStep();
+        }
+    }
+
     void HandleMetadata(TEvExternalStorage::TEvPutObjectResponse::TPtr& ev) {
         const auto& result = ev->Get()->Result;
 
@@ -344,7 +434,7 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
             return PassAway();
         }
 
-        if (ProxyResolved && SchemeUploaded && MetadataUploaded && PermissionsUploaded) {
+        if (ProxyResolved && SchemeUploaded && MetadataUploaded && PermissionsUploaded && ChangefeedsUploaded) {
             this->Send(Scanner, new TEvExportScan::TEvFeed());
         }
     }
@@ -661,6 +751,7 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
             const TActorId& dataShard, ui64 txId,
             const NKikimrSchemeOp::TBackupTask& task,
             TMaybe<Ydb::Table::CreateTableRequest>&& scheme,
+            TVector<TChangefeedExportDescriptions> changefeeds,
             TMaybe<Ydb::Scheme::ModifyPermissionsRequest>&& permissions,
             TString&& metadata)
         : ExternalStorageConfig(new TS3ExternalStorageConfig(task.GetS3Settings()))
@@ -672,12 +763,14 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
         , DataShard(dataShard)
         , TxId(txId)
         , Scheme(std::move(scheme))
+        , Changefeeds(std::move(changefeeds))
         , Metadata(std::move(metadata))
         , Permissions(std::move(permissions))
         , Retries(task.GetNumberOfRetries())
         , Attempt(0)
         , Delay(TDuration::Minutes(1))
         , SchemeUploaded(ShardNum == 0 ? false : true)
+        , ChangefeedsUploaded(ShardNum == 0 ? false : true)
         , MetadataUploaded(ShardNum == 0 ? false : true)
         , PermissionsUploaded(ShardNum == 0 ? false : true)
         , EnableChecksums(task.GetEnableChecksums())
@@ -730,6 +823,22 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
         }
     }
 
+    STATEFN(StateUploadChangefeed) {
+        switch (ev->GetTypeRewrite()) {
+            hFunc(TEvExternalStorage::TEvPutObjectResponse, HandleChangefeed);
+        default:
+            return StateBase(ev);
+        }
+    }
+
+    STATEFN(StateUploadTopic) {
+        switch (ev->GetTypeRewrite()) {
+            hFunc(TEvExternalStorage::TEvPutObjectResponse, HandleTopic);
+        default:
+            return StateBase(ev);
+        }
+    }
+
     STATEFN(StateUploadMetadata) {
         switch (ev->GetTypeRewrite()) {
             hFunc(TEvExternalStorage::TEvPutObjectResponse, HandleMetadata);
@@ -775,17 +884,20 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
     const TActorId DataShard;
     const ui64 TxId;
     const TMaybe<Ydb::Table::CreateTableRequest> Scheme;
+    const TVector<TChangefeedExportDescriptions> Changefeeds;
     const TString Metadata;
     const TMaybe<Ydb::Scheme::ModifyPermissionsRequest> Permissions;
 
     const ui32 Retries;
     ui32 Attempt;
+    ui64 IndexExportedChangefeed = 0;
 
     TDuration Delay;
     static constexpr TDuration MaxDelay = TDuration::Minutes(10);
 
     TActorId Client;
     bool SchemeUploaded;
+    bool ChangefeedsUploaded;
     bool MetadataUploaded;
     bool PermissionsUploaded;
     bool MultiPart;
@@ -801,6 +913,8 @@ class TS3Uploader: public TActorBootstrapped<TS3Uploader> {
     bool EnableChecksums;
     TString DataChecksum;
     TString MetadataChecksum;
+    TString ChangefeedChecksum;
+    TString TopicChecksum;
     TString SchemeChecksum;
     TString PermissionsChecksum;
     std::function<void()> ChecksumUploadedCallback;
@@ -812,6 +926,28 @@ IActor* TS3Export::CreateUploader(const TActorId& dataShard, ui64 txId) const {
         ? GenYdbScheme(Columns, Task.GetTable())
         : Nothing();
 
+    const auto& persQueues = Task.GetChangefeedUnderlyingTopics();
+    const auto& cdcStreams = Task.GetTable().GetTable().GetCdcStreams();
+    Y_ASSERT(persQueues.size() == cdcStreams.size());
+
+    const int changefeedsCount = cdcStreams.size();
+    TVector <TChangefeedExportDescriptions> changefeeds;
+    changefeeds.reserve(changefeedsCount);
+
+    for (int i = 0; i < changefeedsCount; ++i) {
+        Ydb::Table::ChangefeedDescription changefeed;
+        const auto& cdcStream = cdcStreams.at(i);
+        FillChangefeedDescription(changefeed, cdcStream);
+
+        Ydb::Topic::DescribeTopicResult topic;
+        const auto& pq = persQueues.at(i);
+        Ydb::StatusIds::StatusCode status;
+        TString error;
+        FillTopicDescription(topic, pq.GetPersQueueGroup(), pq.GetSelf(), cdcStream.GetName(), status, error);
+
+        changefeeds.emplace_back(changefeed, topic);
+    }
+
     auto permissions = (Task.GetShardNum() == 0)
         ? GenYdbPermissions(Task.GetTable())
         : Nothing();
@@ -827,7 +963,7 @@ IActor* TS3Export::CreateUploader(const TActorId& dataShard, ui64 txId) const {
     metadata.AddFullBackup(backup);
 
     return new TS3Uploader(
-        dataShard, txId, Task, std::move(scheme), std::move(permissions), metadata.Serialize());
+        dataShard, txId, Task, std::move(scheme), std::move(changefeeds), std::move(permissions), metadata.Serialize());
 }
 
 } // NDataShard

ydb/core/tx/datashard/extstorage_usage_config.h

@@ -46,6 +46,14 @@ class TS3Settings {
         return ObjectKeyPattern + '/' + NBackupRestoreTraits::PermissionsKeySuffix();
     }
 
+    inline TString GetTopicKey(const TString& changefeedName) const {
+        return TStringBuilder() << ObjectKeyPattern << '/'<< changefeedName << '/' << NBackupRestoreTraits::TopicKeySuffix();
+    }
+
+     inline TString GetChangefeedKey(const TString& changefeedName) const {
+        return TStringBuilder() << ObjectKeyPattern << '/' << changefeedName << '/' << NBackupRestoreTraits::ChangefeedKeySuffix();
+    }
+
     inline TString GetMetadataKey() const {
         return ObjectKeyPattern + '/' + NBackupRestoreTraits::MetadataKeySuffix();
     }

ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp

@@ -45,6 +45,7 @@ struct TBackup {
             context.OnComplete.BindMsgToPipe(opId, datashardId, idx, event.Release());
 
             backup.ClearTable();
+            backup.ClearChangefeedUnderlyingTopics();
         }
     }
 

ydb/core/tx/schemeshard/schemeshard_export_flow_proposals.cpp

@@ -71,19 +71,48 @@ THolder<TEvSchemeShard::TEvModifySchemeTransaction> CopyTablesPropose(
     return propose;
 }
 
-static NKikimrSchemeOp::TPathDescription GetTableDescription(TSchemeShard* ss, const TPathId& pathId) {
-    NKikimrSchemeOp::TDescribeOptions opts;
+static void SetTableDescriptionOptions(NKikimrSchemeOp::TDescribeOptions& opts) {
     opts.SetReturnPartitioningInfo(false);
     opts.SetReturnPartitionConfig(true);
     opts.SetReturnBoundaries(true);
     opts.SetReturnIndexTableBoundaries(true);
+}
+
+static void SetChangefeedDescriptionOptions(NKikimrSchemeOp::TDescribeOptions& opts) {
+    SetTableDescriptionOptions(opts);
+    opts.SetShowPrivateTable(true);
+}
 
+static void SetTopicDescriptionOptions(NKikimrSchemeOp::TDescribeOptions& opts) {
+    SetTableDescriptionOptions(opts);
+    opts.SetShowPrivateTable(true);
+}
+
+static NKikimrSchemeOp::TPathDescription GetDescription(TSchemeShard* ss, const TPathId& pathId, NKikimrSchemeOp::TDescribeOptions& opts) {
     auto desc = DescribePath(ss, TlsActivationContext->AsActorContext(), pathId, opts);
     auto record = desc->GetRecord();
 
     return record.GetPathDescription();
 }
 
+static NKikimrSchemeOp::TPathDescription GetTableDescription(TSchemeShard* ss, const TPathId& pathId) {
+    NKikimrSchemeOp::TDescribeOptions opts;
+    SetTableDescriptionOptions(opts);
+    return GetDescription(ss, pathId, opts);
+}
+
+static NKikimrSchemeOp::TPathDescription GetChangefeedDescription(TSchemeShard* ss, const TPathId& pathId) {
+    NKikimrSchemeOp::TDescribeOptions opts;
+    SetChangefeedDescriptionOptions(opts);
+    return GetDescription(ss, pathId, opts);
+}
+
+static NKikimrSchemeOp::TPathDescription GetTopicDescription(TSchemeShard* ss, const TPathId& pathId) {
+    NKikimrSchemeOp::TDescribeOptions opts;
+    SetTopicDescriptionOptions(opts);
+    return GetDescription(ss, pathId, opts);
+}
+
 void FillSetValForSequences(TSchemeShard* ss, NKikimrSchemeOp::TTableDescription& description,
         const TPathId& exportItemPathId) {
     NKikimrSchemeOp::TDescribeOptions opts;
@@ -149,7 +178,14 @@ THolder<TEvSchemeShard::TEvModifySchemeTransaction> BackupPropose(
         if (sourceDescription.HasTable()) {
             FillSetValForSequences(
                 ss, *sourceDescription.MutableTable(), exportItemPath.Base()->PathId);
-            FillPartitioning(ss, *sourceDescription.MutableTable(), exportItemPath.Base()->PathId);
+            for (const auto& cdcStream : sourceDescription.GetTable().GetCdcStreams()) {
+                auto cdcPathDesc =  GetChangefeedDescription(ss, TPathId::FromProto(cdcStream.GetPathId()));
+                for (const auto& child : cdcPathDesc.GetChildren()) {
+                    if (child.GetPathType() == NKikimrSchemeOp::EPathTypePersQueueGroup) {
+                        *task.AddChangefeedUnderlyingTopics() = GetTopicDescription(ss, TPathId(child.GetSchemeshardId(), child.GetPathId()));
+                    }
+                }
+            }
         }
         task.MutableTable()->CopyFrom(sourceDescription);
     }