cloned relatedContext to prevent concurrent access to Collection (#204)

* cloned relatedContext to prevent concurrent access to Collection * updated Redis to clone telemetry and locked Apply method for concurrent collection --------- Co-authored-by: Kayvon Tadj <[email protected]>
microsoft · Nov 7, 2023 · a21ee5e · a21ee5e
1 parent 170f127
commit a21ee5e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.pipelines/azure-pipelines-linux.yml b/.pipelines/azure-pipelines-linux.yml
@@ -16,7 +16,7 @@ resources:
     options: --entrypoint=""
 
 variables:
-  VcVersion : 1.11.9
+  VcVersion : 1.11.10
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

diff --git a/.pipelines/azure-pipelines.yml b/.pipelines/azure-pipelines.yml
@@ -18,7 +18,7 @@ pool:
   vmImage: windows-latest
 
 variables:
-  VcVersion : 1.11.9
+  VcVersion : 1.11.10
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

diff --git a/src/VirtualClient/VirtualClient.Actions/Memtier/MemtierBenchmarkClientExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Memtier/MemtierBenchmarkClientExecutor.cs
@@ -383,7 +383,7 @@ private Task ExecuteWorkloadsAsync(IPAddress serverIPAddress, ServerState server
                             }
 
                             commands.Add(commandArguments);
-                            workloadProcesses.Add(this.ExecuteWorkloadAsync(serverPort, command, commandArguments, workingDirectory, relatedContext, cancellationToken));
+                            workloadProcesses.Add(this.ExecuteWorkloadAsync(serverPort, command, commandArguments, workingDirectory, relatedContext.Clone(), cancellationToken));
 
                             if (this.WarmUp)
                             {

diff --git a/src/VirtualClient/VirtualClient.Actions/Redis/RedisBenchmarkClientExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Redis/RedisBenchmarkClientExecutor.cs
@@ -278,7 +278,7 @@ private Task ExecuteWorkloadsAsync(IPAddress serverIPAddress, ServerState server
                             string commandArguments = $"-c \"{this.RedisExecutablePath} -h {serverIPAddress} -p {serverPort} {this.CommandLine}\"";
                             commands.Add($"{command} {commandArguments}");
 
-                            workloadProcesses.Add(this.ExecuteWorkloadAsync(serverPort, command, commandArguments, workingDirectory, relatedContext, cancellationToken));
+                            workloadProcesses.Add(this.ExecuteWorkloadAsync(serverPort, command, commandArguments, workingDirectory, relatedContext.Clone(), cancellationToken));
 
                             if (this.WarmUp)
                             {

diff --git a/src/VirtualClient/VirtualClient.Contracts/Metadata/MetadataContract.cs b/src/VirtualClient/VirtualClient.Contracts/Metadata/MetadataContract.cs
@@ -28,6 +28,8 @@ public class MetadataContract
         /// </summary>
         private static IDictionary<string, IDictionary<string, object>> persistedMetadata = new ConcurrentDictionary<string, IDictionary<string, object>>(StringComparer.OrdinalIgnoreCase);
 
+        private readonly object lockObject = new object();
+
         /// <summary>
         /// Metadata properties for an instance of the metadata contract typically associated with
         /// an individual VC component lifetime.
@@ -169,11 +171,14 @@ public static void ResetPersisted()
         /// <param name="telemetryContext">The telemetry event context to which the metadata contract should be applied.</param>
         public void Apply(EventContext telemetryContext)
         {
-            MetadataContract.ApplyMetadata(telemetryContext, MetadataContract.persistedMetadata);
+            lock (this.lockObject)
+            {
+                MetadataContract.ApplyMetadata(telemetryContext, MetadataContract.persistedMetadata);
 
-            // Component-scope properties take precedence over global properties in the case that there
-            // is a conflict. Any existing global properties will be overridden in the case of a conflict.
-            MetadataContract.ApplyMetadata(telemetryContext, this.instanceMetadata);
+                // Component-scope properties take precedence over global properties in the case that there
+                // is a conflict. Any existing global properties will be overridden in the case of a conflict.
+                MetadataContract.ApplyMetadata(telemetryContext, this.instanceMetadata);
+            }
         }
 
         /// <summary>