From bf5e67274a28e27490db3b10c286b54d45b95681 Mon Sep 17 00:00:00 2001 From: Hari Krishna Sunder Date: Thu, 28 Sep 2023 10:23:50 -0700 Subject: [PATCH] [#19344] DocDB:Replace EnableVerboseLoggingForModule with google::SetVLOGLevel Summary: `EnableVerboseLoggingForModule` sets vlog by updating the vmodule gflag with a more complex string. Its simpler to just call google::SetVLOGLevel to set the module log level. Remove duplicate `ColumnLimit` field from clang-format Fixes #19344 Jira: DB-8146 Test Plan: All tests Reviewers: jhe Reviewed By: jhe Subscribers: ybase, bogdan Differential Revision: https://phorge.dev.yugabyte.com/D28917 --- .clang-format | 1 - src/yb/integration-tests/cdcsdk_before_image-test.cc | 8 ++++---- src/yb/integration-tests/cdcsdk_ysql_test_base.cc | 7 ------- src/yb/integration-tests/cdcsdk_ysql_test_base.h | 1 - src/yb/integration-tests/logging-test.cc | 2 +- src/yb/integration-tests/tablet-split-itest-base.cc | 2 +- src/yb/rpc/rpc-test.cc | 2 +- src/yb/server/pprof-path-handler_util-test.cc | 2 +- src/yb/util/test_util.cc | 7 ------- src/yb/util/test_util.h | 2 -- 10 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.clang-format b/.clang-format index 7999d3f32f8..2d7a4c39686 100644 --- a/.clang-format +++ b/.clang-format @@ -99,6 +99,5 @@ SpacesInSquareBrackets: false Standard: Auto TabWidth: 8 UseTab: Never -ColumnLimit: 100 FixNamespaceComments: true ... diff --git a/src/yb/integration-tests/cdcsdk_before_image-test.cc b/src/yb/integration-tests/cdcsdk_before_image-test.cc index af48ab5efd8..c349470aea0 100644 --- a/src/yb/integration-tests/cdcsdk_before_image-test.cc +++ b/src/yb/integration-tests/cdcsdk_before_image-test.cc @@ -1014,8 +1014,8 @@ TEST_F(CDCSDKYsqlTest, YB_DISABLE_TEST_IN_TSAN(TestColumnDropBeforeImage)) { } TEST_F(CDCSDKYsqlTest, YB_DISABLE_TEST_IN_TSAN(TestLargeTransactionUpdateRowsWithBeforeImage)) { - EnableVerboseLoggingForModule("cdc_service", 1); - EnableVerboseLoggingForModule("cdcsdk_producer", 1); + google::SetVLOGLevel("cdc_service", 1); + google::SetVLOGLevel("cdcsdk_producer", 1); ANNOTATE_UNPROTECTED_WRITE(FLAGS_update_min_cdc_indices_interval_secs) = 1; ANNOTATE_UNPROTECTED_WRITE(FLAGS_cdc_state_checkpoint_update_interval_ms) = 0; ASSERT_OK(SetUpWithParams(3, 1, false)); @@ -1107,8 +1107,8 @@ TEST_F(CDCSDKYsqlTest, YB_DISABLE_TEST_IN_TSAN(TestLargeTransactionUpdateRowsWit } TEST_F(CDCSDKYsqlTest, YB_DISABLE_TEST_IN_TSAN(TestLargeTransactionDeleteRowsWithBeforeImage)) { - EnableVerboseLoggingForModule("cdc_service", 1); - EnableVerboseLoggingForModule("cdcsdk_producer", 1); + google::SetVLOGLevel("cdc_service", 1); + google::SetVLOGLevel("cdcsdk_producer", 1); // ANNOTATE_UNPROTECTED_WRITE(FLAGS_timestamp_history_retention_interval_sec) = 0; ANNOTATE_UNPROTECTED_WRITE(FLAGS_update_min_cdc_indices_interval_secs) = 1; ANNOTATE_UNPROTECTED_WRITE(FLAGS_cdc_state_checkpoint_update_interval_ms) = 0; diff --git a/src/yb/integration-tests/cdcsdk_ysql_test_base.cc b/src/yb/integration-tests/cdcsdk_ysql_test_base.cc index df1ce40ae95..786185b227b 100644 --- a/src/yb/integration-tests/cdcsdk_ysql_test_base.cc +++ b/src/yb/integration-tests/cdcsdk_ysql_test_base.cc @@ -2842,13 +2842,6 @@ namespace cdc { ValidateColumnCounts(change_resp, 2); } - void CDCSDKYsqlTest::EnableVerboseLoggingForModule(const std::string& module, int level) { - if (!FLAGS_vmodule.empty()) { - FLAGS_vmodule += Format(",$0=$1", module, level); - } else { - ANNOTATE_UNPROTECTED_WRITE(FLAGS_vmodule) = Format("$0=$1", module, level); - } - } Result CDCSDKYsqlTest::GetValueFromMap(const QLMapValuePB& map_value, const std::string& key) { diff --git a/src/yb/integration-tests/cdcsdk_ysql_test_base.h b/src/yb/integration-tests/cdcsdk_ysql_test_base.h index 04c9701c21a..c379c6b4361 100644 --- a/src/yb/integration-tests/cdcsdk_ysql_test_base.h +++ b/src/yb/integration-tests/cdcsdk_ysql_test_base.h @@ -513,7 +513,6 @@ class CDCSDKYsqlTest : public CDCSDKTestBase { void CDCSDKMultipleAlterWithTabletLeaderSwitch(bool packed_row); void CDCSDKAlterWithSysCatalogCompaction(bool packed_row); void CDCSDKIntentsBatchReadWithAlterAndTabletLeaderSwitch(bool packed_row); - void EnableVerboseLoggingForModule(const std::string& module, int level); Result GetValueFromMap(const QLMapValuePB& map_value, const std::string& key); diff --git a/src/yb/integration-tests/logging-test.cc b/src/yb/integration-tests/logging-test.cc index 29ab25f3b90..d59ed4ac734 100644 --- a/src/yb/integration-tests/logging-test.cc +++ b/src/yb/integration-tests/logging-test.cc @@ -81,7 +81,7 @@ TEST(LoggingTest, TestThrottledLogging) { TEST(LoggingTest, VModule) { google::FlagSaver flag_saver; - ASSERT_OK(EnableVerboseLoggingForModule("logging-test", 1)); + google::SetVLOGLevel("logging-test", 1); ASSERT_TRUE(VLOG_IS_ON(1)); diff --git a/src/yb/integration-tests/tablet-split-itest-base.cc b/src/yb/integration-tests/tablet-split-itest-base.cc index b7bec141f81..4546e1091bd 100644 --- a/src/yb/integration-tests/tablet-split-itest-base.cc +++ b/src/yb/integration-tests/tablet-split-itest-base.cc @@ -367,7 +367,7 @@ TabletSplitITest::TabletSplitITest() = default; TabletSplitITest::~TabletSplitITest() = default; void TabletSplitITest::SetUp() { - ASSERT_OK(EnableVerboseLoggingForModule("tablet_split_manager", 2)); + google::SetVLOGLevel("tablet_split_manager", 2); ANNOTATE_UNPROTECTED_WRITE(FLAGS_cleanup_split_tablets_interval_sec) = 1; ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_automatic_tablet_splitting) = false; ANNOTATE_UNPROTECTED_WRITE(FLAGS_TEST_validate_all_tablet_candidates) = true; diff --git a/src/yb/rpc/rpc-test.cc b/src/yb/rpc/rpc-test.cc index c35fd1d1d48..e386008b081 100644 --- a/src/yb/rpc/rpc-test.cc +++ b/src/yb/rpc/rpc-test.cc @@ -369,7 +369,7 @@ TEST_F(TestRpc, TestConnectionKeepalive) { ANNOTATE_UNPROTECTED_WRITE(FLAGS_rpc_connection_timeout_ms) = MonoDelta(kGcTimeout).ToMilliseconds() / 2; ANNOTATE_UNPROTECTED_WRITE(FLAGS_enable_rpc_keepalive) = true; - ASSERT_OK(EnableVerboseLoggingForModule("yb_rpc", 5)); + google::SetVLOGLevel("yb_rpc", 5); // Set up server. HostPort server_addr; StartTestServer(&server_addr, options); diff --git a/src/yb/server/pprof-path-handler_util-test.cc b/src/yb/server/pprof-path-handler_util-test.cc index f68567477b0..1f88eaeee46 100644 --- a/src/yb/server/pprof-path-handler_util-test.cc +++ b/src/yb/server/pprof-path-handler_util-test.cc @@ -39,7 +39,7 @@ namespace yb { void SamplingProfilerTest::SetUp() { YBTest::SetUp(); - ASSERT_OK(EnableVerboseLoggingForModule("pprof-path-handlers_util", 2)); + google::SetVLOGLevel("pprof-path-handlers_util", 2); } // Changes to tcmalloc's sample rate only take effect once we take a sample. Upon initialization, diff --git a/src/yb/util/test_util.cc b/src/yb/util/test_util.cc index 3f5dbf170df..031b2683518 100644 --- a/src/yb/util/test_util.cc +++ b/src/yb/util/test_util.cc @@ -193,13 +193,6 @@ void OverrideFlagForSlowTests(const std::string& flag_name, google::SET_FLAG_IF_DEFAULT); } -Status EnableVerboseLoggingForModule(const std::string& module, int level) { - string old_value = FLAGS_vmodule; - string new_value = Format("$0$1$2=$3", old_value, (old_value.empty() ? "" : ","), module, level); - - return SET_FLAG(vmodule, new_value); -} - int SeedRandom() { int seed; // Initialize random seed diff --git a/src/yb/util/test_util.h b/src/yb/util/test_util.h index 0d5bc580d4b..66738a2b082 100644 --- a/src/yb/util/test_util.h +++ b/src/yb/util/test_util.h @@ -103,8 +103,6 @@ bool AllowSlowTests(); void OverrideFlagForSlowTests(const std::string& flag_name, const std::string& new_value); -Status EnableVerboseLoggingForModule(const std::string& module, int level); - // Call srand() with a random seed based on the current time, reporting // that seed to the logs. The time-based seed may be overridden by passing // --test_random_seed= from the CLI in order to reproduce a failed randomized