Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reapply reverted PR enabling view export #13677

Merged
merged 21 commits into from
Jan 24, 2025
Merged

Reapply reverted PR enabling view export #13677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8e8f603
Reapply "Export views" (#13509)
jepett0 Jan 21, 2025
46baaff
Export style fixes
jepett0 Jan 13, 2025
28d56b5
export: compilation fix
jepett0 Jan 14, 2025
e817552
export: view metadata
jepett0 Jan 21, 2025
e8017a3
export: faster scheme uploader murder
jepett0 Jan 22, 2025
a8a8440
const for fields of TEvExportSchemeUploadResult
jepett0 Jan 22, 2025
b5a0578
export: scheme uploader separate describe method
jepett0 Jan 22, 2025
45fdf02
export: finish and pass away instead of reportError
jepett0 Jan 22, 2025
f7b3708
compilation fix in backup.cpp
jepett0 Jan 22, 2025
5487eec
export: compilation fix for TString
jepett0 Jan 22, 2025
b201122
export: fixup after merge with errors
jepett0 Jan 22, 2025
8c45717
Apply suggestions from code review
jepett0 Jan 22, 2025
a9e6b43
export: no this-> in scheme uploader
jepett0 Jan 23, 2025
f65fde8
export: refactoring with a new special path for non-tables
jepett0 Jan 23, 2025
721b838
export: reboot tests
jepett0 Jan 22, 2025
f2a91f4
export: fix copy table tx id retrieval
jepett0 Jan 22, 2025
c29d2ca
export: cancel bugfix?
jepett0 Jan 23, 2025
9a2772c
Revert "export: cancel bugfix?"
jepett0 Jan 23, 2025
cd0a8e5
export: correct cancellation state handling
jepett0 Jan 23, 2025
08862d4
export: feature flag
jepett0 Jan 24, 2025
eb25e5a
export: review fixes
jepett0 Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ydb/core/protos/feature_flags.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,5 @@ message TFeatureFlags {
optional bool DisableLocalDBEraseCache = 161 [default = false];
optional bool EnableExportChecksums = 162 [default = false];
optional bool EnableTopicTransfer = 163 [default = false];
optional bool EnableViewExport = 164 [default = false];
}
1 change: 1 addition & 0 deletions ydb/core/tx/schemeshard/schemeshard__init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4329,6 +4329,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {

item.SourcePathId.OwnerId = rowset.GetValueOrDefault<Schema::ExportItems::SourceOwnerPathId>(selfId);
item.SourcePathId.LocalPathId = rowset.GetValue<Schema::ExportItems::SourcePathId>();
item.SourcePathType = rowset.GetValue<Schema::ExportItems::SourcePathType>();

item.State = static_cast<TExportInfo::EState>(rowset.GetValue<Schema::ExportItems::State>());
item.WaitTxId = rowset.GetValueOrDefault<Schema::ExportItems::BackupTxId>(InvalidTxId);
Expand Down
7 changes: 6 additions & 1 deletion ydb/core/tx/schemeshard/schemeshard_export.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ void TSchemeShard::PersistCreateExport(NIceDb::TNiceDb& db, const TExportInfo::T
NIceDb::TUpdate<Schema::ExportItems::SourcePathName>(item.SourcePathName),
NIceDb::TUpdate<Schema::ExportItems::SourceOwnerPathId>(item.SourcePathId.OwnerId),
NIceDb::TUpdate<Schema::ExportItems::SourcePathId>(item.SourcePathId.LocalPathId),
NIceDb::TUpdate<Schema::ExportItems::State>(static_cast<ui8>(item.State))
NIceDb::TUpdate<Schema::ExportItems::State>(static_cast<ui8>(item.State)),
NIceDb::TUpdate<Schema::ExportItems::SourcePathType>(item.SourcePathType)
);
}
}
Expand Down Expand Up @@ -231,6 +232,10 @@ void TSchemeShard::Handle(TEvExport::TEvListExportsRequest::TPtr& ev, const TAct
Execute(CreateTxListExports(ev), ctx);
}

void TSchemeShard::Handle(TEvPrivate::TEvExportSchemeUploadResult::TPtr& ev, const TActorContext& ctx) {
Execute(CreateTxProgressExport(ev), ctx);
}

void TSchemeShard::ResumeExports(const TVector<ui64>& exportIds, const TActorContext& ctx) {
for (const ui64 id : exportIds) {
Execute(CreateTxProgressExport(id), ctx);
Expand Down
11 changes: 8 additions & 3 deletions ydb/core/tx/schemeshard/schemeshard_export__cancel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include "schemeshard_xxport__tx_base.h"
#include "schemeshard_export_flow_proposals.h"
#include "schemeshard_export.h"
#include "schemeshard_audit_log.h"
#include "schemeshard_export.h"
#include "schemeshard_export_flow_proposals.h"
#include "schemeshard_export_helpers.h"
#include "schemeshard_impl.h"
#include "schemeshard_xxport__tx_base.h"

#include <ydb/public/api/protos/ydb_issue_message.pb.h>
#include <ydb/public/api/protos/ydb_status_codes.pb.h>
Expand Down Expand Up @@ -58,6 +59,10 @@ struct TSchemeShard::TExport::TTxCancel: public TSchemeShard::TXxport::TTxBase {
return true;
}

LOG_D("TExport::TTxCancel, cancelling manually"
<< ", info: " << exportInfo->ToString()
);

exportInfo->Issue = "Cancelled manually";

if (exportInfo->State < TExportInfo::EState::Transferring) {
Expand Down
Loading
Loading