Ydb stable 22-4-2122.4.21

x-stable-origin-commit: e89099581237299a132feafb5b58af59ebd0468a

1 files changed, 4 insertions, 3 deletions

diff --git a/library/cpp/actors/interconnect/interconnect_handshake.cpp b/library/cpp/actors/interconnect/interconnect_handshake.cpp
index aaa8440d720..d7f657299ef 100644
--- a/library/cpp/actors/interconnect/interconnect_handshake.cpp
+++ b/library/cpp/actors/interconnect/interconnect_handshake.cpp
@@ -551,6 +551,7 @@ namespace NActors {
 
             // set up incoming socket
             SetupSocket();
+            RegisterInPoller();
 
             // wait for initial request packet
             TInitialPacket request;
@@ -878,8 +879,11 @@ namespace NActors {
                 // start connecting
                 err = -Socket->Connect(address);
                 if (err == EINPROGRESS) {
+                    RegisterInPoller();
                     WaitPoller(false, true, "WaitConnect");
                     err = Socket->GetConnectStatus();
+                } else if (!err) {
+                    RegisterInPoller();
                 }
 
                 // check if connection succeeded
@@ -915,9 +919,6 @@ namespace NActors {
 
             // setup send buffer size
             Socket->SetSendBufferSize(Common->Settings.GetSendBufferSize());
-
-            // register in poller
-            RegisterInPoller();
         }
 
         void RegisterInPoller() {