From 98601410ab65abffb47b3226d9518afa92d0204e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 3 May 2024 23:34:07 +0200 Subject: [PATCH] Inline isServerConfigurationPayload() We can use an instanceof pattern to improve safety. Inline the check into its two callers. Change-Id: Ia3758a754713818587bf3c7cd215764d05c2028b Signed-off-by: Robert Varga --- .../raft/RaftActorRecoverySupport.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java index 389e8dfd8f..a63ff9a7b7 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java @@ -168,8 +168,8 @@ class RaftActorRecoverySupport { logEntry.getIndex(), logEntry.size()); } - if (isServerConfigurationPayload(logEntry)) { - context.updatePeerIds((ServerConfigurationPayload)logEntry.getData()); + if (logEntry.getData() instanceof ServerConfigurationPayload payload) { + context.updatePeerIds(payload); } if (isMigratedPayload(logEntry)) { @@ -234,17 +234,20 @@ class RaftActorRecoverySupport { private void batchRecoveredLogEntry(final ReplicatedLogEntry logEntry) { initRecoveryTimers(); + if (logEntry.getData() instanceof ServerConfigurationPayload) { + // FIXME: explain why ServerConfigurationPayload is special + return; + } + int batchSize = context.getConfigParams().getJournalRecoveryLogBatchSize(); - if (!isServerConfigurationPayload(logEntry)) { - if (currentRecoveryBatchCount == 0) { - cohort.startLogRecoveryBatch(batchSize); - } + if (currentRecoveryBatchCount == 0) { + cohort.startLogRecoveryBatch(batchSize); + } - cohort.appendRecoveredLogEntry(logEntry.getData()); + cohort.appendRecoveredLogEntry(logEntry.getData()); - if (++currentRecoveryBatchCount >= batchSize) { - endCurrentLogRecoveryBatch(); - } + if (++currentRecoveryBatchCount >= batchSize) { + endCurrentLogRecoveryBatch(); } } @@ -324,10 +327,6 @@ class RaftActorRecoverySupport { } } - private static boolean isServerConfigurationPayload(final ReplicatedLogEntry repLogEntry) { - return repLogEntry.getData() instanceof ServerConfigurationPayload; - } - private static boolean isPersistentPayload(final ReplicatedLogEntry repLogEntry) { return repLogEntry.getData() instanceof PersistentPayload; } -- 2.36.6