You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ap...@apache.org on 2025/03/18 06:30:24 UTC

(ignite-3) branch main updated: IGNITE-24816 Reuse LeaseInfo class in partition storages (#5425)

This is an automated email from the ASF dual-hosted git repository.

apolovtsev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new c771eacbf71 IGNITE-24816 Reuse LeaseInfo class in partition storages (#5425)
c771eacbf71 is described below

commit c771eacbf71197b0365a454f6708a6e68102a4e5
Author: Alexander Polovtcev <al...@gmail.com>
AuthorDate: Tue Mar 18 08:30:19 2025 +0200

    IGNITE-24816 Reuse LeaseInfo class in partition storages (#5425)
---
 .../raft/snapshot/PartitionDataStorage.java        |  33 +-----
 .../raft/snapshot/PartitionMvStorageAccess.java    |  30 ++---
 .../snapshot/PartitionSnapshotStorageFactory.java  |   4 +-
 .../raft/snapshot/PartitionTxStateAccess.java      |   3 +-
 .../raft/snapshot/PartitionTxStateAccessImpl.java  |   5 +-
 .../raft/snapshot/RaftSnapshotPartitionMeta.java   |  81 -------------
 .../snapshot/incoming/IncomingSnapshotCopier.java  |  30 ++++-
 .../raft/snapshot/outgoing/OutgoingSnapshot.java   |  11 +-
 .../raft/snapshot/outgoing/SnapshotMetaUtils.java  |  22 ++--
 .../raft/ZonePartitionRaftListenerTest.java        |   2 +-
 .../incoming/IncomingSnapshotCopierTest.java       |  23 ++--
 .../outgoing/OutgoingSnapshotCommonTest.java       |  13 ++-
 .../snapshot/outgoing/SnapshotMetaUtilsTest.java   |   9 +-
 .../raftsnapshot/ItTableRaftSnapshotsTest.java     |   4 +-
 .../internal/storage/MvPartitionStorage.java       |  35 +-----
 .../storage/ThreadAssertingMvPartitionStorage.java |  23 +---
 .../internal/storage/engine/MvPartitionMeta.java   |   8 +-
 .../storage/engine/PrimitivePartitionMeta.java     |  28 +----
 .../storage/AbstractMvPartitionStorageTest.java    |  20 ++--
 .../storage/AbstractMvTableStorageTest.java        |   5 +-
 .../storage/impl/TestMvPartitionStorage.java       |  47 ++------
 .../internal/storage/impl/TestMvTableStorage.java  |  11 +-
 .../pagememory/AbstractPageMemoryTableStorage.java |  11 +-
 .../mv/AbstractPageMemoryMvPartitionStorage.java   |  13 +--
 .../mv/PersistentPageMemoryMvPartitionStorage.java | 130 +++++++++------------
 .../mv/VolatilePageMemoryMvPartitionStorage.java   |  58 +++------
 .../storage/rocksdb/RocksDbMvPartitionStorage.java |  78 +++----------
 .../storage/rocksdb/RocksDbMvTableStorageTest.java |  12 +-
 .../table/distributed/raft/PartitionListener.java  |  68 ++++++-----
 .../snapshot/PartitionMvStorageAccessImpl.java     |  21 +---
 .../SnapshotAwarePartitionDataStorage.java         |  23 +---
 .../distributed/TestPartitionDataStorage.java      |  23 +---
 .../ignite/internal/table/TxAbstractTest.java      |   4 +-
 .../rocksdb/TxStateRocksDbPartitionStorage.java    |  10 +-
 .../state/AbstractTxStatePartitionStorageTest.java |  25 ++--
 .../state/test/TestTxStatePartitionStorage.java    |   9 +-
 36 files changed, 293 insertions(+), 639 deletions(-)

diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
index 8d27f802600..5c1188050a0 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionDataStorage.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.TxIdMismatchException;
 import org.apache.ignite.internal.storage.gc.GcEntry;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.util.Cursor;
 import org.jetbrains.annotations.Nullable;
 
@@ -230,36 +231,12 @@ public interface PartitionDataStorage extends ManuallyCloseable {
     @Nullable BinaryRow vacuum(GcEntry entry);
 
     /**
-     * Updates the current lease start time in the storage.
-     *
-     * @param leaseStartTime Lease start time.
-     * @param primaryReplicaNodeId Primary replica node id.
-     * @param primaryReplicaNodeName Primary replica node name.
-     */
-    void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    );
-
-    /**
-     * Return the start time of the known lease for this replication group.
-     *
-     * @return Lease start time.
+     * Updates the current lease information in the storage.
      */
-    long leaseStartTime();
+    void updateLease(LeaseInfo leaseInfo);
 
     /**
-     * Return the node id of the known lease for this replication group.
-     *
-     * @return Primary replica node id.
-     */
-    UUID primaryReplicaNodeId();
-
-    /**
-     * Return the node name of the known lease for this replication group.
-     *
-     * @return Primary replica node name.
+     * Return the information about the known lease for this replication group.
      */
-    String primaryReplicaNodeName();
+    @Nullable LeaseInfo leaseInfo();
 }
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
index 2f484fa7028..1dc018becd9 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionMvStorageAccess.java
@@ -30,6 +30,8 @@ import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.StorageRebalanceException;
 import org.apache.ignite.internal.storage.TxIdMismatchException;
+import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -105,26 +107,8 @@ public interface PartitionMvStorageAccess {
     /** Returns the last applied term of this storage. */
     long lastAppliedTerm();
 
-    /**
-     * Returns the start time of the known lease for this replication group.
-     *
-     * @return Lease start time.
-     */
-    long leaseStartTime();
-
-    /**
-     * Return the node ID of the known lease for this replication group.
-     *
-     * @return Primary replica node id or {@code null} if there is no information about lease in the storage.
-     */
-    @Nullable UUID primaryReplicaNodeId();
-
-    /**
-     * Return the node name of the known lease for this replication group.
-     *
-     * @return Primary replica node name or {@code null} if there is no information about lease in the storage.
-     */
-    @Nullable String primaryReplicaNodeName();
+    /** Returns the saved lease information of this storage. */
+    @Nullable LeaseInfo leaseInfo();
 
     /**
      * Prepares partition storages for rebalancing.
@@ -146,8 +130,8 @@ public interface PartitionMvStorageAccess {
      *
      * <p>This method must be called before every rebalance and ends with a call to one of the methods:
      * <ul>
-     *     <li>{@link #abortRebalance()} - in case of errors or cancellation of rebalance;</li>
-     *     <li>{@link #finishRebalance(RaftSnapshotPartitionMeta)} - in case of successful completion of rebalance.</li>
+     *     <li>{@link #abortRebalance} - in case of errors or cancellation of rebalance;</li>
+     *     <li>{@link #finishRebalance} - in case of successful completion of rebalance.</li>
      * </ul>
      *
      * @return Future of the operation.
@@ -184,7 +168,7 @@ public interface PartitionMvStorageAccess {
      * @return Future of the operation.
      * @throws StorageRebalanceException If there are errors when trying to finish rebalancing.
      */
-    CompletableFuture<Void> finishRebalance(RaftSnapshotPartitionMeta partitionMeta);
+    CompletableFuture<Void> finishRebalance(MvPartitionMeta partitionMeta);
 
     /**
      * Returns the row ID for which the index needs to be built, {@code null} means that the index building has completed.
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactory.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactory.java
index 0526a77ef31..d2b8874906c 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactory.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionSnapshotStorageFactory.java
@@ -137,9 +137,7 @@ public class PartitionSnapshotStorageFactory implements SnapshotStorageFactory {
                             Objects.requireNonNull(storageWithMinLastAppliedIndex.committedGroupConfiguration()),
                             lastCatalogVersionAtStart,
                             collectNextRowIdToBuildIndexesAtStart(lastCatalogVersionAtStart),
-                            storageWithMinLastAppliedIndex.leaseStartTime(),
-                            storageWithMinLastAppliedIndex.primaryReplicaNodeId(),
-                            storageWithMinLastAppliedIndex.primaryReplicaNodeName()
+                            storageWithMinLastAppliedIndex.leaseInfo()
                     );
                 })
                 .orElse(null);
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccess.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccess.java
index 783d52566fa..af408677e81 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccess.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccess.java
@@ -21,6 +21,7 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import org.apache.ignite.internal.lang.IgniteBiTuple;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
+import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
 import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.tx.TxMeta;
 import org.apache.ignite.internal.util.Cursor;
@@ -79,5 +80,5 @@ public interface PartitionTxStateAccess {
      * Completes rebalancing of the TX storage with the same guarantees and requirements as
      * {@link PartitionMvStorageAccess#finishRebalance}.
      */
-    CompletableFuture<Void> finishRebalance(RaftSnapshotPartitionMeta partitionMeta);
+    CompletableFuture<Void> finishRebalance(MvPartitionMeta partitionMeta);
 }
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccessImpl.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccessImpl.java
index 9cbd51409c5..106874f11a8 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccessImpl.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/PartitionTxStateAccessImpl.java
@@ -22,6 +22,7 @@ import java.util.concurrent.CompletableFuture;
 import org.apache.ignite.internal.lang.IgniteBiTuple;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
 import org.apache.ignite.internal.raft.RaftGroupConfigurationConverter;
+import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
 import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.tx.TxMeta;
 import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage;
@@ -79,7 +80,7 @@ public class PartitionTxStateAccessImpl implements PartitionTxStateAccess {
     }
 
     @Override
-    public CompletableFuture<Void> finishRebalance(RaftSnapshotPartitionMeta partitionMeta) {
-        return storage.finishRebalance(partitionMeta.toMvPartitionMeta(partitionMeta.raftGroupConfig()));
+    public CompletableFuture<Void> finishRebalance(MvPartitionMeta partitionMeta) {
+        return storage.finishRebalance(partitionMeta);
     }
 }
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/RaftSnapshotPartitionMeta.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/RaftSnapshotPartitionMeta.java
deleted file mode 100644
index 861db846ceb..00000000000
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/RaftSnapshotPartitionMeta.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.partition.replicator.raft.snapshot;
-
-import java.util.UUID;
-import org.apache.ignite.internal.partition.replicator.network.raft.PartitionSnapshotMeta;
-import org.apache.ignite.internal.raft.RaftGroupConfiguration;
-import org.apache.ignite.internal.raft.RaftGroupConfigurationSerializer;
-import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
-import org.apache.ignite.internal.storage.engine.PrimitivePartitionMeta;
-import org.apache.ignite.internal.versioned.VersionedSerialization;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Partition metadata for {@link PartitionMvStorageAccess}.
- */
-public class RaftSnapshotPartitionMeta extends PrimitivePartitionMeta {
-    private final byte[] raftGroupConfig;
-
-    /** Constructs an {@link RaftSnapshotPartitionMeta} from a {@link PartitionSnapshotMeta} . */
-    public static RaftSnapshotPartitionMeta fromSnapshotMeta(PartitionSnapshotMeta meta, RaftGroupConfiguration raftGroupConfig) {
-        return new RaftSnapshotPartitionMeta(
-                meta.lastIncludedIndex(),
-                meta.lastIncludedTerm(),
-                raftGroupConfig,
-                meta.leaseStartTime(),
-                meta.primaryReplicaNodeId(),
-                meta.primaryReplicaNodeName()
-        );
-    }
-
-    /** Constructor. */
-    private RaftSnapshotPartitionMeta(
-            long lastAppliedIndex,
-            long lastAppliedTerm,
-            RaftGroupConfiguration raftGroupConfig,
-            long leaseStartTime,
-            @Nullable UUID primaryReplicaNodeId,
-            @Nullable String primaryReplicaNodeName
-    ) {
-        super(lastAppliedIndex, lastAppliedTerm, leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
-
-        this.raftGroupConfig = VersionedSerialization.toBytes(raftGroupConfig, RaftGroupConfigurationSerializer.INSTANCE);
-    }
-
-    /** Returns replication group config. */
-    public byte[] raftGroupConfig() {
-        return raftGroupConfig;
-    }
-
-    /**
-     * Converts this meta to {@link MvPartitionMeta}.
-     *
-     * @param configBytes Group config represented as bytes.
-     */
-    public MvPartitionMeta toMvPartitionMeta(byte[] configBytes) {
-        return new MvPartitionMeta(
-                lastAppliedIndex(),
-                lastAppliedTerm(),
-                configBytes,
-                leaseStartTime(),
-                primaryReplicaNodeId(),
-                primaryReplicaNodeName()
-        );
-    }
-}
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
index 269b9d07d6a..7878d1e7d20 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopier.java
@@ -56,16 +56,19 @@ import org.apache.ignite.internal.partition.replicator.network.raft.SnapshotTxDa
 import org.apache.ignite.internal.partition.replicator.network.replication.BinaryRowMessage;
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionSnapshotStorage;
-import org.apache.ignite.internal.partition.replicator.raft.snapshot.RaftSnapshotPartitionMeta;
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.SnapshotUri;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
+import org.apache.ignite.internal.raft.RaftGroupConfigurationSerializer;
 import org.apache.ignite.internal.schema.BinaryRow;
 import org.apache.ignite.internal.storage.MvPartitionStorage;
 import org.apache.ignite.internal.storage.ReadResult;
 import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.StorageRebalanceException;
+import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage;
 import org.apache.ignite.internal.util.IgniteSpinBusyLock;
+import org.apache.ignite.internal.versioned.VersionedSerialization;
 import org.apache.ignite.network.ClusterNode;
 import org.apache.ignite.raft.jraft.error.RaftError;
 import org.apache.ignite.raft.jraft.storage.snapshot.SnapshotCopier;
@@ -486,7 +489,7 @@ public class IncomingSnapshotCopier extends SnapshotCopier {
                 return abortRebalance().thenCompose(unused -> failedFuture(throwable));
             }
 
-            RaftGroupConfiguration raftGroupConfig = new RaftGroupConfiguration(
+            var raftGroupConfig = new RaftGroupConfiguration(
                     meta.cfgIndex(),
                     meta.cfgTerm(),
                     meta.peersList(),
@@ -503,12 +506,31 @@ public class IncomingSnapshotCopier extends SnapshotCopier {
                     raftGroupConfig
             );
 
-            return finishRebalance(RaftSnapshotPartitionMeta.fromSnapshotMeta(meta, raftGroupConfig));
+            var snapshotMeta = new MvPartitionMeta(
+                    meta.lastIncludedIndex(),
+                    meta.lastIncludedTerm(),
+                    VersionedSerialization.toBytes(raftGroupConfig, RaftGroupConfigurationSerializer.INSTANCE),
+                    leaseInfo(meta)
+            );
+
+            return finishRebalance(snapshotMeta);
         } finally {
             busyLock.leaveBusy();
         }
     }
 
+    private static @Nullable LeaseInfo leaseInfo(PartitionSnapshotMeta meta) {
+        if (meta.primaryReplicaNodeId() == null) {
+            return null;
+        }
+
+        return new LeaseInfo(
+                meta.leaseStartTime(),
+                meta.primaryReplicaNodeId(),
+                meta.primaryReplicaNodeName()
+        );
+    }
+
     private int partId() {
         return partitionSnapshotStorage.partitionKey().partitionId();
     }
@@ -610,7 +632,7 @@ public class IncomingSnapshotCopier extends SnapshotCopier {
         );
     }
 
-    private CompletableFuture<Void> finishRebalance(RaftSnapshotPartitionMeta meta) {
+    private CompletableFuture<Void> finishRebalance(MvPartitionMeta meta) {
         return allOf(
                 aggregateFutureFromPartitions(mvPartition -> mvPartition.finishRebalance(meta)),
                 partitionSnapshotStorage.txState().finishRebalance(meta)
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
index f87aa24aa4c..6a7c2ccc9fa 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java
@@ -61,7 +61,6 @@ import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
 import org.apache.ignite.internal.schema.BinaryRow;
 import org.apache.ignite.internal.storage.ReadResult;
 import org.apache.ignite.internal.storage.RowId;
-import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.tx.TxMeta;
 import org.apache.ignite.internal.tx.message.TxMessagesFactory;
 import org.apache.ignite.internal.tx.message.TxMetaMessage;
@@ -217,17 +216,13 @@ public class OutgoingSnapshot {
 
             assert config != null : "Configuration should never be null when installing a snapshot";
 
-            LeaseInfo leaseInfo = txState.leaseInfo();
-
             return snapshotMetaAt(
                     txState.lastAppliedIndex(),
                     txState.lastAppliedTerm(),
                     config,
                     catalogVersion,
                     nextRowIdToBuildByIndexId,
-                    leaseInfo == null ? 0 : leaseInfo.leaseStartTime(),
-                    leaseInfo == null ? null : leaseInfo.primaryReplicaNodeId(),
-                    leaseInfo == null ? null : leaseInfo.primaryReplicaNodeName()
+                    txState.leaseInfo()
             );
         } else {
             RaftGroupConfiguration config = partitionStorageWithMaxAppliedIndex.committedGroupConfiguration();
@@ -240,9 +235,7 @@ public class OutgoingSnapshot {
                     config,
                     catalogVersion,
                     nextRowIdToBuildByIndexId,
-                    partitionStorageWithMaxAppliedIndex.leaseStartTime(),
-                    partitionStorageWithMaxAppliedIndex.primaryReplicaNodeId(),
-                    partitionStorageWithMaxAppliedIndex.primaryReplicaNodeName()
+                    partitionStorageWithMaxAppliedIndex.leaseInfo()
             );
         }
     }
diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtils.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtils.java
index cd1cbc19f39..31721f9b518 100644
--- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtils.java
+++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtils.java
@@ -26,13 +26,13 @@ import java.util.UUID;
 import org.apache.ignite.internal.catalog.Catalog;
 import org.apache.ignite.internal.catalog.CatalogService;
 import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
-import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory;
 import org.apache.ignite.internal.partition.replicator.network.raft.PartitionSnapshotMeta;
 import org.apache.ignite.internal.partition.replicator.network.raft.PartitionSnapshotMetaBuilder;
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
 import org.apache.ignite.internal.storage.RowId;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.raft.jraft.entity.RaftOutter.SnapshotMeta;
 import org.jetbrains.annotations.Nullable;
 
@@ -51,9 +51,7 @@ public class SnapshotMetaUtils {
      * @param requiredCatalogVersion Catalog version that a follower/learner must have to have ability to accept this snapshot.
      * @param nextRowIdToBuildByIndexId Row ID for which the index needs to be built per building index ID at the time the snapshot meta was
      *      created.
-     * @param leaseStartTime Lease start time (as {@link HybridTimestamp#longValue()}).
-     * @param primaryReplicaNodeId Primary replica node ID.
-     * @param primaryReplicaNodeName Primary replica node name.
+     * @param leaseInfo Lease information.
      * @return SnapshotMeta corresponding to the given log index.
      */
     public static PartitionSnapshotMeta snapshotMetaAt(
@@ -62,9 +60,7 @@ public class SnapshotMetaUtils {
             RaftGroupConfiguration config,
             int requiredCatalogVersion,
             Map<Integer, UUID> nextRowIdToBuildByIndexId,
-            long leaseStartTime,
-            @Nullable UUID primaryReplicaNodeId,
-            @Nullable String primaryReplicaNodeName
+            @Nullable LeaseInfo leaseInfo
     ) {
         PartitionSnapshotMetaBuilder metaBuilder = MESSAGE_FACTORY.partitionSnapshotMeta()
                 .cfgIndex(config.index())
@@ -74,10 +70,14 @@ public class SnapshotMetaUtils {
                 .peersList(config.peers())
                 .learnersList(config.learners())
                 .requiredCatalogVersion(requiredCatalogVersion)
-                .nextRowIdToBuildByIndexId(nextRowIdToBuildByIndexId)
-                .leaseStartTime(leaseStartTime)
-                .primaryReplicaNodeId(primaryReplicaNodeId)
-                .primaryReplicaNodeName(primaryReplicaNodeName);
+                .nextRowIdToBuildByIndexId(nextRowIdToBuildByIndexId);
+
+        if (leaseInfo != null) {
+            metaBuilder
+                    .leaseStartTime(leaseInfo.leaseStartTime())
+                    .primaryReplicaNodeId(leaseInfo.primaryReplicaNodeId())
+                    .primaryReplicaNodeName(leaseInfo.primaryReplicaNodeName());
+        }
 
         if (!config.isStable()) {
             metaBuilder
diff --git a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
index 3284fe78db1..3da743f3c9d 100644
--- a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
+++ b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListenerTest.java
@@ -193,7 +193,7 @@ class ZonePartitionRaftListenerTest extends BaseIgniteAbstractTest {
 
         verify(mvPartitionStorage).lastApplied(2L, 3L);
         verify(mvPartitionStorage).committedGroupConfiguration(any());
-        verify(mvPartitionStorage).updateLease(123L, id, "foo");
+        verify(mvPartitionStorage).updateLease(new LeaseInfo(123L, id, "foo"));
     }
 
     @RepeatedTest(10)
diff --git a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
index cfee600d8af..6d857dd6bae 100644
--- a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
+++ b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
@@ -102,6 +102,7 @@ import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.engine.MvTableStorage;
 import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage;
 import org.apache.ignite.internal.storage.impl.TestMvTableStorage;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.table.distributed.gc.GcUpdateHandler;
 import org.apache.ignite.internal.table.distributed.gc.MvGc;
 import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
@@ -183,9 +184,7 @@ public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
     private final long expLastAppliedTerm = 100L;
     private final RaftGroupConfiguration expLastGroupConfig = generateRaftGroupConfig();
 
-    private final long expLeaseStartTime = 3000000;
-    private final UUID expPrimaryReplicaNodeId = new UUID(1, 2);
-    private final String expPrimaryReplicaNodeName = "primary";
+    private final LeaseInfo expLeaseInfo = new LeaseInfo(3000000, new UUID(1, 2), "primary");
 
     private final List<RowId> rowIds = generateRowIds();
     private final List<UUID> txIds = generateTxIds();
@@ -260,9 +259,7 @@ public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
                 raftGroupConfigurationConverter.toBytes(expLastGroupConfig),
                 outgoingMvPartitionStorage.committedGroupConfiguration()
         );
-        assertEquals(expLeaseStartTime, outgoingMvPartitionStorage.leaseStartTime());
-        assertEquals(expPrimaryReplicaNodeId, outgoingMvPartitionStorage.primaryReplicaNodeId());
-        assertEquals(expPrimaryReplicaNodeName, outgoingMvPartitionStorage.primaryReplicaNodeName());
+        assertEquals(expLeaseInfo, outgoingMvPartitionStorage.leaseInfo());
 
         assertEquals(expLastAppliedIndex, outgoingTxStatePartitionStorage.lastAppliedIndex());
         assertEquals(expLastAppliedTerm, outgoingTxStatePartitionStorage.lastAppliedTerm());
@@ -290,9 +287,7 @@ public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
                 expLastAppliedTerm,
                 expLastGroupConfig,
                 rowIds,
-                expLeaseStartTime,
-                expPrimaryReplicaNodeId,
-                expPrimaryReplicaNodeName
+                expLeaseInfo
         );
         fillTxStatePartitionStorage(outgoingTxStatePartitionStorage, expLastAppliedIndex, expLastAppliedTerm, txIds);
     }
@@ -355,9 +350,7 @@ public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
                         expLastGroupConfig,
                         requiredCatalogVersion,
                         Map.of(indexId, nextRowIdToBuildIndex.uuid()),
-                        expLeaseStartTime,
-                        expPrimaryReplicaNodeId,
-                        expPrimaryReplicaNodeName
+                        expLeaseInfo
                 ))
                 .build();
     }
@@ -406,9 +399,7 @@ public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
             long lastAppliedTerm,
             RaftGroupConfiguration raftGroupConfig,
             List<RowId> rowIds,
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
+            LeaseInfo leaseInfo
     ) {
         assertEquals(0, rowIds.size() % 2, "size=" + rowIds.size());
 
@@ -427,7 +418,7 @@ public class IncomingSnapshotCopierTest extends BaseIgniteAbstractTest {
 
             storage.committedGroupConfiguration(raftGroupConfigurationConverter.toBytes(raftGroupConfig));
 
-            storage.updateLease(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+            storage.updateLease(leaseInfo);
 
             return null;
         });
diff --git a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
index ab1c2784ef8..f0f38247dba 100644
--- a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
+++ b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshotCommonTest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMv
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionTxStateAccess;
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.ZonePartitionKey;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
@@ -117,9 +118,9 @@ class OutgoingSnapshotCommonTest extends BaseIgniteAbstractTest {
 
         when(catalogService.latestCatalogVersion()).thenReturn(REQUIRED_CATALOG_VERSION);
 
-        when(partitionAccess2.leaseStartTime()).thenReturn(333L);
-        when(partitionAccess2.primaryReplicaNodeId()).thenReturn(new UUID(1, 2));
-        when(partitionAccess2.primaryReplicaNodeName()).thenReturn("primary");
+        var leaseInfo = new LeaseInfo(333L, new UUID(1, 2), "primary");
+
+        when(partitionAccess2.leaseInfo()).thenReturn(leaseInfo);
 
         snapshot.freezeScopeUnderMvLock();
 
@@ -134,9 +135,9 @@ class OutgoingSnapshotCommonTest extends BaseIgniteAbstractTest {
         assertThat(response.meta().oldPeersList(), is(List.of("peer1:3000")));
         assertThat(response.meta().oldLearnersList(), is(List.of("learner1:3000")));
         assertThat(response.meta().requiredCatalogVersion(), is(REQUIRED_CATALOG_VERSION));
-        assertThat(response.meta().leaseStartTime(), is(333L));
-        assertThat(response.meta().primaryReplicaNodeId(), is(new UUID(1, 2)));
-        assertThat(response.meta().primaryReplicaNodeName(), is("primary"));
+        assertThat(response.meta().leaseStartTime(), is(leaseInfo.leaseStartTime()));
+        assertThat(response.meta().primaryReplicaNodeId(), is(leaseInfo.primaryReplicaNodeId()));
+        assertThat(response.meta().primaryReplicaNodeName(), is(leaseInfo.primaryReplicaNodeName()));
     }
 
     private SnapshotMetaResponse getSnapshotMetaResponse() {
diff --git a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java
index 458a21d0cb4..fde29f466b3 100644
--- a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java
+++ b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/SnapshotMetaUtilsTest.java
@@ -49,6 +49,7 @@ import org.apache.ignite.internal.partition.replicator.network.raft.PartitionSna
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
 import org.apache.ignite.internal.storage.RowId;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -68,15 +69,15 @@ class SnapshotMetaUtilsTest extends BaseIgniteAbstractTest {
         UUID nextRowIdToBuild = UUID.randomUUID();
         int indexId = 1;
 
+        var leaseInfo = new LeaseInfo(777L, new UUID(1, 2), "primary");
+
         PartitionSnapshotMeta meta = snapshotMetaAt(
                 100,
                 3,
                 config,
                 42,
                 Map.of(indexId, nextRowIdToBuild),
-                777L,
-                new UUID(1, 2),
-                "primary"
+                leaseInfo
         );
 
         assertThat(meta.cfgIndex(), is(13L));
@@ -102,8 +103,6 @@ class SnapshotMetaUtilsTest extends BaseIgniteAbstractTest {
                 new RaftGroupConfiguration(13, 37, List.of(), List.of(), null, null),
                 42,
                 Map.of(),
-                777L,
-                null,
                 null
         );
 
diff --git a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
index 1da8b746409..c68f7402f28 100644
--- a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
+++ b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
@@ -208,9 +208,7 @@ class ItTableRaftSnapshotsTest extends ClusterPerTestIntegrationTest {
         MvPartitionStorage partitionAtNode0 = mvPartitionAtNode(0);
         MvPartitionStorage partitionAtNode2 = mvPartitionAtNode(2);
 
-        assertThat(partitionAtNode2.leaseStartTime(), not(0L));
-        assertEquals(partitionAtNode0.primaryReplicaNodeId(), partitionAtNode2.primaryReplicaNodeId());
-        assertEquals(partitionAtNode0.primaryReplicaNodeName(), partitionAtNode2.primaryReplicaNodeName());
+        assertThat(partitionAtNode2.leaseInfo(), is(partitionAtNode0.leaseInfo()));
     }
 
     private @Nullable String getFromNode(int clusterNode, int key) {
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
index ba4e12ed8e5..fbaf53274e5 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.close.ManuallyCloseable;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.schema.BinaryRow;
 import org.apache.ignite.internal.storage.gc.GcEntry;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.util.Cursor;
 import org.jetbrains.annotations.Nullable;
 
@@ -271,39 +272,13 @@ public interface MvPartitionStorage extends ManuallyCloseable {
      */
     @Nullable BinaryRow vacuum(GcEntry entry);
 
-    /**
-     * Updates the current lease start time in the storage.
-     *
-     * @param leaseStartTime Lease start time.
-     * @param primaryReplicaNodeId Primary replica node id.
-     * @param primaryReplicaNodeName Primary replica node name.
-     */
-    void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    );
-
-    /**
-     * Returns the start time of the known lease for this replication group.
-     *
-     * @return Lease start time.
-     */
-    long leaseStartTime();
-
-    /**
-     * Return the node id of the known lease for this replication group.
-     *
-     * @return Primary replica node id or null if there is no information about lease in the storage.
-     */
-    @Nullable UUID primaryReplicaNodeId();
+    /** Saves the given lease information in the storage. */
+    void updateLease(LeaseInfo leaseInfo);
 
     /**
-     * Return the node name of the known lease for this replication group.
-     *
-     * @return Primary replica node name or null if there is no information about lease in the storage.
+     * Returns the last saved lease information or {@code null} if it was never saved.
      */
-    @Nullable String primaryReplicaNodeName();
+    @Nullable LeaseInfo leaseInfo();
 
     /**
      * Returns the <em>estimated size</em> of this partition.
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
index 66b2f4d39b0..82b20796f5a 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/ThreadAssertingMvPartitionStorage.java
@@ -25,6 +25,7 @@ import java.util.concurrent.CompletableFuture;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.schema.BinaryRow;
 import org.apache.ignite.internal.storage.gc.GcEntry;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.util.Cursor;
 import org.apache.ignite.internal.worker.ThreadAssertingCursor;
 import org.apache.ignite.internal.worker.ThreadAssertions;
@@ -155,29 +156,15 @@ public class ThreadAssertingMvPartitionStorage implements MvPartitionStorage, Wr
     }
 
     @Override
-    public void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
+    public void updateLease(LeaseInfo leaseInfo) {
         assertThreadAllowsToWrite();
 
-        partitionStorage.updateLease(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+        partitionStorage.updateLease(leaseInfo);
     }
 
     @Override
-    public long leaseStartTime() {
-        return partitionStorage.leaseStartTime();
-    }
-
-    @Override
-    public @Nullable UUID primaryReplicaNodeId() {
-        return partitionStorage.primaryReplicaNodeId();
-    }
-
-    @Override
-    public @Nullable String primaryReplicaNodeName() {
-        return partitionStorage.primaryReplicaNodeName();
+    public @Nullable LeaseInfo leaseInfo() {
+        return partitionStorage.leaseInfo();
     }
 
     @Override
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvPartitionMeta.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvPartitionMeta.java
index 006f1b28111..737e34b0579 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvPartitionMeta.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvPartitionMeta.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.storage.engine;
 
-import java.util.UUID;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -31,11 +31,9 @@ public class MvPartitionMeta extends PrimitivePartitionMeta {
             long lastAppliedIndex,
             long lastAppliedTerm,
             byte[] groupConfig,
-            long leaseStartTime,
-            @Nullable UUID primaryReplicaNodeId,
-            @Nullable String primaryReplicaNodeName
+            @Nullable LeaseInfo leaseInfo
     ) {
-        super(lastAppliedIndex, lastAppliedTerm, leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+        super(lastAppliedIndex, lastAppliedTerm, leaseInfo);
 
         this.groupConfig = groupConfig;
     }
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/PrimitivePartitionMeta.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/PrimitivePartitionMeta.java
index c392dc7851f..78236870111 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/PrimitivePartitionMeta.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/PrimitivePartitionMeta.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.storage.engine;
 
-import java.util.UUID;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -26,23 +26,17 @@ import org.jetbrains.annotations.Nullable;
 public class PrimitivePartitionMeta {
     private final long lastAppliedIndex;
     private final long lastAppliedTerm;
-    private final long leaseStartTime;
-    private final @Nullable UUID primaryReplicaNodeId;
-    private final @Nullable String primaryReplicaNodeName;
+    private final @Nullable LeaseInfo leaseInfo;
 
     /** Constructor. */
     public PrimitivePartitionMeta(
             long lastAppliedIndex,
             long lastAppliedTerm,
-            long leaseStartTime,
-            @Nullable UUID primaryReplicaNodeId,
-            @Nullable String primaryReplicaNodeName
+            @Nullable LeaseInfo leaseInfo
     ) {
         this.lastAppliedIndex = lastAppliedIndex;
         this.lastAppliedTerm = lastAppliedTerm;
-        this.leaseStartTime = leaseStartTime;
-        this.primaryReplicaNodeId = primaryReplicaNodeId;
-        this.primaryReplicaNodeName = primaryReplicaNodeName;
+        this.leaseInfo = leaseInfo;
     }
 
     public long lastAppliedIndex() {
@@ -53,17 +47,7 @@ public class PrimitivePartitionMeta {
         return lastAppliedTerm;
     }
 
-    public long leaseStartTime() {
-        return leaseStartTime;
-    }
-
-    /** Returns primary replica node ID (or {@code null} if no primary replica node is known). */
-    public @Nullable UUID primaryReplicaNodeId() {
-        return primaryReplicaNodeId;
-    }
-
-    /** Returns primary replica node name (or {@code null} if no primary replica node is known). */
-    public @Nullable String primaryReplicaNodeName() {
-        return primaryReplicaNodeName;
+    public @Nullable LeaseInfo leaseInfo() {
+        return leaseInfo;
     }
 }
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
index bfcc6aa65e1..cb5aae5dbe0 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvPartitionStorageTest.java
@@ -48,6 +48,7 @@ import org.apache.ignite.internal.hlc.HybridClock;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.lang.IgniteBiTuple;
 import org.apache.ignite.internal.schema.BinaryRow;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.util.Cursor;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -1380,24 +1381,17 @@ public abstract class AbstractMvPartitionStorageTest extends BaseMvPartitionStor
             long lst1 = 2000;
             UUID nodeId1 = UUID.randomUUID();
 
-            storage.updateLease(lst0, nodeId0, nodeId0 + "name");
+            var leaseInfo = new LeaseInfo(lst0, nodeId0, nodeId0 + "name");
 
-            assertEquals(lst0, storage.leaseStartTime());
-            assertEquals(nodeId0, storage.primaryReplicaNodeId());
-            assertEquals(nodeId0 + "name", storage.primaryReplicaNodeName());
+            storage.updateLease(leaseInfo);
 
-            storage.updateLease(lst1, nodeId1, nodeId1 + "name");
+            assertEquals(leaseInfo, storage.leaseInfo());
 
-            assertEquals(lst1, storage.leaseStartTime());
-            assertEquals(nodeId1, storage.primaryReplicaNodeId());
-            assertEquals(nodeId1 + "name", storage.primaryReplicaNodeName());
+            leaseInfo = new LeaseInfo(lst1, nodeId1, nodeId1 + "name");
 
-            UUID nodeIdRandom = UUID.randomUUID();
-            storage.updateLease(0, nodeIdRandom, nodeIdRandom + "name");
+            storage.updateLease(leaseInfo);
 
-            assertEquals(lst1, storage.leaseStartTime());
-            assertEquals(nodeId1, storage.primaryReplicaNodeId());
-            assertEquals(nodeId1 + "name", storage.primaryReplicaNodeName());
+            assertEquals(leaseInfo, storage.leaseInfo());
 
             return null;
         });
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
index a14b7dbb6ab..9cc03425b00 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
@@ -80,6 +80,7 @@ import org.apache.ignite.internal.storage.index.StorageHashIndexDescriptor;
 import org.apache.ignite.internal.storage.index.StorageIndexDescriptor;
 import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
 import org.apache.ignite.internal.storage.index.impl.BinaryTupleRowSerializer;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.type.NativeTypes;
 import org.apache.ignite.internal.util.Cursor;
 import org.jetbrains.annotations.Nullable;
@@ -668,7 +669,9 @@ public abstract class AbstractMvTableStorageTest extends BaseMvTableStorageTest
     }
 
     private static MvPartitionMeta saneMvPartitionMeta(long lastAppliedIndex, long lastAppliedTerm, byte[] groupConfig) {
-        return new MvPartitionMeta(lastAppliedIndex, lastAppliedTerm, groupConfig, 333, new UUID(1, 2), "primary");
+        var leaseInfo = new LeaseInfo(333, new UUID(1, 2), "primary");
+
+        return new MvPartitionMeta(lastAppliedIndex, lastAppliedTerm, groupConfig, leaseInfo);
     }
 
     @Test
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
index 51f8613ae1e..ba2ac29f37e 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvPartitionStorage.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.storage.StorageRebalanceException;
 import org.apache.ignite.internal.storage.TxIdMismatchException;
 import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
 import org.apache.ignite.internal.storage.gc.GcEntry;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.storage.util.LocalLocker;
 import org.apache.ignite.internal.storage.util.LockByRowId;
 import org.apache.ignite.internal.tostring.S;
@@ -71,12 +72,8 @@ public class TestMvPartitionStorage implements MvPartitionStorage {
 
     private volatile long lastAppliedTerm;
 
-    // -1 is used as an initial value, in order not to clash with {@code ReplicaMeta.getStartTime}
-    private volatile long leaseStartTime = -1;
-
-    private volatile UUID primaryReplicaNodeId;
-
-    private volatile String primaryReplicaNodeName;
+    @Nullable
+    private volatile LeaseInfo leaseInfo;
 
     private volatile long estimatedSize;
 
@@ -639,41 +636,23 @@ public class TestMvPartitionStorage implements MvPartitionStorage {
     }
 
     @Override
-    public synchronized void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
+    public synchronized void updateLease(LeaseInfo leaseInfo) {
         checkStorageClosed();
 
-        if (leaseStartTime <= this.leaseStartTime) {
+        LeaseInfo thisLeaseInfo = this.leaseInfo;
+
+        if (thisLeaseInfo != null && leaseInfo.leaseStartTime() <= thisLeaseInfo.leaseStartTime()) {
             return;
         }
 
-        this.leaseStartTime = leaseStartTime;
-        this.primaryReplicaNodeId = primaryReplicaNodeId;
-        this.primaryReplicaNodeName = primaryReplicaNodeName;
-    }
-
-    @Override
-    public long leaseStartTime() {
-        checkStorageClosed();
-
-        return leaseStartTime;
+        this.leaseInfo = leaseInfo;
     }
 
     @Override
-    public @Nullable UUID primaryReplicaNodeId() {
+    public @Nullable LeaseInfo leaseInfo() {
         checkStorageClosed();
 
-        return primaryReplicaNodeId;
-    }
-
-    @Override
-    public @Nullable String primaryReplicaNodeName() {
-        checkStorageClosed();
-
-        return primaryReplicaNodeName;
+        return leaseInfo;
     }
 
     @Override
@@ -719,8 +698,7 @@ public class TestMvPartitionStorage implements MvPartitionStorage {
         lastAppliedTerm = 0;
         estimatedSize = 0;
         groupConfig = null;
-
-        leaseStartTime = HybridTimestamp.MIN_VALUE.longValue();
+        leaseInfo = null;
     }
 
     private void checkStorageClosed() {
@@ -758,8 +736,6 @@ public class TestMvPartitionStorage implements MvPartitionStorage {
 
         lastAppliedIndex = REBALANCE_IN_PROGRESS;
         lastAppliedTerm = REBALANCE_IN_PROGRESS;
-        estimatedSize = 0;
-        groupConfig = null;
     }
 
     void abortRebalance() {
@@ -784,6 +760,7 @@ public class TestMvPartitionStorage implements MvPartitionStorage {
         this.lastAppliedIndex = partitionMeta.lastAppliedIndex();
         this.lastAppliedTerm = partitionMeta.lastAppliedTerm();
         this.groupConfig = Arrays.copyOf(partitionMeta.groupConfig(), partitionMeta.groupConfig().length);
+        this.leaseInfo = partitionMeta.leaseInfo();
     }
 
     private class ScanVersionsCursor implements Cursor<ReadResult> {
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java
index dc791f1686b..81a57274277 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
 import org.apache.ignite.internal.storage.index.impl.AbstractTestIndexStorage;
 import org.apache.ignite.internal.storage.index.impl.TestHashIndexStorage;
 import org.apache.ignite.internal.storage.index.impl.TestSortedIndexStorage;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.storage.util.MvPartitionStorages;
 import org.apache.ignite.internal.util.IgniteSpinBusyLock;
 import org.apache.ignite.internal.util.IgniteUtils;
@@ -319,14 +320,10 @@ public class TestMvTableStorage implements MvTableStorage {
         return mvPartitionStorages.finishRebalance(partitionId, mvPartitionStorage -> {
             mvPartitionStorage.finishRebalance(partitionMeta);
 
-            if (partitionMeta.primaryReplicaNodeId() != null) {
-                assert partitionMeta.primaryReplicaNodeId() != null;
+            LeaseInfo leaseInfo = partitionMeta.leaseInfo();
 
-                mvPartitionStorage.updateLease(
-                        partitionMeta.leaseStartTime(),
-                        partitionMeta.primaryReplicaNodeId(),
-                        partitionMeta.primaryReplicaNodeName()
-                );
+            if (leaseInfo != null) {
+                mvPartitionStorage.updateLease(leaseInfo);
             }
 
             testHashIndexStorageStream(partitionId).forEach(TestHashIndexStorage::finishRebalance);
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java
index 9f9aa326f18..f3777395f7a 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/AbstractPageMemoryTableStorage.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.storage.index.SortedIndexStorage;
 import org.apache.ignite.internal.storage.index.StorageHashIndexDescriptor;
 import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
 import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.storage.pagememory.mv.AbstractPageMemoryMvPartitionStorage;
 import org.apache.ignite.internal.storage.util.MvPartitionStorages;
 import org.apache.ignite.internal.util.CompletableFutures;
@@ -301,14 +302,10 @@ public abstract class AbstractPageMemoryTableStorage implements MvTableStorage {
                 mvPartitionStorage.lastAppliedOnRebalance(partitionMeta.lastAppliedIndex(), partitionMeta.lastAppliedTerm());
                 mvPartitionStorage.committedGroupConfigurationOnRebalance(partitionMeta.groupConfig());
 
-                if (partitionMeta.primaryReplicaNodeId() != null) {
-                    assert partitionMeta.primaryReplicaNodeName() != null;
+                LeaseInfo leaseInfo = partitionMeta.leaseInfo();
 
-                    mvPartitionStorage.updateLeaseOnRebalance(
-                            partitionMeta.leaseStartTime(),
-                            partitionMeta.primaryReplicaNodeId(),
-                            partitionMeta.primaryReplicaNodeName()
-                    );
+                if (leaseInfo != null) {
+                    mvPartitionStorage.updateLeaseOnRebalance(leaseInfo);
                 }
 
                 return null;
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
index ad6f166a78a..a5397391211 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
@@ -55,6 +55,7 @@ import org.apache.ignite.internal.storage.gc.GcEntry;
 import org.apache.ignite.internal.storage.index.IndexStorage;
 import org.apache.ignite.internal.storage.index.StorageHashIndexDescriptor;
 import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.storage.pagememory.AbstractPageMemoryTableStorage;
 import org.apache.ignite.internal.storage.pagememory.index.hash.PageMemoryHashIndexStorage;
 import org.apache.ignite.internal.storage.pagememory.index.meta.IndexMetaTree;
@@ -740,17 +741,9 @@ public abstract class AbstractPageMemoryMvPartitionStorage implements MvPartitio
     public abstract void committedGroupConfigurationOnRebalance(byte[] config);
 
     /**
-     * Updates the current lease start time in the storage on rebalance.
-     *
-     * @param leaseStartTime Lease start time.
-     * @param primaryReplicaNodeId Primary replica node id.
-     * @param primaryReplicaNodeName Primary replica node name.
+     * Updates the current lease information in the storage on rebalance.
      */
-    public abstract void updateLeaseOnRebalance(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    );
+    public abstract void updateLeaseOnRebalance(LeaseInfo leaseInfo);
 
     /**
      * Prepares the storage and its indexes for cleanup.
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java
index 0e2eec55dae..5a96523d4b7 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.storage.MvPartitionStorage;
 import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.index.StorageHashIndexDescriptor;
 import org.apache.ignite.internal.storage.index.StorageSortedIndexDescriptor;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryTableStorage;
 import org.apache.ignite.internal.storage.pagememory.StoragePartitionMeta;
 import org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineView;
@@ -76,13 +77,15 @@ public class PersistentPageMemoryMvPartitionStorage extends AbstractPageMemoryMv
     /** Lock that protects group config read/write. */
     private final ReadWriteLock replicationProtocolGroupConfigReadWriteLock = new ReentrantReadWriteLock();
 
-    /** Lock that protects group primary replica meta read/write. */
-    private final ReadWriteLock primaryReplicaMetaReadWriteLock = new ReentrantReadWriteLock();
+    /**
+     * Cached lease info in order not to touch blobStorage each time.
+     */
+    private volatile @Nullable LeaseInfo leaseInfo;
 
     /**
-     * Cached primary replica node name in order not to touch blobStorage each time. Guarded by primaryReplicaMetaReadWriteLock.
+     * Lock for updating lease info in the storage.
      */
-    private String primaryReplicaNodeName;
+    private final Object leaseInfoLock = new Object();
 
     /**
      * Constructor.
@@ -128,13 +131,13 @@ public class PersistentPageMemoryMvPartitionStorage extends AbstractPageMemoryMv
 
         checkpointManager.addCheckpointListener(checkpointListener = new CheckpointListener() {
             @Override
-            public void beforeCheckpointBegin(CheckpointProgress progress, @Nullable Executor exec) throws IgniteInternalCheckedException {
+            public void beforeCheckpointBegin(CheckpointProgress progress, @Nullable Executor exec) {
                 // It may take some time, it's not scary because we keep a read lock here.
                 syncMetadataOnCheckpoint(exec);
             }
 
             @Override
-            public void onMarkCheckpointBegin(CheckpointProgress progress, @Nullable Executor exec) throws IgniteInternalCheckedException {
+            public void onMarkCheckpointBegin(CheckpointProgress progress, @Nullable Executor exec) {
                 // Should be fast, because here we only need to save the delta, reduce write lock holding time.
                 syncMetadataOnCheckpoint(exec);
             }
@@ -146,6 +149,8 @@ public class PersistentPageMemoryMvPartitionStorage extends AbstractPageMemoryMv
                 tableStorage.getTableId(),
                 partitionId
         );
+
+        leaseInfo = leaseInfoFromMeta();
     }
 
     @Override
@@ -311,102 +316,79 @@ public class PersistentPageMemoryMvPartitionStorage extends AbstractPageMemoryMv
     }
 
     @Override
-    public void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
+    public void updateLease(LeaseInfo leaseInfo) {
         busy(() -> {
             throwExceptionIfStorageNotInRunnableState();
 
-            updateLeaseBusy(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+            updateLeaseBusy(leaseInfo);
 
             return null;
         });
     }
 
-    private void updateLeaseBusy(long leaseStartTime, UUID primaryReplicaNodeId, String primaryReplicaNodeName) {
+    private void updateLeaseBusy(LeaseInfo leaseInfo) {
         updateMeta((lastCheckpointId, meta) -> {
-            primaryReplicaMetaReadWriteLock.writeLock().lock();
-
-            try {
-                if (leaseStartTime <= meta.leaseStartTime()) {
+            synchronized (leaseInfoLock) {
+                if (leaseInfo.leaseStartTime() <= meta.leaseStartTime()) {
                     return;
                 }
 
-                meta.primaryReplicaNodeId(lastCheckpointId, primaryReplicaNodeId);
+                try {
+                    byte[] primaryReplicaNodeNameBytes = stringToBytes(leaseInfo.primaryReplicaNodeName());
 
-                if (meta.primaryReplicaNodeNameFirstPageId() == BlobStorage.NO_PAGE_ID) {
-                    long primaryReplicaNodeNameFirstPageId = blobStorage.addBlob(stringToBytes(primaryReplicaNodeName));
+                    if (meta.primaryReplicaNodeNameFirstPageId() == BlobStorage.NO_PAGE_ID) {
+                        long primaryReplicaNodeNameFirstPageId = blobStorage.addBlob(primaryReplicaNodeNameBytes);
 
-                    meta.primaryReplicaNodeNameFirstPageId(lastCheckpointId, primaryReplicaNodeNameFirstPageId);
-                } else {
-                    blobStorage.updateBlob(meta.primaryReplicaNodeNameFirstPageId(), stringToBytes(primaryReplicaNodeName));
-                }
+                        meta.primaryReplicaNodeNameFirstPageId(lastCheckpointId, primaryReplicaNodeNameFirstPageId);
+                    } else {
+                        blobStorage.updateBlob(meta.primaryReplicaNodeNameFirstPageId(), primaryReplicaNodeNameBytes);
+                    }
 
-                meta.updateLease(lastCheckpointId, leaseStartTime);
+                    meta.primaryReplicaNodeId(lastCheckpointId, leaseInfo.primaryReplicaNodeId());
+                    meta.updateLease(lastCheckpointId, leaseInfo.leaseStartTime());
+                } catch (IgniteInternalCheckedException e) {
+                    throw new StorageException(
+                            "Cannot save lease meta: [tableId={}, partitionId={}]",
+                            e,
+                            tableStorage.getTableId(), partitionId
+                    );
+                }
 
-                this.primaryReplicaNodeName = primaryReplicaNodeName;
-            } catch (IgniteInternalCheckedException e) {
-                throw new StorageException(
-                        "Cannot save lease meta: [tableId={}, partitionId={}]",
-                        e,
-                        tableStorage.getTableId(), partitionId
-                );
-            } finally {
-                primaryReplicaMetaReadWriteLock.writeLock().unlock();
+                this.leaseInfo = leaseInfo;
             }
         });
     }
 
     @Override
-    public long leaseStartTime() {
+    public @Nullable LeaseInfo leaseInfo() {
         return busy(() -> {
             throwExceptionIfStorageNotInRunnableState();
 
-            return meta.leaseStartTime();
+            return leaseInfo;
         });
     }
 
-    @Override
-    public @Nullable UUID primaryReplicaNodeId() {
-        return busy(() -> {
-            throwExceptionIfStorageNotInRunnableState();
-
-            return meta.primaryReplicaNodeId();
-        });
-    }
+    private @Nullable LeaseInfo leaseInfoFromMeta() {
+        long primaryReplicaNodeNameFirstPageId = meta.primaryReplicaNodeNameFirstPageId();
 
-    @Override
-    public @Nullable String primaryReplicaNodeName() {
-        return busy(() -> {
-            throwExceptionIfStorageNotInRunnableState();
-
-            primaryReplicaMetaReadWriteLock.readLock().lock();
-
-            try {
-                if (primaryReplicaNodeName == null) {
-                    long primaryReplicaNodeNameFirstPageId = meta.primaryReplicaNodeNameFirstPageId();
-
-                    // It's possible to face BlobStorage.NO_PAGE_ID if a lease information has not yet been recorded in storage,
-                    // for example, if the lease itself has not yet been elected.
-                    if (primaryReplicaNodeNameFirstPageId != BlobStorage.NO_PAGE_ID) {
-                        primaryReplicaNodeName = ByteUtils.stringFromBytes(blobStorage.readBlob(primaryReplicaNodeNameFirstPageId));
-                    }
-                }
+        // It's possible to face BlobStorage.NO_PAGE_ID if a lease information has not yet been recorded in storage,
+        // for example, if the lease itself has not yet been elected.
+        if (primaryReplicaNodeNameFirstPageId == BlobStorage.NO_PAGE_ID) {
+            return null;
+        }
 
-                return primaryReplicaNodeName;
+        String primaryReplicaNodeName;
+        try {
+            primaryReplicaNodeName = ByteUtils.stringFromBytes(blobStorage.readBlob(primaryReplicaNodeNameFirstPageId));
+        } catch (IgniteInternalCheckedException e) {
+            throw new StorageException(
+                    "Failed to read primary replica node name: [tableId={}, partitionId={}]",
+                    e,
+                    tableStorage.getTableId(), partitionId
+            );
+        }
 
-            } catch (IgniteInternalCheckedException e) {
-                throw new StorageException(
-                        "Failed to read primary replica node name: [tableId={}, partitionId={}]",
-                        e,
-                        tableStorage.getTableId(), partitionId
-                );
-            } finally {
-                primaryReplicaMetaReadWriteLock.readLock().unlock();
-            }
-        });
+        return new LeaseInfo(meta.leaseStartTime(), meta.primaryReplicaNodeId(), primaryReplicaNodeName);
     }
 
     private void committedGroupConfigurationBusy(byte[] groupConfigBytes) {
@@ -538,10 +520,10 @@ public class PersistentPageMemoryMvPartitionStorage extends AbstractPageMemoryMv
     }
 
     @Override
-    public void updateLeaseOnRebalance(long leaseStartTime, UUID primaryReplicaNodeId, String primaryReplicaNodeName) {
+    public void updateLeaseOnRebalance(LeaseInfo leaseInfo) {
         throwExceptionIfStorageNotInProgressOfRebalance(state.get(), this::createStorageInfo);
 
-        updateLeaseBusy(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+        updateLeaseBusy(leaseInfo);
     }
 
     private void saveFreeListMetadataBusy(RenewablePartitionStorageState localState) {
diff --git a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorage.java b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorage.java
index a65ef9f2f84..f5ffe38b42e 100644
--- a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorage.java
+++ b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorage.java
@@ -25,7 +25,6 @@ import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFu
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
@@ -42,6 +41,7 @@ import org.apache.ignite.internal.pagememory.util.GradualTaskExecutor;
 import org.apache.ignite.internal.pagememory.util.PageIdUtils;
 import org.apache.ignite.internal.storage.MvPartitionStorage;
 import org.apache.ignite.internal.storage.StorageException;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine;
 import org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryTableStorage;
 import org.apache.ignite.internal.storage.pagememory.index.meta.IndexMetaTree;
@@ -66,14 +66,8 @@ public class VolatilePageMemoryMvPartitionStorage extends AbstractPageMemoryMvPa
     /** Last applied term value. */
     private volatile long lastAppliedTerm;
 
-    /** Lease start time. */
-    private volatile long leaseStartTime;
-
-    /** Primary replica node id. */
-    private volatile UUID primaryReplicaNodeId;
-
-    /** Primary replica node name. */
-    private volatile String primaryReplicaNodeName;
+    @Nullable
+    private volatile LeaseInfo leaseInfo;
 
     /** Last group configuration. */
     private volatile byte @Nullable [] groupConfig;
@@ -204,54 +198,28 @@ public class VolatilePageMemoryMvPartitionStorage extends AbstractPageMemoryMvPa
     }
 
     @Override
-    public void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
+    public void updateLease(LeaseInfo leaseInfo) {
         busy(() -> {
             throwExceptionIfStorageNotInRunnableState();
 
-            if (leaseStartTime <= this.leaseStartTime) {
+            LeaseInfo thisLeaseInfo = this.leaseInfo;
+
+            if (thisLeaseInfo != null && leaseInfo.leaseStartTime() <= thisLeaseInfo.leaseStartTime()) {
                 return null;
             }
 
-            updateLeaseBusy(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+            this.leaseInfo = leaseInfo;
 
             return null;
         });
     }
 
-    private void updateLeaseBusy(long leaseStartTime, UUID primaryReplicaNodeId, String primaryReplicaNodeName) {
-        this.leaseStartTime = leaseStartTime;
-        this.primaryReplicaNodeId = primaryReplicaNodeId;
-        this.primaryReplicaNodeName = primaryReplicaNodeName;
-    }
-
-    @Override
-    public long leaseStartTime() {
-        return busy(() -> {
-            throwExceptionIfStorageNotInRunnableState();
-
-            return leaseStartTime;
-        });
-    }
-
-    @Override
-    public @Nullable UUID primaryReplicaNodeId() {
-        return busy(() -> {
-            throwExceptionIfStorageNotInRunnableState();
-
-            return primaryReplicaNodeId;
-        });
-    }
-
     @Override
-    public @Nullable String primaryReplicaNodeName() {
+    public @Nullable LeaseInfo leaseInfo() {
         return busy(() -> {
             throwExceptionIfStorageNotInRunnableState();
 
-            return primaryReplicaNodeName;
+            return leaseInfo;
         });
     }
 
@@ -279,7 +247,7 @@ public class VolatilePageMemoryMvPartitionStorage extends AbstractPageMemoryMvPa
         lastAppliedIndex = 0;
         lastAppliedTerm = 0;
         groupConfig = null;
-        leaseStartTime = HybridTimestamp.MIN_VALUE.longValue();
+        leaseInfo = null;
 
         return destroyFuture;
     }
@@ -396,10 +364,10 @@ public class VolatilePageMemoryMvPartitionStorage extends AbstractPageMemoryMvPa
     }
 
     @Override
-    public void updateLeaseOnRebalance(long leaseStartTime, UUID primaryReplicaNodeId, String primaryReplicaNodeName) {
+    public void updateLeaseOnRebalance(LeaseInfo leaseInfo) {
         throwExceptionIfStorageNotInProgressOfRebalance(state.get(), this::createStorageInfo);
 
-        updateLeaseBusy(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+        this.leaseInfo = leaseInfo;
     }
 
     @Override
diff --git a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
index 47786cc16f7..63a07b17a0b 100644
--- a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
+++ b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorage.java
@@ -200,14 +200,9 @@ public class RocksDbMvPartitionStorage implements MvPartitionStorage {
     /** On-heap-cached last applied term value. */
     private volatile long lastAppliedTerm;
 
-    /** On-heap-cached lease start time value. */
-    private volatile long leaseStartTime;
-
-    /** On-heap-cached lease node id. */
-    private volatile UUID primaryReplicaNodeId;
-
-    /** On-heap-cached lease node name. */
-    private volatile String primaryReplicaNodeName;
+    /** On-heap-cached lease info. */
+    @Nullable
+    private volatile LeaseInfo leaseInfo;
 
     /** On-heap-cached last committed group configuration. */
     private volatile byte @Nullable [] lastGroupConfig;
@@ -254,14 +249,8 @@ public class RocksDbMvPartitionStorage implements MvPartitionStorage {
 
             byte[] leaseBytes = db.get(meta, readOpts, leaseKey);
 
-            if (leaseBytes == null) {
-                leaseStartTime = HybridTimestamp.MIN_VALUE.longValue();
-            } else {
-                LeaseInfo leaseInfo = VersionedSerialization.fromBytes(leaseBytes, LeaseInfoSerializer.INSTANCE);
-
-                leaseStartTime = leaseInfo.leaseStartTime();
-                primaryReplicaNodeId = leaseInfo.primaryReplicaNodeId();
-                primaryReplicaNodeName = leaseInfo.primaryReplicaNodeName();
+            if (leaseBytes != null) {
+                this.leaseInfo = VersionedSerialization.fromBytes(leaseBytes, LeaseInfoSerializer.INSTANCE);
             }
 
             byte[] estimatedSizeBytes = db.get(meta, readOpts, estimatedSizeKey);
@@ -1096,24 +1085,21 @@ public class RocksDbMvPartitionStorage implements MvPartitionStorage {
     }
 
     @Override
-    public void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
+    public void updateLease(LeaseInfo leaseInfo) {
         busy(() -> {
-            if (leaseStartTime <= this.leaseStartTime) {
+            LeaseInfo thisLeaseInfo = this.leaseInfo;
+
+            if (thisLeaseInfo != null && leaseInfo.leaseStartTime() <= thisLeaseInfo.leaseStartTime()) {
                 return null;
             }
 
-            saveLease(requireWriteBatch(), leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+            saveLease(requireWriteBatch(), leaseInfo);
 
             return null;
         });
     }
 
-    private void saveLease(AbstractWriteBatch writeBatch, long leaseStartTime, UUID primaryReplicaNodeId, String primaryReplicaNodeName) {
-        LeaseInfo leaseInfo = new LeaseInfo(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+    private void saveLease(AbstractWriteBatch writeBatch, LeaseInfo leaseInfo) {
         byte[] bytes = VersionedSerialization.toBytes(leaseInfo, LeaseInfoSerializer.INSTANCE);
 
         try {
@@ -1122,24 +1108,12 @@ public class RocksDbMvPartitionStorage implements MvPartitionStorage {
             throw new IgniteRocksDbException(e);
         }
 
-        this.leaseStartTime = leaseStartTime;
-        this.primaryReplicaNodeId = primaryReplicaNodeId;
-        this.primaryReplicaNodeName = primaryReplicaNodeName;
+        this.leaseInfo = leaseInfo;
     }
 
     @Override
-    public long leaseStartTime() {
-        return busy(() -> leaseStartTime);
-    }
-
-    @Override
-    public @Nullable UUID primaryReplicaNodeId() {
-        return busy(() -> primaryReplicaNodeId);
-    }
-
-    @Override
-    public @Nullable String primaryReplicaNodeName() {
-        return busy(() -> primaryReplicaNodeName);
+    public @Nullable LeaseInfo leaseInfo() {
+        return leaseInfo;
     }
 
     /**
@@ -1649,15 +1623,10 @@ public class RocksDbMvPartitionStorage implements MvPartitionStorage {
 
             saveGroupConfigurationOnRebalance(writeBatch, partitionMeta.groupConfig());
 
-            if (partitionMeta.primaryReplicaNodeId() != null) {
-                assert partitionMeta.primaryReplicaNodeName() != null;
+            LeaseInfo leaseInfo = partitionMeta.leaseInfo();
 
-                updateLeaseOnRebalance(
-                        writeBatch,
-                        partitionMeta.leaseStartTime(),
-                        partitionMeta.primaryReplicaNodeId(),
-                        partitionMeta.primaryReplicaNodeName()
-                );
+            if (leaseInfo != null) {
+                saveLease(writeBatch, leaseInfo);
             }
         } catch (RocksDBException e) {
             throw new StorageRebalanceException("Error when trying to abort rebalancing storage: " + createStorageInfo(), e);
@@ -1693,19 +1662,6 @@ public class RocksDbMvPartitionStorage implements MvPartitionStorage {
         this.lastGroupConfig = config.clone();
     }
 
-    private void updateLeaseOnRebalance(
-            WriteBatch writeBatch,
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
-        saveLease(writeBatch, leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
-
-        this.leaseStartTime = leaseStartTime;
-        this.primaryReplicaNodeId = primaryReplicaNodeId;
-        this.primaryReplicaNodeName = primaryReplicaNodeName;
-    }
-
     /**
      * Prepares the storage for cleanup.
      *
diff --git a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
index 9bada3cb6d4..ce951e4ff8b 100644
--- a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
+++ b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.configurations.StorageConfiguration;
 import org.apache.ignite.internal.storage.engine.MvTableStorage;
 import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
 import org.apache.ignite.internal.testframework.InjectExecutorService;
 import org.apache.ignite.internal.testframework.WorkDirectory;
@@ -142,14 +143,13 @@ public class RocksDbMvTableStorageTest extends AbstractMvTableStorageTest {
         MvPartitionStorage partitionStorage0 = getOrCreateMvPartition(PARTITION_ID);
 
         RowId rowId0 = new RowId(PARTITION_ID);
-        long leaseStartTime = 1234567;
-        UUID primaryReplicaNodeId = UUID.randomUUID();
-        String primaryReplicaNodeName = primaryReplicaNodeId + "name";
+
+        var leaseInfo = new LeaseInfo(1234567, UUID.randomUUID(), "name");
 
         partitionStorage0.runConsistently(locker -> {
             locker.lock(rowId0);
 
-            partitionStorage0.updateLease(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
+            partitionStorage0.updateLease(leaseInfo);
             return partitionStorage0.addWrite(rowId0, testData, txId, COMMIT_TABLE_ID, 0);
         });
 
@@ -166,9 +166,7 @@ public class RocksDbMvTableStorageTest extends AbstractMvTableStorageTest {
         assertThat(unwrap(tableStorage.getMvPartition(PARTITION_ID).read(rowId0, HybridTimestamp.MAX_VALUE).binaryRow()),
                 is(equalTo(unwrap(testData))));
 
-        assertEquals(leaseStartTime, tableStorage.getMvPartition(PARTITION_ID).leaseStartTime());
-        assertEquals(primaryReplicaNodeId, tableStorage.getMvPartition(PARTITION_ID).primaryReplicaNodeId());
-        assertEquals(primaryReplicaNodeName, tableStorage.getMvPartition(PARTITION_ID).primaryReplicaNodeName());
+        assertEquals(leaseInfo, tableStorage.getMvPartition(PARTITION_ID).leaseInfo());
     }
 
     @Test
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
index ac5271fe5ed..e1c906599f0 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
@@ -308,7 +308,7 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
             }
 
             if (leaseInfo != null) {
-                storage.updateLease(leaseInfo.leaseStartTime(), leaseInfo.primaryReplicaNodeId(), leaseInfo.primaryReplicaNodeName());
+                storage.updateLease(leaseInfo);
             }
 
             storage.lastApplied(lastAppliedIndex, lastAppliedTerm);
@@ -341,24 +341,29 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
             return EMPTY_NOT_APPLIED_RESULT; // Update result is not needed.
         }
 
+        LeaseInfo storageLeaseInfo = storage.leaseInfo();
+
         if (cmd.leaseStartTime() != null) {
             long leaseStartTime = cmd.leaseStartTime();
 
-            long storageLeaseStartTime = storage.leaseStartTime();
+            if (storageLeaseInfo == null || leaseStartTime != storageLeaseInfo.leaseStartTime()) {
+                var updateCommandResult = new UpdateCommandResult(
+                        false,
+                        storageLeaseInfo == null ? 0 : storageLeaseInfo.leaseStartTime(),
+                        isPrimaryInGroupTopology(storageLeaseInfo),
+                        NULL_HYBRID_TIMESTAMP
+                );
 
-            if (leaseStartTime != storageLeaseStartTime) {
-                return new CommandResult(
-                        new UpdateCommandResult(false, storageLeaseStartTime, isPrimaryInGroupTopology(), NULL_HYBRID_TIMESTAMP),
-                        false);
+                return new CommandResult(updateCommandResult, false);
             }
         }
 
         UUID txId = cmd.txId();
 
-        assert storage.primaryReplicaNodeId() != null;
+        assert storageLeaseInfo != null;
         assert localNodeId != null;
 
-        if (cmd.full() || !localNodeId.equals(storage.primaryReplicaNodeId())) {
+        if (cmd.full() || !localNodeId.equals(storageLeaseInfo.primaryReplicaNodeId())) {
             storageUpdateHandler.handleUpdate(
                     txId,
                     cmd.rowUuid(),
@@ -380,7 +385,10 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
 
         replicaTouch(txId, cmd.txCoordinatorId(), cmd.full() ? safeTimestamp : null, cmd.full());
 
-        return new CommandResult(new UpdateCommandResult(true, isPrimaryInGroupTopology(), safeTimestamp.longValue()), true);
+        return new CommandResult(
+                new UpdateCommandResult(true, isPrimaryInGroupTopology(storageLeaseInfo), safeTimestamp.longValue()),
+                true
+        );
     }
 
     /**
@@ -402,21 +410,26 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
             return EMPTY_NOT_APPLIED_RESULT;
         }
 
+        LeaseInfo storageLeaseInfo = storage.leaseInfo();
+
         if (cmd.leaseStartTime() != null) {
             long leaseStartTime = cmd.leaseStartTime();
 
-            long storageLeaseStartTime = storage.leaseStartTime();
+            if (storageLeaseInfo == null || leaseStartTime != storageLeaseInfo.leaseStartTime()) {
+                var updateCommandResult = new UpdateCommandResult(
+                        false,
+                        storageLeaseInfo == null ? 0 : storageLeaseInfo.leaseStartTime(),
+                        isPrimaryInGroupTopology(storageLeaseInfo),
+                        NULL_HYBRID_TIMESTAMP
+                );
 
-            if (leaseStartTime != storageLeaseStartTime) {
-                return new CommandResult(
-                        new UpdateCommandResult(false, storageLeaseStartTime, isPrimaryInGroupTopology(), NULL_HYBRID_TIMESTAMP),
-                        false);
+                return new CommandResult(updateCommandResult, false);
             }
         }
 
         UUID txId = cmd.txId();
 
-        if (cmd.full() || !localNodeId.equals(storage.primaryReplicaNodeId())) {
+        if (cmd.full() || !localNodeId.equals(storageLeaseInfo.primaryReplicaNodeId())) {
             storageUpdateHandler.handleUpdateAll(
                     txId,
                     cmd.rowsToUpdate(),
@@ -436,7 +449,10 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
 
         replicaTouch(txId, cmd.txCoordinatorId(), cmd.full() ? safeTimestamp : null, cmd.full());
 
-        return new CommandResult(new UpdateCommandResult(true, isPrimaryInGroupTopology(), safeTimestamp.longValue()), true);
+        return new CommandResult(
+                new UpdateCommandResult(true, isPrimaryInGroupTopology(storageLeaseInfo), safeTimestamp.longValue()),
+                true
+        );
     }
 
     /**
@@ -623,7 +639,9 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
         }
 
         storage.runConsistently(locker -> {
-            storage.updateLease(cmd.leaseStartTime(), cmd.primaryReplicaNodeId(), cmd.primaryReplicaNodeName());
+            var leaseInfo = new LeaseInfo(cmd.leaseStartTime(), cmd.primaryReplicaNodeId(), cmd.primaryReplicaNodeName());
+
+            storage.updateLease(leaseInfo);
 
             storage.lastApplied(commandIndex, commandTerm);
 
@@ -662,20 +680,14 @@ public class PartitionListener implements RaftGroupListener, RaftTableProcessor
      * primaryReplicaNodeName and leaseStartTime. In Update(All)Command  handling, which occurs strictly after PrimaryReplicaChangeCommand
      * processing, given information is used in order to detect whether primary belongs to the raft group topology (peers and learners).
      *
-     *
      * @return {@code true} if primary replica belongs to the raft group topology: peers and learners, (@code false) otherwise.
      */
-    private boolean isPrimaryInGroupTopology() {
+    private boolean isPrimaryInGroupTopology(@Nullable LeaseInfo storageLeaseInfo) {
         assert currentGroupTopology != null : "Current group topology is null";
 
-        if (storage.primaryReplicaNodeName() == null) {
-            return true;
-        } else {
-            // Despite the fact that storage.primaryReplicaNodeName() may itself return null it's never expected to happen
-            // while calling isPrimaryInGroupTopology because of HB between handlePrimaryReplicaChangeCommand that will populate the storage
-            // with lease information and handleUpdate(All)Command that on it's turn calls isPrimaryReplicaInGroupTopology.
-            assert storage.primaryReplicaNodeName() != null : "Primary replica node name is null.";
-            return currentGroupTopology.contains(storage.primaryReplicaNodeName());
-        }
+        // Despite the fact that storage.leaseInfo() may itself return null it's never expected to happen
+        // while calling isPrimaryInGroupTopology because of HB between handlePrimaryReplicaChangeCommand that will populate the storage
+        // with lease information and handleUpdate(All)Command that on it's turn calls isPrimaryReplicaInGroupTopology.
+        return storageLeaseInfo == null || currentGroupTopology.contains(storageLeaseInfo.primaryReplicaNodeName());
     }
 }
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
index 85f1683d3d9..fcf11094e77 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionMvStorageAccessImpl.java
@@ -30,7 +30,6 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.lang.IgniteStringFormatter;
 import org.apache.ignite.internal.lowwatermark.LowWatermark;
 import org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
-import org.apache.ignite.internal.partition.replicator.raft.snapshot.RaftSnapshotPartitionMeta;
 import org.apache.ignite.internal.raft.RaftGroupConfiguration;
 import org.apache.ignite.internal.raft.RaftGroupConfigurationConverter;
 import org.apache.ignite.internal.replicator.TablePartitionId;
@@ -40,7 +39,9 @@ import org.apache.ignite.internal.schema.SchemaRegistry;
 import org.apache.ignite.internal.storage.MvPartitionStorage;
 import org.apache.ignite.internal.storage.ReadResult;
 import org.apache.ignite.internal.storage.RowId;
+import org.apache.ignite.internal.storage.engine.MvPartitionMeta;
 import org.apache.ignite.internal.storage.engine.MvTableStorage;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.table.distributed.gc.GcUpdateHandler;
 import org.apache.ignite.internal.table.distributed.gc.MvGc;
 import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
@@ -202,18 +203,8 @@ public class PartitionMvStorageAccessImpl implements PartitionMvStorageAccess {
     }
 
     @Override
-    public long leaseStartTime() {
-        return getMvPartitionStorage().leaseStartTime();
-    }
-
-    @Override
-    public @Nullable UUID primaryReplicaNodeId() {
-        return getMvPartitionStorage().primaryReplicaNodeId();
-    }
-
-    @Override
-    public @Nullable String primaryReplicaNodeName() {
-        return getMvPartitionStorage().primaryReplicaNodeName();
+    public @Nullable LeaseInfo leaseInfo() {
+        return getMvPartitionStorage().leaseInfo();
     }
 
     @Override
@@ -229,8 +220,8 @@ public class PartitionMvStorageAccessImpl implements PartitionMvStorageAccess {
     }
 
     @Override
-    public CompletableFuture<Void> finishRebalance(RaftSnapshotPartitionMeta partitionMeta) {
-        return mvTableStorage.finishRebalancePartition(partitionId(), partitionMeta.toMvPartitionMeta(partitionMeta.raftGroupConfig()))
+    public CompletableFuture<Void> finishRebalance(MvPartitionMeta partitionMeta) {
+        return mvTableStorage.finishRebalancePartition(partitionId(), partitionMeta)
                 .thenAccept(unused -> mvGc.addStorage(tablePartitionId(), gcUpdateHandler));
     }
 
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
index c73c6bd897c..1bd63428361 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.TxIdMismatchException;
 import org.apache.ignite.internal.storage.gc.GcEntry;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.util.Cursor;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -227,26 +228,12 @@ public class SnapshotAwarePartitionDataStorage implements PartitionDataStorage {
     }
 
     @Override
-    public void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
-        partitionStorage.updateLease(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
-    }
-
-    @Override
-    public long leaseStartTime() {
-        return partitionStorage.leaseStartTime();
-    }
-
-    @Override
-    public UUID primaryReplicaNodeId() {
-        return partitionStorage.primaryReplicaNodeId();
+    public void updateLease(LeaseInfo leaseInfo) {
+        partitionStorage.updateLease(leaseInfo);
     }
 
     @Override
-    public String primaryReplicaNodeName() {
-        return partitionStorage.primaryReplicaNodeName();
+    public @Nullable LeaseInfo leaseInfo() {
+        return partitionStorage.leaseInfo();
     }
 }
diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
index a4d05284414..52a01c35a97 100644
--- a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
+++ b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/TestPartitionDataStorage.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.TxIdMismatchException;
 import org.apache.ignite.internal.storage.gc.GcEntry;
+import org.apache.ignite.internal.storage.lease.LeaseInfo;
 import org.apache.ignite.internal.util.Cursor;
 import org.jetbrains.annotations.Nullable;
 
@@ -159,26 +160,12 @@ public class TestPartitionDataStorage implements PartitionDataStorage {
     }
 
     @Override
-    public void updateLease(
-            long leaseStartTime,
-            UUID primaryReplicaNodeId,
-            String primaryReplicaNodeName
-    ) {
-        partitionStorage.updateLease(leaseStartTime, primaryReplicaNodeId, primaryReplicaNodeName);
-    }
-
-    @Override
-    public long leaseStartTime() {
-        return partitionStorage.leaseStartTime();
-    }
-
-    @Override
-    public UUID primaryReplicaNodeId() {
-        return partitionStorage.primaryReplicaNodeId();
+    public void updateLease(LeaseInfo leaseInfo) {
+        partitionStorage.updateLease(leaseInfo);
     }
 
     @Override
-    public String primaryReplicaNodeName() {
-        return partitionStorage.primaryReplicaNodeName();
+    public @Nullable LeaseInfo leaseInfo() {
+        return partitionStorage.leaseInfo();
     }
 }
diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
index c3a3d06878e..0e2b7a77ce7 100644
--- a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
+++ b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TxAbstractTest.java
@@ -367,8 +367,8 @@ public abstract class TxAbstractTest extends TxInfrastructureTest {
                 IgniteTestUtils.getFieldValue(listener, PartitionReplicaListener.class, "safeTime");
 
         logger().info("Partition data "
-                        + "[node={}, groupId={}, data={}, lastAppliedIndex={}, lastAppliedTerm={}, leaseStartTime={}, safeTime = {}]",
-                name, replicationGroupId, map, storage.lastAppliedIndex(), storage.lastAppliedTerm(), storage.leaseStartTime(),
+                        + "[node={}, groupId={}, data={}, lastAppliedIndex={}, lastAppliedTerm={}, leaseInfo={}, safeTime = {}]",
+                name, replicationGroupId, map, storage.lastAppliedIndex(), storage.lastAppliedTerm(), storage.leaseInfo(),
                 safeTime.current());
 
         Lazy<TableSchemaAwareIndexStorage> indexStorageLazy =
diff --git a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbPartitionStorage.java b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbPartitionStorage.java
index e6f80b8868f..f0a86ccd29f 100644
--- a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbPartitionStorage.java
+++ b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbPartitionStorage.java
@@ -498,12 +498,10 @@ public class TxStateRocksDbPartitionStorage implements TxStatePartitionStorage {
 
             metaStorage.updateConfiguration(writeBatch, partitionMeta.groupConfig());
 
-            if (partitionMeta.primaryReplicaNodeId() != null) {
-                metaStorage.updateLease(writeBatch, new LeaseInfo(
-                        partitionMeta.leaseStartTime(),
-                        partitionMeta.primaryReplicaNodeId(),
-                        partitionMeta.primaryReplicaNodeName()
-                ));
+            LeaseInfo leaseInfo = partitionMeta.leaseInfo();
+
+            if (leaseInfo != null) {
+                metaStorage.updateLease(writeBatch, leaseInfo);
             }
 
             sharedStorage.db().write(sharedStorage.writeOptions, writeBatch);
diff --git a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStatePartitionStorageTest.java b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStatePartitionStorageTest.java
index 93c3fdf799d..565de45a07d 100644
--- a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStatePartitionStorageTest.java
+++ b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/AbstractTxStatePartitionStorageTest.java
@@ -407,13 +407,7 @@ public abstract class AbstractTxStatePartitionStorageTest extends BaseIgniteAbst
         assertThat(storage.finishRebalance(partitionMeta), willCompleteSuccessfully());
 
         // Let's check the storage.
-        var leaseInfo = new LeaseInfo(
-                partitionMeta.leaseStartTime(),
-                partitionMeta.primaryReplicaNodeId(),
-                partitionMeta.primaryReplicaNodeName()
-        );
-
-        checkMeta(storage, 30, 50, partitionMeta.groupConfig(), leaseInfo);
+        checkMeta(storage, 30, 50, partitionMeta.groupConfig(), partitionMeta.leaseInfo());
 
         checkStorageContainsRows(storage, rowsOnRebalance);
     }
@@ -523,15 +517,9 @@ public abstract class AbstractTxStatePartitionStorageTest extends BaseIgniteAbst
         assertThat(storage.lastAppliedIndex(), is(20L));
         assertThat(storage.lastAppliedTerm(), is(30L));
 
-        var leaseInfo = new LeaseInfo(
-                mvPartitionMeta.leaseStartTime(),
-                mvPartitionMeta.primaryReplicaNodeId(),
-                mvPartitionMeta.primaryReplicaNodeName()
-        );
+        storage.leaseInfo(mvPartitionMeta.leaseInfo(), 40, 50);
 
-        storage.leaseInfo(leaseInfo, 40, 50);
-
-        assertThat(storage.leaseInfo(), is(leaseInfo));
+        assertThat(storage.leaseInfo(), is(mvPartitionMeta.leaseInfo()));
         assertThat(storage.lastAppliedIndex(), is(40L));
         assertThat(storage.lastAppliedTerm(), is(50L));
     }
@@ -687,6 +675,11 @@ public abstract class AbstractTxStatePartitionStorageTest extends BaseIgniteAbst
     }
 
     private static MvPartitionMeta saneMvPartitionMeta(long lastAppliedIndex, long lastAppliedTerm, byte[] groupConfig) {
-        return new MvPartitionMeta(lastAppliedIndex, lastAppliedTerm, groupConfig, 333, new UUID(1, 2), "primary");
+        return new MvPartitionMeta(
+                lastAppliedIndex,
+                lastAppliedTerm,
+                groupConfig,
+                new LeaseInfo(333, new UUID(1, 2), "primary")
+        );
     }
 }
diff --git a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStatePartitionStorage.java b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStatePartitionStorage.java
index a616ee8b112..fe12a1ab813 100644
--- a/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStatePartitionStorage.java
+++ b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestTxStatePartitionStorage.java
@@ -260,14 +260,7 @@ public class TestTxStatePartitionStorage implements TxStatePartitionStorage {
                     lastAppliedIndex = partitionMeta.lastAppliedIndex();
                     lastAppliedTerm = partitionMeta.lastAppliedTerm();
                     config = partitionMeta.groupConfig();
-
-                    if (partitionMeta.primaryReplicaNodeId() != null) {
-                        leaseInfo = new LeaseInfo(
-                                partitionMeta.leaseStartTime(),
-                                partitionMeta.primaryReplicaNodeId(),
-                                partitionMeta.primaryReplicaNodeName()
-                        );
-                    }
+                    leaseInfo = partitionMeta.leaseInfo();
                 });
     }