diff options
Diffstat (limited to 'library/cpp/actors')
| -rw-r--r-- | library/cpp/actors/interconnect/interconnect_handshake.cpp | 5 | ||||
| -rw-r--r-- | library/cpp/actors/util/rope.h | 15 |
2 files changed, 4 insertions, 16 deletions
diff --git a/library/cpp/actors/interconnect/interconnect_handshake.cpp b/library/cpp/actors/interconnect/interconnect_handshake.cpp index 4a57fc226c0..cb4788a33c0 100644 --- a/library/cpp/actors/interconnect/interconnect_handshake.cpp +++ b/library/cpp/actors/interconnect/interconnect_handshake.cpp @@ -491,8 +491,11 @@ namespace NActors { s << ", errorReason# " << errorReason; errorCallback(s.Str()); } - } else { + } else if (proto.HasVersionTag()) { ValidateVersionTag(proto, std::forward<TCallback>(errorCallback)); + } else { + LOG_LOG_IC_X(NActorsServices::INTERCONNECT, "ICH09", NLog::PRI_WARN, + "Neither CompatibilityInfo nor VersionTag of the peer can be validated, accepting by default"); } } diff --git a/library/cpp/actors/util/rope.h b/library/cpp/actors/util/rope.h index 201ce06f0d4..6d424ce58b7 100644 --- a/library/cpp/actors/util/rope.h +++ b/library/cpp/actors/util/rope.h @@ -915,8 +915,6 @@ class TRopeArena { TAllocateCallback Allocator; TRope Arena; - size_t Size = 0; - THashSet<const void*> AccountedBuffers; public: TRopeArena(TAllocateCallback&& allocator) @@ -949,16 +947,6 @@ public: return res; } - - size_t GetSize() const { - return Size; - } - - void AccountChunk(const TRcBuf& chunk) { - if (AccountedBuffers.insert(chunk.Backend.UniqueId()).second) { - Size += chunk.GetOccupiedMemorySize(); - } - } }; struct TRopeUtils { @@ -1131,9 +1119,6 @@ inline TRope TRope::CopySpaceOptimized(TRope&& origin, size_t worstRatioPer1k, T } res.Size = origin.Size; origin = TRope(); - for (const TRcBuf& chunk : res.Chain) { - arena.AccountChunk(chunk); - } return res; } |
