more plumbing (new scavenge done)

Author: timothycoleman

src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs

@@ -247,14 +247,15 @@ private async Task<DbResult> RunInternalAsync(
 			}
 
 			var hasher = new CompositeHasher<TStreamId>(lowHasher, highHasher);
+			var tracker = ITransactionFileTracker.NoOp;
 
 			var tableIndex = new TableIndex<TStreamId>(
 				directory: indexPath,
 				lowHasher: lowHasher,
 				highHasher: highHasher,
 				emptyStreamId: logFormat.EmptyStreamId,
 				memTableFactory: () => new HashListMemTable(PTableVersions.IndexV4, maxSize: 200),
-				tfReaderFactory: _ => new TFReaderLease(readerPool, ITransactionFileTracker.NoOp),
+				tfReaderFactory: _ => new TFReaderLease(readerPool, tracker),
 				ptableVersion: PTableVersions.IndexV4,
 				maxAutoMergeIndexLevel: int.MaxValue,
 				pTableMaxReaderCount: ESConsts.PTableInitialReaderCount,
@@ -317,6 +318,7 @@ private async Task<DbResult> RunInternalAsync(
 					metastreamLookup,
 					logFormat.StreamIdConverter,
 					dbResult.Db.Config.ReplicationCheckpoint,
+					tracker,
 					dbConfig.ChunkSize);
 
 				var indexReader = new IndexReaderForAccumulator<TStreamId>(readIndex);
@@ -403,7 +405,8 @@ private async Task<DbResult> RunInternalAsync(
 						new ChunkManagerForExecutor<TStreamId>(
 							logger,
 							dbResult.Db.Manager,
-							dbConfig),
+							dbConfig,
+							tracker),
 						Tracer),
 					chunkSize: dbConfig.ChunkSize,
 					unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes,
