Skip to content

Commit 9e91b7e

Browse files
authored
[Rpc]Include Pid in Env Reload Request and Response (#8065) (#8219)
1 parent f370f7f commit 9e91b7e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ internal WorkerInitRequest GetWorkerInitRequest()
235235

236236
internal void FunctionEnvironmentReloadResponse(FunctionEnvironmentReloadResponse res, IDisposable latencyEvent)
237237
{
238-
_workerChannelLogger.LogDebug("Received FunctionEnvironmentReloadResponse");
238+
_workerChannelLogger.LogDebug("Received FunctionEnvironmentReloadResponse from WorkerProcess with Pid: '{0}'", _rpcWorkerProcess.Id);
239239
if (res.Result.IsFailure(out Exception reloadEnvironmentVariablesException))
240240
{
241241
_workerChannelLogger.LogError(reloadEnvironmentVariablesException, "Failed to reload environment variables");
@@ -309,7 +309,7 @@ public void SendFunctionLoadRequests(ManagedDependencyOptions managedDependencyO
309309

310310
public Task SendFunctionEnvironmentReloadRequest()
311311
{
312-
_workerChannelLogger.LogDebug("Sending FunctionEnvironmentReloadRequest");
312+
_workerChannelLogger.LogDebug("Sending FunctionEnvironmentReloadRequest to WorkerProcess with Pid: '{0}'", _rpcWorkerProcess.Id);
313313
IDisposable latencyEvent = _metricsLogger.LatencyEvent(MetricEventNames.SpecializationEnvironmentReloadRequestResponse);
314314

315315
_eventSubscriptions

test/WebJobs.Script.Tests/Workers/Rpc/GrpcWorkerChannelTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public GrpcWorkerChannelTests()
6363
_testWorkerConfig.CountOptions.EnvironmentReloadTimeout = TimeSpan.FromSeconds(5);
6464

6565
_mockrpcWorkerProcess.Setup(m => m.StartProcessAsync()).Returns(Task.CompletedTask);
66+
_mockrpcWorkerProcess.Setup(m => m.Id).Returns(910);
6667
_testEnvironment = new TestEnvironment();
6768
_testEnvironment.SetEnvironmentVariable(FunctionDataCacheConstants.FunctionDataCacheEnabledSettingName, "1");
6869
_workerConcurrencyOptions = Options.Create(new WorkerConcurrencyOptions());
@@ -397,7 +398,7 @@ public void SendSendFunctionEnvironmentReloadRequest_PublishesOutboundEvents()
397398
_workerChannel.SendFunctionEnvironmentReloadRequest();
398399
_testFunctionRpcService.PublishFunctionEnvironmentReloadResponseEvent();
399400
var traces = _logger.GetLogMessages();
400-
var functionLoadLogs = traces.Where(m => string.Equals(m.FormattedMessage, "Sending FunctionEnvironmentReloadRequest"));
401+
var functionLoadLogs = traces.Where(m => string.Equals(m.FormattedMessage, "Sending FunctionEnvironmentReloadRequest to WorkerProcess with Pid: '910'"));
401402
Assert.True(functionLoadLogs.Count() == 1);
402403
}
403404

0 commit comments

Comments
 (0)