Skip to content

Commit 4c52a1b

Browse files
committed
Mesh changes
1 parent d0a0ae5 commit 4c52a1b

File tree

15 files changed

+374
-153
lines changed

15 files changed

+374
-153
lines changed

src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerInitializationHostService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private async Task ApplyContextIfPresent()
6868
var encryptedAssignmentContext = JsonConvert.DeserializeObject<EncryptedHostAssignmentContext>(startContext);
6969
var containerKey = _environment.GetEnvironmentVariable(EnvironmentSettingNames.ContainerEncryptionKey);
7070
var assignmentContext = encryptedAssignmentContext.Decrypt(containerKey);
71-
if (_instanceManager.StartAssignment(assignmentContext))
71+
if (_instanceManager.StartAssignment(assignmentContext, false))
7272
{
7373
_logger.LogInformation("Start assign HostAssignmentContext success");
7474
}

src/WebJobs.Script.WebHost/Controllers/InstanceController.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,29 @@ public async Task<IActionResult> Assign([FromBody] EncryptedHostAssignmentContex
3737
{
3838
_logger.LogDebug($"Starting container assignment for host : {Request?.Host}. ContextLength is: {encryptedAssignmentContext.EncryptedContext?.Length}");
3939
var containerKey = _environment.GetEnvironmentVariable(EnvironmentSettingNames.ContainerEncryptionKey);
40-
var assignmentContext = encryptedAssignmentContext.Decrypt(containerKey);
40+
var assignmentContext = encryptedAssignmentContext.IsWarmup
41+
? null
42+
: encryptedAssignmentContext.Decrypt(containerKey);
4143

4244
// before starting the assignment we want to perform as much
4345
// up front validation on the context as possible
44-
string error = await _instanceManager.ValidateContext(assignmentContext);
46+
string error = await _instanceManager.ValidateContext(assignmentContext, encryptedAssignmentContext.IsWarmup);
4547
if (error != null)
4648
{
4749
return StatusCode(StatusCodes.Status400BadRequest, error);
4850
}
4951

5052
// Wait for Sidecar specialization to complete before returning ok.
5153
// This shouldn't take too long so ok to do this sequentially.
52-
error = await _instanceManager.SpecializeMSISidecar(assignmentContext);
54+
error = await _instanceManager.SpecializeMSISidecar(assignmentContext, encryptedAssignmentContext.IsWarmup);
5355
if (error != null)
5456
{
5557
return StatusCode(StatusCodes.Status500InternalServerError, error);
5658
}
5759

58-
var result = _instanceManager.StartAssignment(assignmentContext);
60+
var result = _instanceManager.StartAssignment(assignmentContext, encryptedAssignmentContext.IsWarmup);
5961

60-
return result
62+
return result || encryptedAssignmentContext.IsWarmup
6163
? Accepted()
6264
: StatusCode(StatusCodes.Status409Conflict, "Instance already assigned");
6365
}

src/WebJobs.Script.WebHost/Management/IInstanceManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ public interface IInstanceManager
1111
{
1212
IDictionary<string, string> GetInstanceInfo();
1313

14-
Task<string> ValidateContext(HostAssignmentContext assignmentContext);
14+
Task<string> ValidateContext(HostAssignmentContext assignmentContext, bool isWarmup);
1515

16-
bool StartAssignment(HostAssignmentContext assignmentContext);
16+
bool StartAssignment(HostAssignmentContext assignmentContext, bool isWarmup);
1717

18-
Task<string> SpecializeMSISidecar(HostAssignmentContext assignmentContext);
18+
Task<string> SpecializeMSISidecar(HostAssignmentContext assignmentContext, bool isWarmup);
1919
}
2020
}

0 commit comments

Comments
 (0)