Try another parallel pattern where the maxConcurrentActivityFunctions…

… controls parallelisation
Energinet-DataHub · Sep 24, 2024 · 03e1eac · 03e1eac
1 parent e333f8f
commit 03e1eac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...hestration.SettlementReports/Functions/SettlementReports/SettlementReportOrchestration.cs b/...hestration.SettlementReports/Functions/SettlementReports/SettlementReportOrchestration.cs
@@ -57,7 +57,7 @@ public async Task<string> OrchestrateSettlementReport(
 
         context.SetCustomStatus(new OrchestrateSettlementReportMetadata { OrchestrationProgress = 10 });
 
-        var generatedFiles = new List<GeneratedSettlementReportFileDto>();
+        var generatedFiles = new ConcurrentBag<GeneratedSettlementReportFileDto>();
         var orderedResults = scatterResults
             .OrderBy(x => x.PartialFileInfo.FileOffset)
             .ThenBy(x => x.PartialFileInfo.ChunkOffset)
@@ -67,7 +67,16 @@ public async Task<string> OrchestrateSettlementReport(
             .CallActivityAsync<GeneratedSettlementReportFileDto>(
                 nameof(GenerateSettlementReportFileActivity),
                 new GenerateSettlementReportFileInput(fileRequest, settlementReportRequest.ActorInfo),
-                dataSourceExceptionHandler));
+                dataSourceExceptionHandler).ContinueWith(
+                async x =>
+                {
+                    generatedFiles.Add(await x);
+                    context.SetCustomStatus(new OrchestrateSettlementReportMetadata
+                    {
+                        OrchestrationProgress = (80.0 * generatedFiles.Count / orderedResults.Count) + 10,
+                    });
+                },
+                TaskContinuationOptions.ExecuteSynchronously));
 
         await Task.WhenAll(fileRequestTasks);
 

diff --git a/source/settlement-report/Orchestration.SettlementReports/host.json b/source/settlement-report/Orchestration.SettlementReports/host.json
@@ -12,9 +12,6 @@
         "isEnabled": true,
         "excludedTypes": "Request"
       },
-      "logLevel": {
-        "default": "Information"
-      },
       "enableLiveMetricsFilters": true
     }
   }