Merge branch 'ydb-platform:main' into main

Author: serbel324

.github/config/muted_ya.txt

@@ -64,22 +64,6 @@ ydb/core/viewer/tests test.py.test_topic_data_cdc
 ydb/core/viewer/ut Viewer.TabletMerging
 ydb/library/actors/core/ut_fat HeavyActorBenchmark.SendActivateReceiveCSV_10Pairs_LONG
 ydb/library/actors/core/ut_fat unittest.[*/*] chunk
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite.AllocMemoryManually
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.AllocMemoryWithMemPool/DummyMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.AllocMemoryWithMemPool/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.AllocMemoryWithMemPoolAsync/DummyMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.AllocMemoryWithMemPoolAsync/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.AllocMemoryWithMemPoolAsyncRandomOrderDealloc/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.FullChunkAllocationMultiThread/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.MemRegRcBuf/DummyMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.MemRegRcBuf/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.MemRegRcBufSubstr/DummyMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.MemRegRcBufSubstr/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.MemRegRope/DummyMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.MemRegRope/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.PageAlligned/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.SmallAllocationMultiThread/SlotMemPool
-ydb/library/actors/interconnect/rdma/ut TAllocatorSuite/WithAllPools.ThreadsDestroy/SlotMemPool
 ydb/library/actors/interconnect/ut_fat InterconnectUnstableConnection.InterconnectTestWithProxyTlsReestablishWithXdc
 ydb/library/actors/interconnect/ut_fat InterconnectZcLocalOp.ZcDisabledAfterHiddenCopy
 ydb/library/actors/interconnect/ut_fat InterconnectZcLocalOp.ZcIsDisabledByDefault

.github/workflows/build_ydb_cli.yml

@@ -138,6 +138,20 @@ jobs:
 
           git add ydb/apps/ydb/CHANGELOG.md
 
+      - name: Create CLI version file
+        run: |
+          NEW_VERSION="${{ steps.update-version.outputs.new-version }}"
+          echo "$NEW_VERSION" > cli_version.txt
+          echo "Created cli_version.txt with version: $NEW_VERSION"
+
+      - name: Upload CLI version artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cli-version
+          path: cli_version.txt
+          if-no-files-found: error
+          retention-days: 1
+
       - name: Commit changes
         run: |
           git commit -m "YDB CLI release ${{ steps.update-version.outputs.new-version }}"
@@ -430,4 +444,3 @@ jobs:
         run: |
           # Delete the branch
           git push origin --delete "${{ needs.prepare-release.outputs.branch-name }}" || echo "Branch already deleted"
-

ydb/apps/pgwire/pgwire.cpp

@@ -9,7 +9,7 @@
 #include <ydb/library/actors/core/scheduler_basic.h>
 #include <ydb/library/actors/core/process_stats.h>
 #include <ydb/library/actors/protos/services_common.pb.h>
-#include <ydb/library/actors/interconnect/poller_actor.h>
+#include <ydb/library/actors/interconnect/poller/poller_actor.h>
 #include "pgwire.h"
 #include "log_impl.h"
 #include "pg_ydb_proxy.h"

ydb/core/base/appdata.cpp

@@ -34,7 +34,7 @@
 #include <ydb/core/protos/workload_manager_config.pb.h>
 #include <ydb/library/pdisk_io/aio.h>
 
-#include <ydb/library/actors/interconnect/poller_tcp.h>
+#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
 #include <ydb/library/actors/core/monotonic_provider.h>
 #include <ydb/library/actors/util/should_continue.h>
 #include <library/cpp/random_provider/random_provider.h>

ydb/core/base/appdata.h

@@ -35,7 +35,7 @@
 #include <ydb/core/base/event_filter.h>
 #include <ydb/library/actors/core/actor.h>
 
-#include <ydb/library/actors/interconnect/poller_tcp.h>
+#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
 #include <ydb/library/actors/core/monotonic_provider.h>
 #include <ydb/library/actors/util/should_continue.h>
 #include <library/cpp/random_provider/random_provider.h>

ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp

@@ -32,8 +32,8 @@
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/actors/core/scheduler_basic.h>
 #include <ydb/library/actors/interconnect/interconnect.h>
-#include <ydb/library/actors/interconnect/poller_tcp.h>
-#include <ydb/library/actors/interconnect/poller_actor.h>
+#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
+#include <ydb/library/actors/interconnect/poller/poller_actor.h>
 #include <ydb/library/actors/interconnect/mock/ic_mock.h>
 #include <ydb/library/actors/protos/services_common.pb.h>
 #include <ydb/library/actors/util/affinity.h>

ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.cpp

@@ -104,6 +104,7 @@ void TCompletionLogWrite::Release(TActorSystem *actorSystem) {
         auto res = MakeHolder<TEvLogResult>(NKikimrProto::CORRUPTED,
             NKikimrBlobStorage::StatusIsValid, ErrorReason, PDisk->Keeper.GetLogChunkCount());
         logWrite->Replied = true;
+        res->Results.emplace_back(logWrite->Lsn, logWrite->Cookie);
         actorSystem->Send(logWrite->Sender, res.Release());
         PDisk->Mon.WriteLog.CountResponse();
     }

ydb/core/blobstorage/ut_vdisk/lib/astest.h

@@ -6,7 +6,7 @@
 #include <ydb/library/actors/core/executor_pool_basic.h>
 #include <ydb/library/actors/core/executor_pool_io.h>
 #include <ydb/library/actors/core/scheduler_basic.h>
-#include <ydb/library/actors/interconnect/poller_actor.h>
+#include <ydb/library/actors/interconnect/poller/poller_actor.h>
 #include <ydb/core/mon/mon.h>
 #include <ydb/library/actors/interconnect/interconnect.h>
 #include <ydb/library/actors/protos/services_common.pb.h>

ydb/core/driver_lib/cli_utils/cli.h

@@ -5,7 +5,7 @@
 #include <ydb/core/driver_lib/cli_base/cli.h>
 #include <ydb/core/driver_lib/run/factories.h>
 
-#include <ydb/library/actors/interconnect/poller_tcp.h>
+#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
 #include <ydb/public/lib/deprecated/client/msgbus_client.h>
 
 #include <library/cpp/deprecated/enum_codegen/enum_codegen.h>

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

@@ -236,8 +236,8 @@
 #include <ydb/library/actors/interconnect/interconnect_tcp_server.h>
 #include <ydb/library/actors/interconnect/handshake_broker.h>
 #include <ydb/library/actors/interconnect/load.h>
-#include <ydb/library/actors/interconnect/poller_actor.h>
-#include <ydb/library/actors/interconnect/poller_tcp.h>
+#include <ydb/library/actors/interconnect/poller/poller_actor.h>
+#include <ydb/library/actors/interconnect/poller/poller_tcp.h>
 #include <ydb/library/actors/util/affinity.h>
 #include <ydb/library/actors/wilson/wilson_uploader.h>
 #include <ydb/library/slide_limiter/service/service.h>
@@ -473,9 +473,9 @@ static TInterconnectSettings GetInterconnectSettings(const NKikimrConfig::TInter
     if (config.HasNumPreallocatedBuffers()) {
         result.NumPreallocatedBuffers = config.GetNumPreallocatedBuffers();
     }
-    if (config.HasEnableExternalDataChannel()) {
-        result.EnableExternalDataChannel = config.GetEnableExternalDataChannel();
-    }
+
+    result.EnableExternalDataChannel = config.GetEnableExternalDataChannel();
+
     if (config.HasValidateIncomingPeerViaDirectLookup()) {
         result.ValidateIncomingPeerViaDirectLookup = config.GetValidateIncomingPeerViaDirectLookup();
     }
@@ -495,15 +495,13 @@ static TInterconnectSettings GetInterconnectSettings(const NKikimrConfig::TInter
         result.EventDelay = TDuration::MicroSeconds(config.GetEventDelayMicrosec());
     }
 
-    if (config.HasSocketSendOptimization()) {
-        switch (config.GetSocketSendOptimization()) {
-            case NKikimrConfig::TInterconnectConfig::IC_SO_DISABLED:
-                result.SocketSendOptimization = ESocketSendOptimization::DISABLED;
-                break;
-            case NKikimrConfig::TInterconnectConfig::IC_SO_MSG_ZEROCOPY:
-                result.SocketSendOptimization = ESocketSendOptimization::IC_MSG_ZEROCOPY;
-                break;
-        }
+    switch (config.GetSocketSendOptimization()) {
+        case NKikimrConfig::TInterconnectConfig::IC_SO_DISABLED:
+            result.SocketSendOptimization = ESocketSendOptimization::DISABLED;
+            break;
+        case NKikimrConfig::TInterconnectConfig::IC_SO_MSG_ZEROCOPY:
+            result.SocketSendOptimization = ESocketSendOptimization::IC_MSG_ZEROCOPY;
+            break;
     }
 
     return result;