From 658d6ff34f0cdf8b96f1ce7145cb921534900bed Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 3 Feb 2025 14:21:31 +0100 Subject: [PATCH] Rename persistInfo() to setAndStoreInfo() This is a more descriptive name and will pair nicely with future evolution. JIRA: CONTROLLER-2133 Change-Id: If10eb078f9644644548cf697b64c880ee650e9dd Signed-off-by: Robert Varga --- .../controller/cluster/raft/PersistenceTermInfoStore.java | 2 +- .../controller/cluster/raft/RaftActorContext.java | 2 +- .../controller/cluster/raft/RaftActorContextImpl.java | 2 +- .../controller/cluster/raft/spi/TermInfoStore.java | 4 ++-- .../controller/cluster/raft/PersistenceTermInfoStoreTest.java | 2 +- .../controller/cluster/raft/spi/FailingTermInfoStore.java | 2 +- .../controller/cluster/raft/spi/TestTermInfoStore.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStore.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStore.java index bcb120d736..cb82dc038c 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStore.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStore.java @@ -45,7 +45,7 @@ final class PersistenceTermInfoStore implements TermInfoStore { } @Override - public void persistTerm(final TermInfo newTerm) { + public void storeAndSetTerm(final TermInfo newTerm) { setTerm(newTerm); // FIXME : Maybe first persist then update the state persistence.persist(new UpdateElectionTerm(newTerm), NoopProcedure.instance()); diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContext.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContext.java index 5f99ad99e7..b1ce0be884 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContext.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContext.java @@ -111,7 +111,7 @@ public interface RaftActorContext { * Sets and persists a {@link TermInfo}, so that {@link #termInfo()} returns it, even if we undergo recovery. * * @implSpec - * Implementations need to route this request to the underlying {@link TermInfoStore#persistTerm(TermInfo)}. + * Implementations need to route this request to the underlying {@link TermInfoStore#storeAndSetTerm(TermInfo)}. * * @param termInfo {@link TermInfo} to persist */ diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java index 01d71db30a..443f921d2a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java @@ -182,7 +182,7 @@ public class RaftActorContextImpl implements RaftActorContext { @Override public void persistTermInfo(final TermInfo newElectionInfo) { - termInformation.persistTerm(newElectionInfo); + termInformation.storeAndSetTerm(newElectionInfo); } @Override diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/spi/TermInfoStore.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/spi/TermInfoStore.java index 81ecbc4759..5e932069c5 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/spi/TermInfoStore.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/spi/TermInfoStore.java @@ -11,7 +11,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; /** * Storage for {@link TermInfo}. Provides access to current term and updates to it both transient, via - * {@link #setTerm(TermInfo)} and persistent, via {@link #persistTerm(TermInfo)}. + * {@link #setTerm(TermInfo)} and persistent, via {@link #storeAndSetTerm(TermInfo)}. */ @NonNullByDefault public interface TermInfoStore { @@ -37,5 +37,5 @@ public interface TermInfoStore { * * @param newTerm new {@link TermInfo} */ - void persistTerm(TermInfo newTerm); + void storeAndSetTerm(TermInfo newTerm); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStoreTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStoreTest.java index 88a6d7cafa..d81e9f9c87 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStoreTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/PersistenceTermInfoStoreTest.java @@ -40,7 +40,7 @@ class PersistenceTermInfoStoreTest { void testUpdateAndPersist() throws Exception { final var impl = new PersistenceTermInfoStore(mockPersistence, "test"); final var termInfo = new TermInfo(10, "member-1"); - impl.persistTerm(termInfo); + impl.storeAndSetTerm(termInfo); assertEquals(termInfo, impl.currentTerm()); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/FailingTermInfoStore.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/FailingTermInfoStore.java index a0f3183633..c93a9c7862 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/FailingTermInfoStore.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/FailingTermInfoStore.java @@ -16,7 +16,7 @@ public final class FailingTermInfoStore extends AbstractTermInfoStore { } @Override - public void persistTerm(final TermInfo newTerm) { + public void storeAndSetTerm(final TermInfo newTerm) { throw new UnsupportedOperationException(); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/TestTermInfoStore.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/TestTermInfoStore.java index f216e311e3..3b0e101050 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/TestTermInfoStore.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/spi/TestTermInfoStore.java @@ -21,7 +21,7 @@ public final class TestTermInfoStore extends AbstractTermInfoStore { } @Override - public void persistTerm(final TermInfo newElectionInfo) { + public void storeAndSetTerm(final TermInfo newElectionInfo) { setTerm(newElectionInfo); } } -- 2.36.6