Merge 593c179 into a701bdb

Author: kunga

ydb/core/tx/datashard/local_kmeans.cpp

@@ -247,12 +247,6 @@ class TLocalKMeansScanBase: public TActor<TLocalKMeansScanBase>, public NTable::
     EScan PageFault() final
     {
         LOG_T("PageFault " << Debug());
-
-        if (!ReadBuf.IsEmpty() && WriteBuf.IsEmpty()) {
-            ReadBuf.FlushTo(WriteBuf);
-            Upload(false);
-        }
-
         return EScan::Feed;
     }
 

ydb/core/tx/datashard/prefix_kmeans.cpp

@@ -225,18 +225,12 @@ class TPrefixKMeansScanBase: public TActor<TPrefixKMeansScanBase>, public NTable
             << " K: " << K << " Clusters: " << Clusters.size()
             << " State: " << State << " Round: " << Round << " / " << MaxRounds
             << " LevelBuf size: " << LevelBuf.Size() << " PostingBuf size: " << PostingBuf.Size() << " PrefixBuf size: " << PrefixBuf.Size()
-            << " UploadTable: " << UploadTable << " UploadBuf size: " << UploadBuf.Size();
+            << " UploadTable: " << UploadTable << " UploadBuf size: " << UploadBuf.Size() << " RetryCount: " << RetryCount;
     }
 
     EScan PageFault() final
     {
         LOG_T("PageFault " << Debug());
-
-        UploadInProgress()
-            || TryUpload(LevelBuf, LevelTable, LevelTypes, false)
-            || TryUpload(PostingBuf, PostingTable, PostingTypes, false)
-            || TryUpload(PrefixBuf, PrefixTable, PrefixTypes, false);
-
         return EScan::Feed;
     }
 
@@ -328,6 +322,8 @@ class TPrefixKMeansScanBase: public TActor<TPrefixKMeansScanBase>, public NTable
 
     void UploadImpl()
     {
+        LOG_D("Uploading " << Debug());
+
         Y_ASSERT(!UploadBuf.IsEmpty());
         Y_ASSERT(!Uploader);
         auto actor = NTxProxy::CreateUploadRowsInternal(

ydb/core/tx/datashard/reshuffle_kmeans.cpp

@@ -178,12 +178,6 @@ class TReshuffleKMeansScanBase: public TActor<TReshuffleKMeansScanBase>, public
     EScan PageFault() final
     {
         LOG_T("PageFault " << Debug());
-
-        if (!ReadBuf.IsEmpty() && WriteBuf.IsEmpty()) {
-            ReadBuf.FlushTo(WriteBuf);
-            Upload(false);
-        }
-
         return EScan::Feed;
     }