Skip to content

Add chatty logging to cluster & database dump/restore #14582

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

Merged
pixcc merged 2 commits into from
Feb 14, 2025
Merged

Add chatty logging to cluster & database dump/restore #14582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08025d9
Add chatty logging to cluster & database dump/restore
pixcc Feb 14, 2025
f5f1aa4
Revert enum values change
pixcc Feb 14, 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
4 changes: 2 additions & 2 deletions ydb/public/lib/ydb_cli/commands/ydb_admin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void TCommandDatabaseDump::Parse(TConfig& config) {
}

int TCommandDatabaseDump::Run(TConfig& config) {
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel)));
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel)));
log->SetFormatter(GetPrefixLogFormatter(""));

NDump::TClient client(CreateDriver(config), std::move(log));
Expand Down Expand Up @@ -87,7 +87,7 @@ void TCommandDatabaseRestore::Parse(TConfig& config) {
}

int TCommandDatabaseRestore::Run(TConfig& config) {
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel)));
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel)));
log->SetFormatter(GetPrefixLogFormatter(""));

auto settings = NDump::TRestoreDatabaseSettings()
Expand Down
4 changes: 2 additions & 2 deletions ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void TCommandClusterDump::Parse(TConfig& config) {
}

int TCommandClusterDump::Run(TConfig& config) {
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel)));
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel)));
log->SetFormatter(GetPrefixLogFormatter(""));

NDump::TClient client(CreateDriver(config), std::move(log));
Expand Down Expand Up @@ -99,7 +99,7 @@ void TCommandClusterRestore::Parse(TConfig& config) {
}

int TCommandClusterRestore::Run(TConfig& config) {
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel)));
auto log = std::make_shared<TLog>(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel)));
log->SetFormatter(GetPrefixLogFormatter(""));

auto settings = NDump::TRestoreClusterSettings()
Expand Down
12 changes: 12 additions & 0 deletions ydb/public/lib/ydb_cli/common/command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ ELogPriority TClientCommand::TConfig::VerbosityLevelToELogPriority(TClientComman
}
}

ELogPriority TClientCommand::TConfig::VerbosityLevelToELogPriorityChatty(TClientCommand::TConfig::EVerbosityLevel lvl) {
switch (lvl) {
case TClientCommand::TConfig::EVerbosityLevel::NONE:
return ELogPriority::TLOG_INFO;
case TClientCommand::TConfig::EVerbosityLevel::DEBUG:
case TClientCommand::TConfig::EVerbosityLevel::INFO:
case TClientCommand::TConfig::EVerbosityLevel::WARN:
return ELogPriority::TLOG_DEBUG;
}
return ELogPriority::TLOG_INFO;
}

size_t TClientCommand::TConfig::ParseHelpCommandVerbosilty(int argc, char** argv) {
size_t cnt = 0;
for (int i = 0; i < argc; ++i) {
Expand Down
1 change: 1 addition & 0 deletions ydb/public/lib/ydb_cli/common/command.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class TClientCommand {
};

static ELogPriority VerbosityLevelToELogPriority(EVerbosityLevel lvl);
static ELogPriority VerbosityLevelToELogPriorityChatty(EVerbosityLevel lvl);

int ArgC;
char** ArgV;
Expand Down
Loading