Skip to content

Commit 327db57

Browse files
authored
Add logging to the SafeKill method for SockPerf and Latte server-side executors to help determine if there is an error preventing the process from being effectively killed. (#198)
1 parent b27f0e4 commit 327db57

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

.pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616
options: --entrypoint=""
1717

1818
variables:
19-
VcVersion : 1.11.7
19+
VcVersion : 1.11.8
2020
ROOT: $(Build.SourcesDirectory)
2121
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2222
ENABLE_PRS_DELAYSIGN: 1

.pipelines/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pool:
1818
vmImage: windows-latest
1919

2020
variables:
21-
VcVersion : 1.11.7
21+
VcVersion : 1.11.8
2222
ROOT: $(Build.SourcesDirectory)
2323
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2424
ENABLE_PRS_DELAYSIGN: 1

src/VirtualClient/VirtualClient.Actions/Network/NetworkingWorkload/Latte/LatteServerExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
6868
}
6969
finally
7070
{
71-
process.SafeKill();
71+
process.SafeKill(this.Logger);
7272
}
7373
}
7474
}

src/VirtualClient/VirtualClient.Actions/Network/NetworkingWorkload/SockPerf/SockPerfServerExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
7777
{
7878
// SockPerf must be explicitly terminated given the current implementation. If it is not,
7979
// the process will remain running in the background.
80-
process.SafeKill();
80+
process.SafeKill(this.Logger);
8181
}
8282
}
8383
}

src/VirtualClient/VirtualClient.Actions/Network2/NetworkingWorkload2/Latte/LatteServerExecutor2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
376376
}
377377
finally
378378
{
379-
process.SafeKill();
379+
process.SafeKill(this.Logger);
380380
}
381381
}
382382
}

src/VirtualClient/VirtualClient.Actions/Network2/NetworkingWorkload2/SockPerf/SockPerfServerExecutor2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ await this.ProcessStartRetryPolicy.ExecuteAsync(async () =>
379379
{
380380
// SockPerf must be explicitly terminated given the current implementation. If it is not,
381381
// the process will remain running in the background.
382-
process.SafeKill();
382+
process.SafeKill(this.Logger);
383383
}
384384
}
385385
}

0 commit comments

Comments
 (0)