@@ -420,7 +423,7 @@ private async Task<DbResult> RunInternalAsync(
 				IIndexExecutor<TStreamId> indexExecutor = new IndexExecutor<TStreamId>(
 					logger: logger,
 					indexScavenger: cancellationWrappedIndexScavenger,
-					streamLookup: new ChunkReaderForIndexExecutor<TStreamId>(tracker => new TFReaderLease(readerPool, tracker)),
+					streamLookup: new ChunkReaderForIndexExecutor<TStreamId>(() => new TFReaderLease(readerPool, tracker)),
 					unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes,
 					restPeriod: restPeriod,
 					throttle: throttle);

src/EventStore.Core/ClusterVNode.cs

@@ -66,6 +66,7 @@
 using Microsoft.Data.Sqlite;
 using Mono.Unix.Native;
 using ILogger = Serilog.ILogger;
+using EventStore.Core.Services.UserManagement;
 
 namespace EventStore.Core {
 	public abstract class ClusterVNode {
@@ -1278,6 +1279,8 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 						},
 						dispose: backend => backend.Dispose());
 
+					var tracker = trackers.TransactionFileTrackers.GetOrAdd(SystemAccounts.SystemScavengeName);
+
 					var state = new ScavengeState<TStreamId>(
 						logger,
 						longHasher,
@@ -1294,6 +1297,7 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 							logFormat.Metastreams,
 							logFormat.StreamIdConverter,
 							Db.Config.ReplicationCheckpoint,
+							tracker,
 							TFConsts.ChunkSize),
 						index: new IndexReaderForAccumulator<TStreamId>(readIndex),
 						cancellationCheckPeriod: cancellationCheckPeriod,
@@ -1313,7 +1317,7 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 					var chunkExecutor = new ChunkExecutor<TStreamId, ILogRecord>(
 						logger,
 						logFormat.Metastreams,
-						new ChunkManagerForExecutor<TStreamId>(logger, Db.Manager, Db.Config),
+						new ChunkManagerForExecutor<TStreamId>(logger, Db.Manager, Db.Config, tracker),
 						chunkSize: Db.Config.ChunkSize,
 						unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
 						cancellationCheckPeriod: cancellationCheckPeriod,
@@ -1329,7 +1333,7 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 					var indexExecutor = new IndexExecutor<TStreamId>(
 						logger,
 						new IndexScavenger(tableIndex),
-						new ChunkReaderForIndexExecutor<TStreamId>(tracker => new TFReaderLease(readerPool, tracker)),
+						new ChunkReaderForIndexExecutor<TStreamId>(() => new TFReaderLease(readerPool, tracker)),
 						unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
 						restPeriod: 32_768,
 						throttle: throttle);

src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs

@@ -9,11 +9,14 @@ public class ChunkManagerForExecutor<TStreamId> : IChunkManagerForChunkExecutor<
 		private readonly ILogger _logger;
 		private readonly TFChunkManager _manager;
 		private readonly TFChunkDbConfig _dbConfig;
+		private readonly ITransactionFileTracker _tracker;
 
-		public ChunkManagerForExecutor(ILogger logger, TFChunkManager manager, TFChunkDbConfig dbConfig) {
+		public ChunkManagerForExecutor(ILogger logger, TFChunkManager manager, TFChunkDbConfig dbConfig,
+			ITransactionFileTracker tracker) {
 			_logger = logger;
 			_manager = manager;
 			_dbConfig = dbConfig;
+			_tracker = tracker;
 		}
 
 		public IChunkWriterForExecutor<TStreamId, ILogRecord> CreateChunkWriter(
@@ -24,7 +27,7 @@ public IChunkWriterForExecutor<TStreamId, ILogRecord> CreateChunkWriter(
 
 		public IChunkReaderForExecutor<TStreamId, ILogRecord> GetChunkReaderFor(long position) {
 			var tfChunk = _manager.GetChunkFor(position);
-			return new ChunkReaderForExecutor<TStreamId>(tfChunk);
+			return new ChunkReaderForExecutor<TStreamId>(tfChunk, _tracker);
 		}
 
 		public void SwitchChunk(

src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs

@@ -14,6 +14,7 @@ public class ChunkReaderForAccumulator<TStreamId> : IChunkReaderForAccumulator<T
 		private readonly IMetastreamLookup<TStreamId> _metaStreamLookup;
 		private readonly IStreamIdConverter<TStreamId> _streamIdConverter;
 		private readonly ICheckpoint _replicationChk;
+		private readonly ITransactionFileTracker _tracker;
 		private readonly int _chunkSize;
 
 		private readonly Func<int, byte[]> _getBuffer;
@@ -24,12 +25,14 @@ public ChunkReaderForAccumulator(
 			IMetastreamLookup<TStreamId> metastreamLookup,
 			IStreamIdConverter<TStreamId> streamIdConverter,
 			ICheckpoint replicationChk,
+			ITransactionFileTracker tracker,
 			int chunkSize) {
 
 			_manager = manager;
 			_metaStreamLookup = metastreamLookup;
 			_streamIdConverter = streamIdConverter;
 			_replicationChk = replicationChk;
+			_tracker = tracker;
 			_chunkSize = chunkSize;
 
 			var reusableRecordBuffer = new ReusableBuffer(8192);
@@ -62,7 +65,7 @@ public IEnumerable<AccumulatorRecordType> ReadChunkInto(
 
 				var localPos = chunk.ChunkHeader.GetLocalLogPosition(nextPos);
 
-				var result = chunk.TryReadClosestForwardRaw(localPos, _getBuffer, ITransactionFileTracker.NoOp); //qq plumb through all occurrences of noop
+				var result = chunk.TryReadClosestForwardRaw(localPos, _getBuffer, _tracker);
 
 				if (!result.Success) {
 					// there is no need to release the reusable buffer here since result.Success is false

src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs

@@ -6,9 +6,12 @@
 namespace EventStore.Core.TransactionLog.Scavenging {
 	public class ChunkReaderForExecutor<TStreamId> : IChunkReaderForExecutor<TStreamId, ILogRecord> {
 		private readonly TFChunk _chunk;
+		private readonly ITransactionFileTracker _tracker;
 
-		public ChunkReaderForExecutor(TFChunk chunk) {
+		public ChunkReaderForExecutor(TFChunk chunk,
+			ITransactionFileTracker tracker) {
 			_chunk = chunk;
+			_tracker = tracker;
 		}
 
 		public string Name => _chunk.ToString();
@@ -30,7 +33,7 @@ public IEnumerable<bool> ReadInto(
 			RecordForExecutor<TStreamId, ILogRecord>.NonPrepare nonPrepare,
 			RecordForExecutor<TStreamId, ILogRecord>.Prepare prepare) {
 
-			var result = _chunk.TryReadFirst(ITransactionFileTracker.NoOp); //qq
+			var result = _chunk.TryReadFirst(_tracker);
 			while (result.Success) {
 				var record = result.LogRecord;
 				if (record.RecordType != LogRecordType.Prepare) {
@@ -51,7 +54,7 @@ public IEnumerable<bool> ReadInto(
 					yield return true;
 				}
 
-				result = _chunk.TryReadClosestForward(result.NextPosition, ITransactionFileTracker.NoOp); //qq
+				result = _chunk.TryReadClosestForward(result.NextPosition, _tracker);
 			}
 		}
 	}

src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs

@@ -3,14 +3,14 @@
 
 namespace EventStore.Core.TransactionLog.Scavenging {
 	public class ChunkReaderForIndexExecutor<TStreamId> : IChunkReaderForIndexExecutor<TStreamId> {
-		private readonly Func<ITransactionFileTracker, TFReaderLease> _tfReaderFactory;
+		private readonly Func<TFReaderLease> _tfReaderFactory;
 
-		public ChunkReaderForIndexExecutor(Func<ITransactionFileTracker, TFReaderLease> tfReaderFactory) {
+		public ChunkReaderForIndexExecutor(Func<TFReaderLease> tfReaderFactory) {
 			_tfReaderFactory = tfReaderFactory;
 		}
 
 		public bool TryGetStreamId(long position, out TStreamId streamId) {
-			using (var reader = _tfReaderFactory(ITransactionFileTracker.NoOp)) { //qq
+			using (var reader = _tfReaderFactory()) {
 				var result = reader.TryReadAt(position, couldBeScavenged: true);
 				if (!result.Success) {
 					streamId = default;