Merge branch 'v5.4' of github.com:ravendb/ravendb into v6.0

# Conflicts:
#	src/Voron/ValueReader.cs
#	test/RachisTests/BasicTests.cs

src/Raven.Server/Dashboard/Cluster/Notifications/MemoryUsageNotificationSender.cs

@@ -60,7 +60,8 @@ protected override AbstractClusterDashboardNotification CreateNotification()
                 DirtyMemory = dirtyMemoryState.TotalDirty.GetValue(SizeUnit.Bytes),
                 AvailableMemory = memoryInfo.AvailableMemory.GetValue(SizeUnit.Bytes),
                 AvailableMemoryForProcessing = memoryInfo.AvailableMemoryForProcessing.GetValue(SizeUnit.Bytes),
-                TotalSwapUsage = memoryInfo.TotalSwapUsage.GetValue(SizeUnit.Bytes)
+                TotalSwapUsage = memoryInfo.TotalSwapUsage.GetValue(SizeUnit.Bytes),
+                LuceneUnmanagedAllocations = NativeMemory.TotalLuceneUnmanagedAllocationsForSorting
             };
         }
     }

src/Raven.Server/Dashboard/Cluster/Notifications/MemoryUsagePayload.cs

@@ -26,6 +26,7 @@ public sealed class MemoryUsagePayload : AbstractClusterDashboardNotification
         public long AvailableMemory { get; set; }
         public long AvailableMemoryForProcessing { get; set; }
         public long TotalSwapUsage { get; set; }
+        public long LuceneUnmanagedAllocations { get; set; }
 
         public override ClusterDashboardNotificationType Type => ClusterDashboardNotificationType.MemoryUsage;
 
@@ -47,6 +48,7 @@ public override DynamicJsonValue ToJson()
             json[nameof(AvailableMemory)] = AvailableMemory;
             json[nameof(AvailableMemoryForProcessing)] = AvailableMemoryForProcessing;
             json[nameof(TotalSwapUsage)] = TotalSwapUsage;
+            json[nameof(LuceneUnmanagedAllocations)] = LuceneUnmanagedAllocations;
 
             return json;
         }

src/Raven.Server/Documents/ReplayTxCommandHelper.cs

