From e96021b2e492bbaf7efe0804628bfe055b9733f7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 22 Oct 2020 20:10:01 +0200 Subject: [PATCH] Log replicated log dataSize changes This is a bit of critical state, make sure we recalculate it atomically and log its changes. JIRA: CONTROLLER-1957 Change-Id: I09532384ce5bbaf7218c0ffdb64799541037fafc Signed-off-by: Robert Varga --- .../cluster/raft/AbstractReplicatedLogImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImpl.java index 2662d7151c..42af1502ee 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImpl.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/AbstractReplicatedLogImpl.java @@ -260,12 +260,14 @@ public abstract class AbstractReplicatedLogImpl implements ReplicatedLog { snapshottedJournal = null; previousSnapshotIndex = -1; previousSnapshotTerm = -1; - dataSize = 0; + // need to recalc the datasize based on the entries left after precommit. + int newDataSize = 0; for (ReplicatedLogEntry logEntry : journal) { - dataSize += logEntry.size(); + newDataSize += logEntry.size(); } - + LOG.trace("{}: Updated dataSize from {} to {}", logContext, dataSize, newDataSize); + dataSize = newDataSize; } @Override -- 2.36.6