[HotFix] Make concurrent batch count as tunable parameter (#483)

src/Ng/Arguments.cs

@@ -60,6 +60,8 @@ public static class Arguments
         public const string PreferAlternatePackageSourceStorage = "preferAlternatePackageSourceStorage";
 
         public const string StorageUseServerSideCopy = "storageUseServerSideCopy";
+        public const string MaxConcurrentBatches = "maxConcurrentBatches";
+
         #endregion
 
         #region Catalog2Lucene
@@ -87,6 +89,7 @@ public static class Arguments
         public const string ContentIsFlatContainer = "contentIsFlatContainer";
         public const string CursorUri = "cursorUri";
         public const string FlatContainerName = "flatContainerName";
+
         #endregion
 
         #region Catalog2PackageFixup

src/Ng/Jobs/Catalog2RegistrationJob.cs

@@ -74,6 +74,7 @@ protected override void Init(IDictionary<string, string> arguments, Cancellation
             var contentBaseAddress = arguments.GetOrDefault<string>(Arguments.ContentBaseAddress);
             var galleryBaseAddress = arguments.GetOrDefault<string>(Arguments.GalleryBaseAddress);
             var isContentFlatContainer = arguments.GetOrDefault<bool>(Arguments.ContentIsFlatContainer);
+            var maxConcurrentBatches = MaxConcurrentBatches(arguments.GetOrDefault<int>(Arguments.MaxConcurrentBatches));
 
             // The term "legacy" here refers to the registration hives that do not contain any SemVer 2.0.0 packages.
             // In production, this is two registration hives:
@@ -108,7 +109,8 @@ protected override void Init(IDictionary<string, string> arguments, Cancellation
                 galleryBaseAddress == null ? null : new Uri(galleryBaseAddress),
                 TelemetryService,
                 Logger,
-                CommandHelpers.GetHttpMessageHandlerFactory(TelemetryService, verbose));
+                CommandHelpers.GetHttpMessageHandlerFactory(TelemetryService, verbose),
+                maxConcurrentBatches: maxConcurrentBatches);
 
             var cursorStorage = storageFactories.LegacyStorageFactory.Create();
             _front = new DurableCursor(cursorStorage.ResolveUri("cursor.json"), cursorStorage, MemoryCursor.MinValue);
@@ -118,6 +120,20 @@ protected override void Init(IDictionary<string, string> arguments, Cancellation
             TelemetryService.GlobalDimensions[TelemetryConstants.Destination] = _destination?.AbsoluteUri;
         }
 
+        private int MaxConcurrentBatches(int argBatches)
+        {
+            if (argBatches < 0)
+            {
+                throw new ArgumentException($"{nameof(argBatches)} cannot be negative.");
+            }
+            if (argBatches == 0)
+            {
+                return RegistrationCollector.DefaultMaxConcurrentBatches;
+            }
+
+            return argBatches;
+        }
+
         protected override async Task RunInternalAsync(CancellationToken cancellationToken)
         {
             using (Logger.BeginScope($"Logging for {{{TelemetryConstants.Destination}}}", _destination?.AbsoluteUri))

src/Ng/Scripts/Catalog2RegistrationV3-Reg3-China.cmd

@@ -38,7 +38,8 @@ start /w ng.exe catalog2registration ^
     -flatContainerName #{Jobs.China.catalog2registrationv3reg3.FlatContainerName} ^
     -storageOperationMaxExecutionTimeInSeconds #{Jobs.Common.China.AzureOperationMaxTimeout} ^
     -storageServerTimeoutInSeconds #{Jobs.Common.China.StorageServerTimeoutInSeconds} ^
-    -galleryBaseAddress #{Jobs.China.catalog2registrationv3reg3.GalleryBaseAddress}
+    -galleryBaseAddress #{Jobs.China.catalog2registrationv3reg3.GalleryBaseAddress} ^
+    -maxConcurrentBatches #{Jobs.common.v3.MaxConcurrentBatches}
 
 echo "Finished #{Jobs.China.catalog2registrationv3reg3.Title}"
 

src/Ng/Scripts/Catalog2RegistrationV3-Reg3.cmd

@@ -35,7 +35,8 @@ start /w ng.exe catalog2registration ^
     -contentIsFlatContainer #{Jobs.catalog2registrationv3reg3.IsContentFlatContainer} ^
     -cursorUri #{Jobs.catalog2registrationv3reg3.CursorUri} ^
     -flatContainerName #{Jobs.catalog2registrationv3reg3.FlatContainerName} ^
-    -galleryBaseAddress #{Jobs.catalog2registrationv3reg3.GalleryBaseAddress}
+    -galleryBaseAddress #{Jobs.catalog2registrationv3reg3.GalleryBaseAddress} ^
+    -maxConcurrentBatches #{Jobs.common.v3.MaxConcurrentBatches}
 
 echo "Finished #{Jobs.catalog2registrationv3reg3.Title}"