From ba35d0a761639e3e5c0601a5dcafae00ff3f25e2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 28 Jan 2025 15:03:14 +0100 Subject: [PATCH] Acquire persistence provider once We have a few places where we call getPersistenceProvider() twice. Make things clearer by acquiring it only once. JIRA: CONTROLLER-2073 Change-Id: Ic4bc681140076396b5d3384b1a7386aa00ee3e8a Signed-off-by: Robert Varga --- .../controller/cluster/raft/ReplicatedLogImpl.java | 8 +++----- .../controller/cluster/raft/SnapshotManager.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java index 23cc068676..a354ed7172 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java @@ -98,20 +98,18 @@ final class ReplicatedLogImpl extends AbstractReplicatedLogImpl { @Override public boolean appendAndPersist(final ReplicatedLogEntry replicatedLogEntry, final Consumer callback, final boolean doAsync) { - context.getLogger().debug("{}: Append log entry and persist {} ", context.getId(), replicatedLogEntry); if (!append(replicatedLogEntry)) { return false; } + final var provider = context.getPersistenceProvider(); if (doAsync) { - context.getPersistenceProvider().persistAsync(replicatedLogEntry, - entry -> persistCallback(entry, callback)); + provider.persistAsync(replicatedLogEntry, entry -> persistCallback(entry, callback)); } else { - context.getPersistenceProvider().persist(replicatedLogEntry, entry -> syncPersistCallback(entry, callback)); + provider.persist(replicatedLogEntry, entry -> syncPersistCallback(entry, callback)); } - return true; } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java index 50e5d2ec1b..901fc9adc9 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java @@ -267,7 +267,7 @@ public class SnapshotManager implements SnapshotState { task = persisting; log.debug("lastSequenceNumber prior to persisting applied snapshot: {}", lastSeq); - context.getPersistenceProvider().saveSnapshot(persisting.snapshot); + persistence.saveSnapshot(persisting.snapshot); } @Override -- 2.36.6