aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeehelit <satourugojo@yandex.ru>2025-02-05 13:18:25 +0300
committerGitHub <noreply@github.com>2025-02-05 10:18:25 +0000
commit5d66850efcf7ffbed5012e616c8ed7adf078332a (patch)
treed0235a2bc69cbf7e6b7260b2f864d4069f2ed752
parentcf080a418e0ec40f50677f2ae4186a275bf75426 (diff)
downloadydb-5d66850efcf7ffbed5012e616c8ed7adf078332a.tar.gz
Revert "Fix schedule actor events for self" (#14217)
-rw-r--r--ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor_ut.cpp2
-rw-r--r--ydb/library/actors/core/actor.cpp18
2 files changed, 9 insertions, 11 deletions
diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor_ut.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor_ut.cpp
index 892143d8dd9..c0db5695526 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor_ut.cpp
+++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor_ut.cpp
@@ -391,8 +391,6 @@ namespace NKikimr {
}
Y_UNIT_TEST(FindingPartsWithTimeout) {
- return;
-
TBlobStorageGroupType type(TErasureType::Erasure4Plus2Block);
TVPatchTestGeneralData testData(type, 10);
TTestActorRuntimeBase &runtime = testData.Runtime;
diff --git a/ydb/library/actors/core/actor.cpp b/ydb/library/actors/core/actor.cpp
index 1bc412cacda..3405edb7e3a 100644
--- a/ydb/library/actors/core/actor.cpp
+++ b/ydb/library/actors/core/actor.cpp
@@ -120,15 +120,15 @@ namespace NActors {
}
void TActorIdentity::Schedule(TInstant deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
- return TActivationContext::Schedule(deadline, new IEventHandle(*this, *this, ev), cookie);
+ return TActivationContext::Schedule(deadline, new IEventHandle(*this, {}, ev), cookie);
}
void TActorIdentity::Schedule(TMonotonic deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
- return TActivationContext::Schedule(deadline, new IEventHandle(*this, *this, ev), cookie);
+ return TActivationContext::Schedule(deadline, new IEventHandle(*this, {}, ev), cookie);
}
void TActorIdentity::Schedule(TDuration delta, IEventBase* ev, ISchedulerCookie* cookie) const {
- return TActivationContext::Schedule(delta, new IEventHandle(*this, *this, ev), cookie);
+ return TActivationContext::Schedule(delta, new IEventHandle(*this, {}, ev), cookie);
}
TActorId TActivationContext::RegisterWithSameMailbox(IActor* actor, TActorId parentId) {
@@ -178,15 +178,15 @@ namespace NActors {
}
void TActorContext::Schedule(TInstant deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
- ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, SelfID, ev), cookie);
+ ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, TActorId(), ev), cookie);
}
void TActorContext::Schedule(TMonotonic deadline, IEventBase* ev, ISchedulerCookie* cookie) const {
- ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, SelfID, ev), cookie);
+ ExecutorThread.Schedule(deadline, new IEventHandle(SelfID, TActorId(), ev), cookie);
}
void TActorContext::Schedule(TDuration delta, IEventBase* ev, ISchedulerCookie* cookie) const {
- ExecutorThread.Schedule(delta, new IEventHandle(SelfID, SelfID, ev), cookie);
+ ExecutorThread.Schedule(delta, new IEventHandle(SelfID, TActorId(), ev), cookie);
}
void TActorContext::Schedule(TInstant deadline, std::unique_ptr<IEventHandle> ev, ISchedulerCookie* cookie) const {
@@ -202,15 +202,15 @@ namespace NActors {
}
void IActor::Schedule(TInstant deadline, IEventBase* ev, ISchedulerCookie* cookie) const noexcept {
- TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, SelfActorId, ev), cookie);
+ TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, TActorId(), ev), cookie);
}
void IActor::Schedule(TMonotonic deadline, IEventBase* ev, ISchedulerCookie* cookie) const noexcept {
- TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, SelfActorId, ev), cookie);
+ TlsActivationContext->ExecutorThread.Schedule(deadline, new IEventHandle(SelfActorId, TActorId(), ev), cookie);
}
void IActor::Schedule(TDuration delta, IEventBase* ev, ISchedulerCookie* cookie) const noexcept {
- TlsActivationContext->ExecutorThread.Schedule(delta, new IEventHandle(SelfActorId, SelfActorId, ev), cookie);
+ TlsActivationContext->ExecutorThread.Schedule(delta, new IEventHandle(SelfActorId, TActorId(), ev), cookie);
}
TInstant TActivationContext::Now() {