Skip to content

Commit 42d4c23

Browse files
committed
Fix merge errors
1 parent e4f6ac9 commit 42d4c23

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ydb/core/blobstorage/nodewarden/node_warden_proxy.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ void TNodeWarden::StartLocalProxy(ui32 groupId) {
5858
// create proxy with configuration
5959
proxy.reset(CreateBlobStorageGroupProxyConfigured(TIntrusivePtr<TBlobStorageGroupInfo>(info), false,
6060
DsProxyNodeMon, getCounters(info), TBlobStorageProxyParameters{
61+
.UseActorSystemTimeInBSQueue = Cfg->UseActorSystemTimeInBSQueue,
6162
.EnablePutBatching = EnablePutBatching,
6263
.EnableVPatch = EnableVPatch,
6364
.SlowDiskThreshold = SlowDiskThreshold,
@@ -70,6 +71,7 @@ void TNodeWarden::StartLocalProxy(ui32 groupId) {
7071
} else {
7172
// create proxy without configuration
7273
proxy.reset(CreateBlobStorageGroupProxyUnconfigured(groupId, DsProxyNodeMon, TBlobStorageProxyParameters{
74+
.UseActorSystemTimeInBSQueue = Cfg->UseActorSystemTimeInBSQueue,
7375
.EnablePutBatching = EnablePutBatching,
7476
.EnableVPatch = EnableVPatch,
7577
.SlowDiskThreshold = SlowDiskThreshold,

0 commit comments

Comments
 (0)