Skip to content

Commit 8e1e06b

Browse files
serbel324serbel324
committed
Correct merge mistakes
1 parent 3a30ffe commit 8e1e06b

File tree

3 files changed

+35
-38
lines changed

3 files changed

+35
-38
lines changed

‎ydb/core/blobstorage/dsproxy/dsproxy.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ class TBlobStorageGroupRequestActor : public TActor<TDerived> {
175175
return NKikimrServices::TActivity::BS_GROUP_REQUEST;
176176
}
177177

178-
template<typename TEv>
179178
struct TCommonParameters {
180179
TIntrusivePtr<TBlobStorageGroupInfo> GroupInfo;
181180
TIntrusivePtr<TGroupQueues> GroupQueues;
@@ -186,7 +185,7 @@ class TBlobStorageGroupRequestActor : public TActor<TDerived> {
186185
TIntrusivePtr<TStoragePoolCounters>& StoragePoolCounters;
187186
ui32 RestartCounter;
188187
NWilson::TTraceId TraceId = {};
189-
TEv* Event = nullptr;
188+
TDerived* Event = nullptr;
190189
std::shared_ptr<TEvBlobStorage::TExecutionRelay> ExecutionRelay = nullptr;
191190

192191
bool LogAccEnabled = false;
@@ -202,7 +201,7 @@ class TBlobStorageGroupRequestActor : public TActor<TDerived> {
202201
public:
203202
template<typename TGroupRequestParameters>
204203
TBlobStorageGroupRequestActor(TGroupRequestParameters& params)
205-
: TActor(&TThis::InitialStateFunc, params.TypeSpecific.Activity)
204+
: TActor<TDerived>(&TThis::InitialStateFunc, params.TypeSpecific.Activity)
206205
, Info(std::move(params.Common.GroupInfo))
207206
, GroupQueues(std::move(params.Common.GroupQueues))
208207
, Mon(std::move(params.Common.Mon))
@@ -677,8 +676,8 @@ void Decrypt(char *destination, const char *source, size_t shift, size_t sizeByt
677676
void DecryptInplace(TRope& rope, ui32 offset, ui32 shift, ui32 size, const TLogoBlobID& id, const TBlobStorageGroupInfo& info);
678677

679678
struct TBlobStorageGroupRangeParameters {
680-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvRange> Common;
681-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
679+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvRange>::TCommonParameters Common;
680+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvRange>::TTypeSpecificParameters TypeSpecific = {
682681
.LogComponent = NKikimrServices::BS_PROXY_RANGE,
683682
.Name = "DSProxy.Range",
684683
.Activity = NKikimrServices::TActivity::BS_GROUP_RANGE
@@ -688,8 +687,8 @@ struct TBlobStorageGroupRangeParameters {
688687
IActor* CreateBlobStorageGroupRangeRequest(TBlobStorageGroupRangeParameters params);
689688

690689
struct TBlobStorageGroupPutParameters {
691-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvPut> Common;
692-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
690+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvPut>::TCommonParameters Common;
691+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvPut>::TTypeSpecificParameters TypeSpecific = {
693692
.LogComponent = NKikimrServices::BS_PROXY_PUT,
694693
.Name = "DSProxy.Put",
695694
.Activity = NKikimrServices::TActivity::BS_PROXY_PUT_ACTOR,
@@ -701,8 +700,8 @@ struct TBlobStorageGroupPutParameters {
701700
IActor* CreateBlobStorageGroupPutRequest(TBlobStorageGroupPutParameters params);
702701

703702
struct TBlobStorageGroupMultiPutParameters {
704-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvPut> Common;
705-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
703+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvPut>::TCommonParameters Common;
704+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvPut>::TTypeSpecificParameters TypeSpecific = {
706705
.LogComponent = NKikimrServices::BS_PROXY_PUT,
707706
.Name = "DSProxy.Put",
708707
.Activity = NKikimrServices::TActivity::BS_PROXY_PUT_ACTOR,
@@ -726,8 +725,8 @@ struct TBlobStorageGroupMultiPutParameters {
726725
IActor* CreateBlobStorageGroupPutRequest(TBlobStorageGroupMultiPutParameters params);
727726

728727
struct TBlobStorageGroupGetParameters {
729-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvGet> Common;
730-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
728+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TCommonParameters Common;
729+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TTypeSpecificParameters TypeSpecific = {
731730
.LogComponent = NKikimrServices::BS_PROXY_GET,
732731
.Name = "DSProxy.Get",
733732
.Activity = NKikimrServices::TActivity::BS_PROXY_GET_ACTOR,
@@ -737,8 +736,8 @@ struct TBlobStorageGroupGetParameters {
737736
IActor* CreateBlobStorageGroupGetRequest(TBlobStorageGroupGetParameters params);
738737

739738
struct TBlobStorageGroupPatchParameters {
740-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvPatch> Common;
741-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
739+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvPatch>::TCommonParameters Common;
740+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvPatch>::TTypeSpecificParameters TypeSpecific = {
742741
.LogComponent = NKikimrServices::BS_PROXY_PATCH,
743742
.Name = "DSProxy.Patch",
744743
.Activity = NKikimrServices::TActivity::BS_PROXY_PATCH_ACTOR,
@@ -749,8 +748,8 @@ struct TBlobStorageGroupPatchParameters {
749748
IActor* CreateBlobStorageGroupPatchRequest(TBlobStorageGroupPatchParameters params);
750749

751750
struct TBlobStorageGroupMultiGetParameters {
752-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvGet> Common;
753-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
751+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TCommonParameters Common;
752+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TTypeSpecificParameters TypeSpecific = {
754753
.LogComponent = NKikimrServices::BS_PROXY_MULTIGET,
755754
.Name = "DSProxy.MultiGet",
756755
.Activity = NKikimrServices::TActivity::BS_PROXY_MULTIGET_ACTOR,
@@ -760,8 +759,8 @@ struct TBlobStorageGroupMultiGetParameters {
760759
IActor* CreateBlobStorageGroupMultiGetRequest(TBlobStorageGroupMultiGetParameters params);
761760

762761
struct TBlobStorageGroupRestoreGetParameters {
763-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvGet> Common;
764-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
762+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TCommonParameters Common;
763+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TTypeSpecificParameters TypeSpecific = {
765764
.LogComponent = NKikimrServices::BS_PROXY_INDEXRESTOREGET,
766765
.Name = "DSProxy.IndexRestoreGet",
767766
.Activity = NKikimrServices::TActivity::BS_PROXY_INDEXRESTOREGET_ACTOR,
@@ -770,8 +769,8 @@ struct TBlobStorageGroupRestoreGetParameters {
770769
IActor* CreateBlobStorageGroupIndexRestoreGetRequest(TBlobStorageGroupRestoreGetParameters params);
771770

772771
struct TBlobStorageGroupDiscoverParameters {
773-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvDiscover> Common;
774-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
772+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvDiscover>::TCommonParameters Common;
773+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvDiscover>::TTypeSpecificParameters TypeSpecific = {
775774
.LogComponent = NKikimrServices::BS_PROXY_DISCOVER,
776775
.Name = "DSProxy.Discover",
777776
.Activity = NKikimrServices::TActivity::BS_GROUP_DISCOVER,
@@ -782,8 +781,8 @@ IActor* CreateBlobStorageGroupMirror3dcDiscoverRequest(TBlobStorageGroupDiscover
782781
IActor* CreateBlobStorageGroupMirror3of4DiscoverRequest(TBlobStorageGroupDiscoverParameters params);
783782

784783
struct TBlobStorageGroupCollectGarbageParameters {
785-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvCollectGarbage> Common;
786-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
784+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvCollectGarbage>::TCommonParameters Common;
785+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvCollectGarbage>::TTypeSpecificParameters TypeSpecific = {
787786
.LogComponent = NKikimrServices::BS_PROXY_COLLECT,
788787
.Name = "DSProxy.CollectGarbage",
789788
.Activity = NKikimrServices::TActivity::BS_GROUP_COLLECT_GARBAGE,
@@ -792,8 +791,8 @@ struct TBlobStorageGroupCollectGarbageParameters {
792791
IActor* CreateBlobStorageGroupCollectGarbageRequest(TBlobStorageGroupCollectGarbageParameters params);
793792

794793
struct TBlobStorageGroupMultiCollectParameters {
795-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvCollectGarbage> Common;
796-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
794+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvCollectGarbage>::TCommonParameters Common;
795+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvCollectGarbage>::TTypeSpecificParameters TypeSpecific = {
797796
.LogComponent = NKikimrServices::BS_PROXY_MULTICOLLECT,
798797
.Name = "DSProxy.MultiCollect",
799798
.Activity = NKikimrServices::TActivity::BS_PROXY_MULTICOLLECT_ACTOR,
@@ -802,8 +801,8 @@ struct TBlobStorageGroupMultiCollectParameters {
802801
IActor* CreateBlobStorageGroupMultiCollectRequest(TBlobStorageGroupMultiCollectParameters params);
803802

804803
struct TBlobStorageGroupBlockParameters {
805-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvBlock> Common;
806-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
804+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvBlock>::TCommonParameters Common;
805+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvBlock>::TTypeSpecificParameters TypeSpecific = {
807806
.LogComponent = NKikimrServices::BS_PROXY_BLOCK,
808807
.Name = "DSProxy.Block",
809808
.Activity = NKikimrServices::TActivity::BS_GROUP_BLOCK,
@@ -812,8 +811,8 @@ struct TBlobStorageGroupBlockParameters {
812811
IActor* CreateBlobStorageGroupBlockRequest(TBlobStorageGroupBlockParameters params);
813812

814813
struct TBlobStorageGroupStatusParameters {
815-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvStatus> Common;
816-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
814+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvStatus>::TCommonParameters Common;
815+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvStatus>::TTypeSpecificParameters TypeSpecific = {
817816
.LogComponent = NKikimrServices::BS_PROXY_STATUS,
818817
.Name = "DSProxy.Status",
819818
.Activity = NKikimrServices::TActivity::BS_PROXY_STATUS_ACTOR,
@@ -822,8 +821,9 @@ struct TBlobStorageGroupStatusParameters {
822821
IActor* CreateBlobStorageGroupStatusRequest(TBlobStorageGroupStatusParameters params);
823822

824823
struct TBlobStorageGroupAssimilateParameters {
825-
TBlobStorageGroupRequestActor::TCommonParameters<TEvBlobStorage::TEvAssimilate> Common;
826-
TBlobStorageGroupRequestActor::TTypeSpecificParameters TypeSpecific = {
824+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvAssimilate>::TCommonParameters Common;
825+
TBlobStorageGroupRequestActor<TEvBlobStorage::TEvAssimilate>
826+
::TTypeSpecificParameters TypeSpecific = {
827827
.LogComponent = NKikimrServices::BS_PROXY_ASSIMILATE,
828828
.Name = "DSProxy.Assimilate",
829829
.Activity = NKikimrServices::TActivity::BS_GROUP_ASSIMILATE,

‎ydb/core/blobstorage/dsproxy/dsproxy_get.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,10 @@ class TBlobStorageGroupGetRequest : public TBlobStorageGroupRequestActor<TBlobSt
384384
return NKikimrServices::TActivity::BS_PROXY_GET_ACTOR;
385385
}
386386

387+
static const auto& ActiveCounter(const TIntrusivePtr<TBlobStorageGroupProxyMon>& mon) {
388+
return mon->ActiveGet;
389+
}
390+
387391
static constexpr ERequestType RequestType() {
388392
return ERequestType::Get;
389393
}

‎ydb/core/blobstorage/dsproxy/dsproxy_put.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
510510
, TimeStatsEnabled(params.TimeStatsEnabled)
511511
, Tactic(params.Common.Event->Tactic)
512512
, Stats(std::move(params.Stats))
513+
, IsMultiPutMode(false)
513514
, IncarnationRecords(Info->GetTotalVDisksNum())
514515
, ExpiredVDiskSet(&Info->GetTopology())
515516
{
@@ -531,20 +532,12 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
531532
, IsManyPuts(true)
532533
, HandleClass(params.HandleClass)
533534
, ReportedBytes(0)
534-
<<<<<<< HEAD
535-
, TimeStatsEnabled(timeStatsEnabled)
536-
, Tactic(tactic)
537-
, Stats(std::move(stats))
538-
, IsMultiPutMode(true)
539-
, IncarnationRecords(info->GetTotalVDisksNum())
540-
, ExpiredVDiskSet(&info->GetTopology())
541-
=======
542535
, TimeStatsEnabled(params.TimeStatsEnabled)
543536
, Tactic(params.Tactic)
544537
, Stats(std::move(params.Stats))
538+
, IsMultiPutMode(true)
545539
, IncarnationRecords(Info->GetTotalVDisksNum())
546540
, ExpiredVDiskSet(&Info->GetTopology())
547-
>>>>>>> 4efd4715e9... Wrap ctor arguments in structs (#7631)
548541
{
549542
Y_DEBUG_ABORT_UNLESS(params.Events.size() <= MaxBatchedPutRequests);
550543
for (auto &ev : params.Events) {

0 commit comments

Comments
 (0)