From 08025d902935e2242a8cf508df0c09010d9c578c Mon Sep 17 00:00:00 2001 From: Ilia Shakhov Date: Fri, 14 Feb 2025 12:52:36 +0000 Subject: [PATCH 1/2] Add chatty logging to cluster & database dump/restore --- ydb/public/lib/ydb_cli/commands/ydb_admin.cpp | 4 ++-- .../lib/ydb_cli/commands/ydb_cluster.cpp | 4 ++-- .../lib/ydb_cli/commands/ydb_root_common.cpp | 2 +- ydb/public/lib/ydb_cli/common/command.cpp | 18 +++++++++++++++--- ydb/public/lib/ydb_cli/common/command.h | 7 ++++--- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_admin.cpp b/ydb/public/lib/ydb_cli/commands/ydb_admin.cpp index 0dfab05a11a0..c14f01ea163c 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_admin.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_admin.cpp @@ -54,7 +54,7 @@ void TCommandDatabaseDump::Parse(TConfig& config) { } int TCommandDatabaseDump::Run(TConfig& config) { - auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel))); + auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel))); log->SetFormatter(GetPrefixLogFormatter("")); NDump::TClient client(CreateDriver(config), std::move(log)); @@ -87,7 +87,7 @@ void TCommandDatabaseRestore::Parse(TConfig& config) { } int TCommandDatabaseRestore::Run(TConfig& config) { - auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel))); + auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel))); log->SetFormatter(GetPrefixLogFormatter("")); auto settings = NDump::TRestoreDatabaseSettings() diff --git a/ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp b/ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp index 1e67ebc496ce..49fc537402d0 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_cluster.cpp @@ -66,7 +66,7 @@ void TCommandClusterDump::Parse(TConfig& config) { } int TCommandClusterDump::Run(TConfig& config) { - auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel))); + auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel))); log->SetFormatter(GetPrefixLogFormatter("")); NDump::TClient client(CreateDriver(config), std::move(log)); @@ -99,7 +99,7 @@ void TCommandClusterRestore::Parse(TConfig& config) { } int TCommandClusterRestore::Run(TConfig& config) { - auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriority(config.VerbosityLevel))); + auto log = std::make_shared(CreateLogBackend("cerr", TConfig::VerbosityLevelToELogPriorityChatty(config.VerbosityLevel))); log->SetFormatter(GetPrefixLogFormatter("")); auto settings = NDump::TRestoreClusterSettings() diff --git a/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp b/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp index 7e176b54245b..1ca8872fb640 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp @@ -334,7 +334,7 @@ void TClientCommandRootCommon::Config(TConfig& config) { void TClientCommandRootCommon::Parse(TConfig& config) { TClientCommandRootBase::Parse(config); - config.VerbosityLevel = std::min(static_cast(VerbosityLevel), TConfig::EVerbosityLevel::DEBUG); + config.VerbosityLevel = std::min(static_cast(VerbosityLevel), TConfig::EVerbosityLevel::VVV); } void TClientCommandRootCommon::ExtractParams(TConfig& config) { diff --git a/ydb/public/lib/ydb_cli/common/command.cpp b/ydb/public/lib/ydb_cli/common/command.cpp index 619cc8890b50..e58b7f55d606 100644 --- a/ydb/public/lib/ydb_cli/common/command.cpp +++ b/ydb/public/lib/ydb_cli/common/command.cpp @@ -36,17 +36,29 @@ ELogPriority TClientCommand::TConfig::VerbosityLevelToELogPriority(TClientComman switch (lvl) { case TClientCommand::TConfig::EVerbosityLevel::NONE: return ELogPriority::TLOG_EMERG; - case TClientCommand::TConfig::EVerbosityLevel::DEBUG: + case TClientCommand::TConfig::EVerbosityLevel::VVV: return ELogPriority::TLOG_DEBUG; - case TClientCommand::TConfig::EVerbosityLevel::INFO: + case TClientCommand::TConfig::EVerbosityLevel::VV: return ELogPriority::TLOG_INFO; - case TClientCommand::TConfig::EVerbosityLevel::WARN: + case TClientCommand::TConfig::EVerbosityLevel::V: return ELogPriority::TLOG_WARNING; default: return ELogPriority::TLOG_ERR; } } +ELogPriority TClientCommand::TConfig::VerbosityLevelToELogPriorityChatty(TClientCommand::TConfig::EVerbosityLevel lvl) { + switch (lvl) { + case TClientCommand::TConfig::EVerbosityLevel::NONE: + return ELogPriority::TLOG_INFO; + case TClientCommand::TConfig::EVerbosityLevel::VVV: + case TClientCommand::TConfig::EVerbosityLevel::VV: + case TClientCommand::TConfig::EVerbosityLevel::V: + 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) { diff --git a/ydb/public/lib/ydb_cli/common/command.h b/ydb/public/lib/ydb_cli/common/command.h index 0614d1b1d5af..81eada4caed3 100644 --- a/ydb/public/lib/ydb_cli/common/command.h +++ b/ydb/public/lib/ydb_cli/common/command.h @@ -85,12 +85,13 @@ class TClientCommand { enum EVerbosityLevel : ui32 { NONE = 0, - WARN = 1, - INFO = 2, - DEBUG = 3, + V = 1, + VV = 2, + VVV = 3, }; static ELogPriority VerbosityLevelToELogPriority(EVerbosityLevel lvl); + static ELogPriority VerbosityLevelToELogPriorityChatty(EVerbosityLevel lvl); int ArgC; char** ArgV; From f5f1aa4dc7067d7fb200441002c6c9c1f47ef90d Mon Sep 17 00:00:00 2001 From: Ilia Shakhov Date: Fri, 14 Feb 2025 14:28:42 +0000 Subject: [PATCH 2/2] Revert enum values change --- ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp | 2 +- ydb/public/lib/ydb_cli/common/command.cpp | 12 ++++++------ ydb/public/lib/ydb_cli/common/command.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp b/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp index 1ca8872fb640..7e176b54245b 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp @@ -334,7 +334,7 @@ void TClientCommandRootCommon::Config(TConfig& config) { void TClientCommandRootCommon::Parse(TConfig& config) { TClientCommandRootBase::Parse(config); - config.VerbosityLevel = std::min(static_cast(VerbosityLevel), TConfig::EVerbosityLevel::VVV); + config.VerbosityLevel = std::min(static_cast(VerbosityLevel), TConfig::EVerbosityLevel::DEBUG); } void TClientCommandRootCommon::ExtractParams(TConfig& config) { diff --git a/ydb/public/lib/ydb_cli/common/command.cpp b/ydb/public/lib/ydb_cli/common/command.cpp index e58b7f55d606..c91cb24c3506 100644 --- a/ydb/public/lib/ydb_cli/common/command.cpp +++ b/ydb/public/lib/ydb_cli/common/command.cpp @@ -36,11 +36,11 @@ ELogPriority TClientCommand::TConfig::VerbosityLevelToELogPriority(TClientComman switch (lvl) { case TClientCommand::TConfig::EVerbosityLevel::NONE: return ELogPriority::TLOG_EMERG; - case TClientCommand::TConfig::EVerbosityLevel::VVV: + case TClientCommand::TConfig::EVerbosityLevel::DEBUG: return ELogPriority::TLOG_DEBUG; - case TClientCommand::TConfig::EVerbosityLevel::VV: + case TClientCommand::TConfig::EVerbosityLevel::INFO: return ELogPriority::TLOG_INFO; - case TClientCommand::TConfig::EVerbosityLevel::V: + case TClientCommand::TConfig::EVerbosityLevel::WARN: return ELogPriority::TLOG_WARNING; default: return ELogPriority::TLOG_ERR; @@ -51,9 +51,9 @@ ELogPriority TClientCommand::TConfig::VerbosityLevelToELogPriorityChatty(TClient switch (lvl) { case TClientCommand::TConfig::EVerbosityLevel::NONE: return ELogPriority::TLOG_INFO; - case TClientCommand::TConfig::EVerbosityLevel::VVV: - case TClientCommand::TConfig::EVerbosityLevel::VV: - case TClientCommand::TConfig::EVerbosityLevel::V: + case TClientCommand::TConfig::EVerbosityLevel::DEBUG: + case TClientCommand::TConfig::EVerbosityLevel::INFO: + case TClientCommand::TConfig::EVerbosityLevel::WARN: return ELogPriority::TLOG_DEBUG; } return ELogPriority::TLOG_INFO; diff --git a/ydb/public/lib/ydb_cli/common/command.h b/ydb/public/lib/ydb_cli/common/command.h index 81eada4caed3..324a729c5c3c 100644 --- a/ydb/public/lib/ydb_cli/common/command.h +++ b/ydb/public/lib/ydb_cli/common/command.h @@ -85,9 +85,9 @@ class TClientCommand { enum EVerbosityLevel : ui32 { NONE = 0, - V = 1, - VV = 2, - VVV = 3, + WARN = 1, + INFO = 2, + DEBUG = 3, }; static ELogPriority VerbosityLevelToELogPriority(EVerbosityLevel lvl);