[Java] Send appVersion in the NewLeadershipTerm.

Fixes #1671
real-logic · Nov 7, 2024 · 986bcbf · 986bcbf
1 parent b07b194
commit 986bcbf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java
@@ -892,6 +892,7 @@ else if (Cluster.Role.LEADER == role)
                     clusterClock.time(),
                     memberId,
                     logPublisher.sessionId(),
+                    ctx.appVersion(),
                     false);
             }
         }

diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusPublisher.java b/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusPublisher.java
@@ -181,6 +181,7 @@ void newLeadershipTerm(
         final long timestamp,
         final int leaderMemberId,
         final int logSessionId,
+        final int appVersion,
         final boolean isStartup)
     {
         if (null == publication)
@@ -214,6 +215,7 @@ void newLeadershipTerm(
                     .timestamp(timestamp)
                     .leaderMemberId(leaderMemberId)
                     .logSessionId(logSessionId)
+                    .appVersion(appVersion)
                     .isStartup(isStartup ? BooleanType.TRUE : BooleanType.FALSE);
 
                 bufferClaim.commit();

diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/Election.java b/aeron-cluster/src/main/java/io/aeron/cluster/Election.java
@@ -1202,6 +1202,7 @@ private void publishNewLeadershipTerm(
                 timestamp,
                 thisMember.id(),
                 logSessionId,
+                ctx.appVersion(),
                 isLeaderStartup);
         }
     }

diff --git a/aeron-cluster/src/test/java/io/aeron/cluster/ElectionTest.java b/aeron-cluster/src/test/java/io/aeron/cluster/ElectionTest.java
@@ -140,11 +140,12 @@ void shouldElectAppointedLeader()
     {
         final long leadershipTermId = NULL_VALUE;
         final long logPosition = 0;
+        final int appVersion = -98;
         final ClusterMember[] clusterMembers = prepareClusterMembers();
         final ClusterMember candidateMember = clusterMembers[0];
         when(consensusModuleAgent.logRecordingId()).thenReturn(RECORDING_ID);
 
-        ctx.appointedLeaderId(candidateMember.id());
+        ctx.appointedLeaderId(candidateMember.id()).appVersion(appVersion);
 
         final Election election = newElection(leadershipTermId, logPosition, clusterMembers, candidateMember);
 
@@ -203,6 +204,7 @@ void shouldElectAppointedLeader()
             clock.nanoTime(),
             candidateMember.id(),
             LOG_SESSION_ID,
+            appVersion,
             election.isLeaderStartup());
 
         verify(consensusPublisher).newLeadershipTerm(
@@ -218,6 +220,7 @@ void shouldElectAppointedLeader()
             clock.nanoTime(),
             candidateMember.id(),
             LOG_SESSION_ID,
+            appVersion,
             election.isLeaderStartup());
 
         when(recordingLog.isUnknown(candidateTermId)).thenReturn(Boolean.TRUE);
@@ -1381,6 +1384,8 @@ void leaderShouldMoveToLogReplicationThenWaitForCommitPosition()
         final ClusterMember liveFollower = clusterMembers[1];
         final int leaderId = thisMember.id();
         final int followerId = liveFollower.id();
+        final int appVersion = 888;
+        ctx.appVersion(appVersion);
 
         when(consensusModuleAgent.role()).thenReturn(Cluster.Role.LEADER);
         when(consensusModuleAgent.logRecordingId()).thenReturn(RECORDING_ID);
@@ -1444,6 +1449,7 @@ void leaderShouldMoveToLogReplicationThenWaitForCommitPosition()
             clock.nanoTime(),
             leaderId,
             LOG_SESSION_ID,
+            appVersion,
             election.isLeaderStartup());
 
         verify(consensusPublisher).newLeadershipTerm(
@@ -1459,6 +1465,7 @@ void leaderShouldMoveToLogReplicationThenWaitForCommitPosition()
             clock.nanoTime(),
             leaderId,
             LOG_SESSION_ID,
+            appVersion,
             election.isLeaderStartup());
 
         // Begin replay once a quorum of followers has caught up.