Fixed regression

dotnet · Jan 12, 2024 · 40b6f54 · 40b6f54
1 parent c3251a5
commit 40b6f54
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/...r/Net/Cluster/Consensus/Raft/TransportServices/ConnectionOriented/Client.AppendEntries.cs b/...r/Net/Cluster/Consensus/Raft/TransportServices/ConnectionOriented/Client.AppendEntries.cs
@@ -68,8 +68,6 @@ protected int WriteHeaders(ProtocolStream protocol, in ClusterMemberId sender, i
             writer.Write<AppendEntriesMessage>(new(sender, term, prevLogIndex, prevLogTerm, commitIndex, entriesCount));
             writer.Add(Unsafe.BitCast<bool, byte>(applyConfig));
             writer.Write<ConfigurationMessage>(new(config));
-            writer.WriteLittleEndian(config.Fingerprint);
-            writer.WriteLittleEndian(config.Length);
             return writer.WrittenCount;
         }
 

diff --git a/...et/Cluster/Consensus/Raft/TransportServices/ConnectionOriented/Server.LogEntryProducer.cs b/...et/Cluster/Consensus/Raft/TransportServices/ConnectionOriented/Server.LogEntryProducer.cs
@@ -33,6 +33,7 @@ internal ReceivedLogEntries(ProtocolStream stream, MemoryAllocator<byte> allocat
             applyConfig = Unsafe.BitCast<byte, bool>(reader.Read());
 
             var (fingerprint, configLength) = reader.Read<ConfigurationMessage>();
+            stream.AdvanceReadCursor(reader.ConsumedCount);
 
             Configuration = configLength > 0L
                 ? new(allocator(int.CreateChecked(configLength)), fingerprint)

diff --git a/...ext.Net.Cluster/Net/Cluster/Consensus/Raft/TransportServices/ConnectionOriented/Server.cs b/...ext.Net.Cluster/Net/Cluster/Consensus/Raft/TransportServices/ConnectionOriented/Server.cs
@@ -7,7 +7,6 @@
 namespace DotNext.Net.Cluster.Consensus.Raft.TransportServices.ConnectionOriented;
 
 using Buffers;
-using IO;
 
 internal abstract partial class Server : Disposable, IServer
 {
@@ -132,8 +131,6 @@ private async ValueTask AppendEntriesAsync(ProtocolStream protocol, Cancellation
         await protocol.ReadAsync(AppendEntriesHeadersSize, token).ConfigureAwait(false);
         using (var entries = new ReceivedLogEntries(protocol, BufferAllocator, out var applyConfig, token))
         {
-            protocol.AdvanceReadCursor(AppendEntriesHeadersSize);
-
             // read configuration
             var configuration = entries.Configuration.Content;
             if (!configuration.IsEmpty)

diff --git a/...ster/DotNext.Net.Cluster/Net/Cluster/Consensus/Raft/TransportServices/LogEntryMetadata.cs b/...ster/DotNext.Net.Cluster/Net/Cluster/Consensus/Raft/TransportServices/LogEntryMetadata.cs
@@ -13,6 +13,7 @@ namespace DotNext.Net.Cluster.Consensus.Raft.TransportServices;
     private const byte IdentifierFlag = 0x01;
     private const byte SnapshotFlag = IdentifierFlag << 1;
 
+    internal readonly long Term;
     private readonly long length, timestamp;
     private readonly byte flags;
     private readonly int identifier;
@@ -50,8 +51,6 @@ static LogEntryMetadata IBinaryFormattable<LogEntryMetadata>.Parse(ReadOnlySpan<
 
     static int IBinaryFormattable<LogEntryMetadata>.Size => Size;
 
-    internal long Term { get; }
-
     internal DateTimeOffset Timestamp => new(timestamp, TimeSpan.Zero);
 
     internal long? Length => length >= 0L ? length : null;