aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorygpr <ygpr@yandex-team.ru>2022-02-10 16:50:45 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:50:45 +0300
commitf2a6572555fe04972d626e56194ad2986acd9fb3 (patch)
tree4ad35e488eac5f5f33676de0054b90e6a9254e89
parent9a901118f2934da16fdb24f8d314e1c370ca611f (diff)
downloadydb-f2a6572555fe04972d626e56194ad2986acd9fb3.tar.gz
Restoring authorship annotation for <ygpr@yandex-team.ru>. Commit 1 of 2.
-rw-r--r--library/cpp/actors/core/log.cpp4
-rw-r--r--library/cpp/sliding_window/sliding_window.cpp2
-rw-r--r--library/cpp/sliding_window/sliding_window.h2
-rw-r--r--library/cpp/sliding_window/sliding_window_ut.cpp6
-rw-r--r--library/cpp/threading/future/future_ut.cpp24
-rw-r--r--ydb/core/base/events.h2
-rw-r--r--ydb/core/driver_lib/run/config.h2
-rw-r--r--ydb/core/driver_lib/run/kikimr_services_initializers.cpp50
-rw-r--r--ydb/core/driver_lib/run/kikimr_services_initializers.h12
-rw-r--r--ydb/core/driver_lib/run/run.cpp6
-rw-r--r--ydb/core/protos/config.proto4
11 files changed, 57 insertions, 57 deletions
diff --git a/library/cpp/actors/core/log.cpp b/library/cpp/actors/core/log.cpp
index 5f63b5af58..df4fbb11d5 100644
--- a/library/cpp/actors/core/log.cpp
+++ b/library/cpp/actors/core/log.cpp
@@ -741,8 +741,8 @@ namespace NActors {
TAutoPtr<TLogBackend> CreateFileBackend(const TString& fileName) {
return new TLineFileLogBackend(fileName);
- }
-
+ }
+
TAutoPtr<TLogBackend> CreateNullBackend() {
return new TNullLogBackend();
}
diff --git a/library/cpp/sliding_window/sliding_window.cpp b/library/cpp/sliding_window/sliding_window.cpp
index 086cce5d02..636e8e7c7f 100644
--- a/library/cpp/sliding_window/sliding_window.cpp
+++ b/library/cpp/sliding_window/sliding_window.cpp
@@ -1 +1 @@
-#include "sliding_window.h"
+#include "sliding_window.h"
diff --git a/library/cpp/sliding_window/sliding_window.h b/library/cpp/sliding_window/sliding_window.h
index 180bdf93d0..73e4fff0b3 100644
--- a/library/cpp/sliding_window/sliding_window.h
+++ b/library/cpp/sliding_window/sliding_window.h
@@ -109,7 +109,7 @@ namespace NSlidingWindow {
firstElemIndex = (firstElemIndex + 1) % arraySize;
}
return windowValue;
- }
+ }
};
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/library/cpp/sliding_window/sliding_window_ut.cpp b/library/cpp/sliding_window/sliding_window_ut.cpp
index 1e7343a8d3..12fde278da 100644
--- a/library/cpp/sliding_window/sliding_window_ut.cpp
+++ b/library/cpp/sliding_window/sliding_window_ut.cpp
@@ -1,5 +1,5 @@
-#include "sliding_window.h"
-
+#include "sliding_window.h"
+
#include <library/cpp/testing/unittest/registar.h>
using namespace NSlidingWindow;
@@ -70,7 +70,7 @@ Y_UNIT_TEST_SUITE(TSlidingWindowTest) {
now += TDuration::Minutes(5);
w.Update(6, now); // ~ 6 ~ ~ ~
UNIT_ASSERT_VALUES_EQUAL(w.GetValue(), 6); // ^
-
+
// update current bucket
w.Update(5, now); // ~ 5 ~ ~ ~
UNIT_ASSERT_VALUES_EQUAL(w.GetValue(), 5); // ^
diff --git a/library/cpp/threading/future/future_ut.cpp b/library/cpp/threading/future/future_ut.cpp
index 05950a568d..75a40f9923 100644
--- a/library/cpp/threading/future/future_ut.cpp
+++ b/library/cpp/threading/future/future_ut.cpp
@@ -2,9 +2,9 @@
#include <library/cpp/testing/unittest/registar.h>
-#include <list>
+#include <list>
#include <type_traits>
-
+
namespace NThreading {
namespace {
@@ -317,20 +317,20 @@ namespace {
std::list<TFuture<void>> promises;
promises.push_back(promise1);
promises.push_back(promise2);
-
+
TFuture<void> future = WaitExceptionOrAll(promises);
UNIT_ASSERT(!future.HasValue());
-
+
promise1.SetValue();
UNIT_ASSERT(!future.HasValue());
-
+
promise2.SetValue();
UNIT_ASSERT(future.HasValue());
}
-
+
Y_UNIT_TEST(ShouldWaitExceptionOrAllVectorEmpty) {
TVector<TFuture<void>> promises;
-
+
TFuture<void> future = WaitExceptionOrAll(promises);
UNIT_ASSERT(future.HasValue());
}
@@ -379,20 +379,20 @@ namespace {
std::list<TFuture<void>> promises;
promises.push_back(promise1);
promises.push_back(promise2);
-
+
TFuture<void> future = WaitAny(promises);
UNIT_ASSERT(!future.HasValue());
-
+
promise1.SetValue();
UNIT_ASSERT(future.HasValue());
-
+
promise2.SetValue();
UNIT_ASSERT(future.HasValue());
}
-
+
Y_UNIT_TEST(ShouldWaitAnyVectorEmpty) {
TVector<TFuture<void>> promises;
-
+
TFuture<void> future = WaitAny(promises);
UNIT_ASSERT(future.HasValue());
}
diff --git a/ydb/core/base/events.h b/ydb/core/base/events.h
index f5fedfe19b..4b29f6f13e 100644
--- a/ydb/core/base/events.h
+++ b/ydb/core/base/events.h
@@ -67,7 +67,7 @@ struct TKikimrEvents : TEvents {
ES_TICKET_PARSER,
ES_KQP = NYql::NDq::TDqEvents::ES_DQ_COMPUTE_KQP_COMPATIBLE, // 4145
ES_BLACKBOX_VALIDATOR,
- ES_SELF_PING,
+ ES_SELF_PING,
ES_PIPECACHE,
ES_PQ_PROXY,
ES_CMS,
diff --git a/ydb/core/driver_lib/run/config.h b/ydb/core/driver_lib/run/config.h
index faf1797413..d4e643bdca 100644
--- a/ydb/core/driver_lib/run/config.h
+++ b/ydb/core/driver_lib/run/config.h
@@ -34,7 +34,7 @@ union TBasicKikimrServicesMask {
bool EnableMiniKQLCompileService:1;
bool EnableMessageBusServices:1;
bool EnableStatsCollector:1;
- bool EnableSelfPing:1;
+ bool EnableSelfPing:1;
bool EnableTabletMonitor:1;
bool EnableViewerService:1;
bool EnableLoadService:1;
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index 819c1478d1..c452616548 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -1022,9 +1022,9 @@ TLoggerInitializer::TLoggerInitializer(const TKikimrRunConfig& runConfig,
, LogSettings(logSettings)
, LogBackend(logBackend)
, PathToConfigCacheFile(runConfig.PathToConfigCacheFile)
-{
-}
-
+{
+}
+
void TLoggerInitializer::InitializeServices(
NActors::TActorSystemSetup* setup,
const NKikimr::TAppData* appData) {
@@ -1668,35 +1668,35 @@ void TStatsCollectorInitializer::InitializeServices(
}
#endif
-// TSelfPingInitializer
-
-TSelfPingInitializer::TSelfPingInitializer(const TKikimrRunConfig& runConfig)
- : IKikimrServicesInitializer(runConfig) {
-}
-
-void TSelfPingInitializer::InitializeServices(
- NActors::TActorSystemSetup* setup,
- const NKikimr::TAppData* appData) {
-
- const TDuration selfPingInterval = Config.HasActorSystemConfig() && Config.GetActorSystemConfig().HasSelfPingInterval()
- ? TDuration::MicroSeconds(Config.GetActorSystemConfig().GetSelfPingInterval())
- : TDuration::MilliSeconds(10);
-
+// TSelfPingInitializer
+
+TSelfPingInitializer::TSelfPingInitializer(const TKikimrRunConfig& runConfig)
+ : IKikimrServicesInitializer(runConfig) {
+}
+
+void TSelfPingInitializer::InitializeServices(
+ NActors::TActorSystemSetup* setup,
+ const NKikimr::TAppData* appData) {
+
+ const TDuration selfPingInterval = Config.HasActorSystemConfig() && Config.GetActorSystemConfig().HasSelfPingInterval()
+ ? TDuration::MicroSeconds(Config.GetActorSystemConfig().GetSelfPingInterval())
+ : TDuration::MilliSeconds(10);
+
const auto counters = GetServiceCounters(appData->Counters, "utils");
-
+
for (size_t poolId = 0; poolId < setup->GetExecutorsCount(); ++poolId) {
const auto& poolName = setup->GetPoolName(poolId);
- auto poolGroup = counters->GetSubgroup("execpool", poolName);
- auto counter = poolGroup->GetCounter("SelfPingMaxUs", false);
+ auto poolGroup = counters->GetSubgroup("execpool", poolName);
+ auto counter = poolGroup->GetCounter("SelfPingMaxUs", false);
auto cpuTimeCounter = poolGroup->GetCounter("CpuMatBenchNs", false);
IActor* selfPingActor = CreateSelfPingActor(selfPingInterval, counter, cpuTimeCounter);
setup->LocalServices.push_back(std::make_pair(TActorId(),
- TActorSetupCmd(selfPingActor,
+ TActorSetupCmd(selfPingActor,
TMailboxType::HTSwap,
- poolId)));
- }
-}
-
+ poolId)));
+ }
+}
+
// TWhiteBoardServiceInitializer
TWhiteBoardServiceInitializer::TWhiteBoardServiceInitializer(const TKikimrRunConfig& runConfig)
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h
index 407ce1bb7b..1c9209dd04 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.h
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.h
@@ -273,13 +273,13 @@ public:
};
#endif
-class TSelfPingInitializer : public IKikimrServicesInitializer {
-public:
- TSelfPingInitializer(const TKikimrRunConfig& runConfig);
-
+class TSelfPingInitializer : public IKikimrServicesInitializer {
+public:
+ TSelfPingInitializer(const TKikimrRunConfig& runConfig);
+
void InitializeServices(NActors::TActorSystemSetup *setup, const NKikimr::TAppData *appData) override;
-};
-
+};
+
class TWhiteBoardServiceInitializer : public IKikimrServicesInitializer {
public:
TWhiteBoardServiceInitializer(const TKikimrRunConfig& runConfig);
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index a4f74aa4e0..f95c6ddf81 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -1231,9 +1231,9 @@ TIntrusivePtr<TServiceInitializersList> TKikimrRunner::CreateServiceInitializers
sil->AddServiceInitializer(new TStatsCollectorInitializer(runConfig));
}
#endif
- if (serviceMask.EnableSelfPing) {
- sil->AddServiceInitializer(new TSelfPingInitializer(runConfig));
- }
+ if (serviceMask.EnableSelfPing) {
+ sil->AddServiceInitializer(new TSelfPingInitializer(runConfig));
+ }
if (serviceMask.EnableTabletMonitor) {
sil->AddServiceInitializer(new NKikimrServicesInitializers::TTabletMonitorInitializer(
runConfig,
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
index d64169d4fc..18808ea35e 100644
--- a/ydb/core/protos/config.proto
+++ b/ydb/core/protos/config.proto
@@ -91,7 +91,7 @@ message TActorSystemConfig {
repeated TServiceExecutor ServiceExecutor = 7;
optional uint32 TimePerMailboxMicroSecs = 8;
optional uint32 EventsPerMailbox = 9;
- optional uint32 SelfPingInterval = 10; // in microseconds
+ optional uint32 SelfPingInterval = 10; // in microseconds
message TUnitedWorkers {
optional uint32 CpuCount = 1; // Total CPUs running united workers (TExecutor.Threads analog), should be set to zero to use actorsystem 1.5, and >0 for actorsystem 2.0
@@ -283,7 +283,7 @@ message TLogConfig {
optional string ClusterName = 7;
optional bool AllowDropEntries = 8 [default = true];
optional bool UseLocalTimestamps = 9 [default = false];
- optional string BackendFileName = 10;
+ optional string BackendFileName = 10;
optional string SysLogService = 11;
optional bool SysLogToStdErr = 12; // writes logs to stderr as well as in syslog
optional TUAClientConfig UAClientConfig = 13;