stable-25-3: A couple of fixes for crushes detected under jepsen + nemesis (#31134)

Author: ydbot

ydb/core/tx/columnshard/engines/reader/common_reader/constructor/read_metadata.cpp

@@ -90,9 +90,11 @@ NArrow::NMerger::TSortableBatchPosition TReadMetadata::BuildSortedPosition(const
 }
 
 void TReadMetadata::DoOnReadFinished(NColumnShard::TColumnShard& owner) const {
-    if (!NeedToDetectConflicts()) {
+    auto alreadyAborted = LockId.has_value() && owner.GetOperationsManager().GetLockOptional(*GetLockId()) == nullptr;
+    if (!NeedToDetectConflicts() || alreadyAborted) {
         return;
     }
+
     const ui64 lock = *GetLockId();
     if (GetBreakLockOnReadFinished()) {
         owner.GetOperationsManager().GetLockVerified(lock).SetBroken();

ydb/core/tx/columnshard/engines/storage/granule/granule.cpp

@@ -148,12 +148,16 @@ TGranuleMeta::TGranuleMeta(const TInternalPathId pathId, const TGranulesStorage&
 }
 
 void TGranuleMeta::UpsertPortionOnLoad(const std::shared_ptr<TPortionInfo>& portion) {
+    if (portion->GetPortionType() == EPortionType::Written) {
+        auto writtenPortion = std::static_pointer_cast<TWrittenPortionInfo>(portion);
+        const TInsertWriteId insertWriteId = writtenPortion->GetInsertWriteId();
+        if (AtomicGet(LastInsertWriteId) < (i64)insertWriteId) {
+            AtomicSet(LastInsertWriteId, (i64)insertWriteId);
+        }
+    }
     if (!portion->IsCommitted()) {
         const std::shared_ptr<TWrittenPortionInfo> portionImpl = std::static_pointer_cast<TWrittenPortionInfo>(portion);
         const TInsertWriteId insertWriteId = portionImpl->GetInsertWriteId();
-        if (AtomicGet(LastInsertWriteId) < (i64)portionImpl->GetInsertWriteId()) {
-            AtomicSet(LastInsertWriteId, (i64)portionImpl->GetInsertWriteId());
-        }
         AFL_VERIFY(InsertedPortions.emplace(insertWriteId, portionImpl).second);
         AFL_VERIFY(InsertedPortionsById.emplace(portionImpl->GetPortionId(), portionImpl).second);
         AFL_VERIFY(!Portions.contains(portionImpl->GetPortionId()));