@@ -50,7 +50,7 @@ internal static async IAsyncEnumerable<ReplayProgress> ReplayAsync(DocumentDatab
                 await using (var readersItr = readers.GetAsyncEnumerator())
                 {
                     await ReadStartRecordingDetailsAsync(readersItr, context, peepingTomStream);
-                    while (await readersItr.MoveNextAsync())
+                    while (await readersItr.MoveNextAsync().ConfigureAwait(true))
                     {
                         using (readersItr.Current)
                         {

src/Raven.Studio/typescript/models/resources/widgets/memoryUsage.ts

@@ -19,7 +19,8 @@ class memoryUsage extends historyAwareNodeStats<Raven.Server.Dashboard.Cluster.N
     systemCommitLimit = this.dataExtractor(x => x.SystemCommitLimit);
     totalSwapUsage = this.dataExtractor(x => x.TotalSwapUsage);
     totalSwap = this.dataExtractor(x => x.PhysicalMemory != null && x.SystemCommitLimit != null ? x.SystemCommitLimit - x.PhysicalMemory : undefined);
-
+    luceneUnmanagedAllocations = this.dataExtractor(x => x.LuceneUnmanagedAllocations);
+
     workingSetFormatted: KnockoutComputed<[string, string]>;
     machineMemoryUsage: KnockoutComputed<string>;
     machineMemoryUsagePercentage: KnockoutComputed<string>;

src/Raven.Studio/wwwroot/App/views/resources/widgets/memoryUsageWidget.html

@@ -36,6 +36,10 @@ <h4>RavenDB Memory usage</h4>
                                 <div class="details-item-name">Unmanaged Allocations</div>
                                 <div class="details-item-value" data-bind="text: sizeFormatter(unmanagedAllocations())"></div>
                             </div>
+                            <div class="details-item">
+                                <div class="details-item-name">Lucene Unmanaged Allocations</div>
+                                <div class="details-item-value" data-bind="text: sizeFormatter(luceneUnmanagedAllocations())"></div>
+                            </div>
                             <div class="details-item" data-bind="visible: showEncryptionBuffers">
                                 <div class="details-item-name">Encryption Buffers in Use</div>
                                 <div class="details-item-value" data-bind="text: sizeFormatter(encryptionBuffersInUse())"></div>

src/Voron/Impl/LowLevelTransaction.cs

@@ -953,8 +953,7 @@ public void Dispose()
             if (_txState.HasFlag(TxState.Disposed))
                 return;
 
-            if (Flags == TransactionFlags.ReadWrite && NativeMemory.CurrentThreadStats != CurrentTransactionHolder)
-                ThrowDisposeOfTxMustBeCalledOnTheSameThreadThatCreatedIt();
+            EnsureDisposeOfWriteTxIsOnTheSameThreadThatCreatedIt();
 
             try
             {
@@ -1358,11 +1357,16 @@ private static void ThrowAlreadyCommitted()
             throw new InvalidOperationException("Cannot commit already committed transaction.");
         }
 
-        private void ThrowDisposeOfTxMustBeCalledOnTheSameThreadThatCreatedIt()
+        [Conditional("DEBUG")]
+        private void EnsureDisposeOfWriteTxIsOnTheSameThreadThatCreatedIt()
         {
-            throw new InvalidOperationException($"Dispose of the transaction must be called from the same thread that created it. " +
-                                                $"Transaction {Id} (Flags: {Flags}) was created by {CurrentTransactionHolder.Name}, thread Id: {CurrentTransactionHolder.ManagedThreadId}. " +
-                                                $"The dispose was called from {NativeMemory.CurrentThreadStats.Name}, thread Id: {NativeMemory.CurrentThreadStats.ManagedThreadId}");
+            if (Flags == TransactionFlags.ReadWrite && NativeMemory.CurrentThreadStats != CurrentTransactionHolder)
+            {
+                throw new InvalidOperationException($"Dispose of the write transaction must be called from the same thread that created it. " +
+                                                    $"Transaction {Id} (Flags: {Flags}) was created by {CurrentTransactionHolder.Name}, thread Id: {CurrentTransactionHolder.ManagedThreadId}. " +
+                                                    $"The dispose was called from {NativeMemory.CurrentThreadStats.Name}, thread Id: {NativeMemory.CurrentThreadStats.ManagedThreadId}. " +
+                                                    $"Do you have any await call in the scope of the write transaction?");
+            }
         }
 
         public void Rollback()

src/Voron/ValueReader.cs

@@ -124,6 +124,8 @@ public long ReadBigEndianInt64()
 
             var val = *(long*) (Base + _pos);
 
+            _pos += sizeof(long);
+
             return Bits.SwapBytes(val);
         }
 

test/RachisTests/BasicTests.cs

@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Raven.Client.ServerWide;
+using Raven.Client.Util;
 using Raven.Server.Rachis;
 using Raven.Server.ServerWide.Context;
 using Sparrow.Json;
@@ -59,12 +60,12 @@ await ActionWithLeader(async l =>
         }
 
         [Fact]
-        public async Task RavenDB_13659()
+        public void RavenDB_13659()
         {
             EnableCaptureWriteTransactionStackTrace = true;
 
-            var leader = await CreateNetworkAndGetLeader(1);
-            var mre = new AsyncManualResetEvent();
+            var leader = AsyncHelpers.RunSync(() => CreateNetworkAndGetLeader(1));
+            var mre = new ManualResetEventSlim();
             var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             var currentThread = NativeMemory.CurrentThreadStats.ManagedThreadId;
 
@@ -92,12 +93,12 @@ public async Task RavenDB_13659()
             using (leader.ContextPool.AllocateOperationContext(out ClusterOperationContext context))
             using (context.OpenWriteTransaction())
             {
-                await mre.WaitAsync();
+                mre.Wait();
                 leader.SetNewStateInTx(context, RachisState.Follower, null, leader.CurrentTerm, "deadlock");
                 context.Transaction.Commit();
             }
 
-            await tcs.Task;
+            AsyncHelpers.RunSync(() => tcs.Task);
         }
     }
 }

test/SlowTests/Voron/Issues/RavenDB_22257.cs

@@ -21,8 +21,11 @@ protected override void Configure(StorageEnvironmentOptions options)
 
         options.ManualFlushing = true;
     }
-
+#if DEBUG
     [RavenFact(RavenTestCategory.Voron)]
+#else
+    [RavenFact(RavenTestCategory.Voron, Skip = "This test relies on Debug only check - LowLevelTransaction.EnsureDisposeOfWriteTxIsOnTheSameThreadThatCreatedIt()")]
+#endif
     public void MustNotAllowToHaveTwoWriteTransactionsConcurrently()
     {
         RequireFileBasedPager();
@@ -48,7 +51,7 @@ public void MustNotAllowToHaveTwoWriteTransactionsConcurrently()
                     {
                         ex = Assert.Throws<InvalidOperationException>(() =>
                         {
-                            txw1.Dispose(); // this is supposed to throw because we're attempting to dispose write tx from a different thread
+                            txw1.Dispose(); // this is supposed to throw in Debug because we're attempting to dispose write tx from a different thread
 
                             txw2 = Env.NewLowLevelTransaction(new TransactionPersistentContext(), TransactionFlags.ReadWrite);
 
@@ -60,7 +63,7 @@ public void MustNotAllowToHaveTwoWriteTransactionsConcurrently()
 
                     newTransactionThread.Join();
 
-                    Assert.StartsWith("Dispose of the transaction must be called from the same thread that created it. Transaction 2 (Flags: ReadWrite) was created by", ex.Message);
+                    Assert.StartsWith("Dispose of the write transaction must be called from the same thread that created it. Transaction 2 (Flags: ReadWrite) was created by", ex.Message);
                 });
 
                 /*