[151] Runner executor #404
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
giventocode
force-pushed
the
ja-nodetask-builder
branch
from
9f1c96c
to
feef1e4
Compare
…4gh-tes into ja-nodetask-builder
MattMcL4475
reviewed
Sep 25, 2023
BMurri
requested changes
Sep 26, 2023
giventocode
force-pushed
the
ja-nodetask-builder
branch
from
6ffdbcf
to
760348a
Compare
…4gh-tes into ja-nodetask-builder
BMurri
approved these changes
Oct 2, 2023
| @@ -42,7 +42,7 @@ public class RuntimeOptions | |||
| { | |||
| public TerraRuntimeOptions? Terra { get; set; } | |||
|
|
|||
| public DockerCleanUpOptions DockerCleanUp { get; set; } | |||
| public string? NodeManagedIdentityResourceId { get; set; } | |||
| } | |||
|
|
|||
| public class DockerCleanUpOptions | |||
There was a problem hiding this comment.
If this is no longer used, please remove.
| { | ||
| return retryPolicy.Execute(() => GetTokenCredentialImpl(runtimeOptions)); | ||
| } | ||
| private TokenCredential GetTokenCredentialImpl(RuntimeOptions runtimeOptions) |
| @@ -169,8 +154,7 @@ public partial class BatchScheduler : IBatchScheduler | |||
| _batchPoolFactory = poolFactory; | |||
| batchPrefix = batchSchedulingOptions.Value.Prefix; | |||
| logger.LogInformation("BatchPrefix: {BatchPrefix}", batchPrefix); | |||
| taskRunScriptContent = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "scripts/task-run.sh")); | |||
| taskCleanupScriptContent = File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "scripts/clean-executor.sh")); | |||
| File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, "scripts/task-run.sh")); | |||
There was a problem hiding this comment.
If this isn't storing the contents of the file anywhere, this line can go away. If that is the case, please also delete the two files in the scripts directory.
| return await UploadContentAndCreateTesInputAsync(tesTask, input.Path, input.Content, cancellationToken); | ||
| } | ||
|
|
||
| private static string EscapeBashArgument(string arg) |
There was a problem hiding this comment.
Are you dumping the commands from the TesTask into a script in a single string or are you passing them to the Docker API? If the latter, we should NOT be shell escaping them. The Docker API does not turn them into a single string command-line, it passes them to the process's main() function directly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes: #151
In this PR:
TaskExecutionScriptingManagerManages the creation and uploading of the Batch script and all its dependencies, this is the entry-point class the BatchScheduler uses.BatchNodeScriptBuilder. Fluid builder of the script to be executed by Batch. Used byTaskExecutionScriptingManager.TaskToNodeTaskConverterHandles the creation of a NodeTask from a TesTask. Used byTaskExecutionScriptingManager. Creation of the NodeTask's inputs and outputs has the following key functionality:NodeTaskBuilderFluid builder of NodeTask instances. Contains the logic that sets the URL transformation strategy for inputs/outputs using the configuration settings. Used byTaskToNodeTaskConverter.idandworkflowId, uniquely identifies the task and its associated workflow id.SasTransformationStrategyproperty inFileOutputtoTransformationStrategyRuntimeOptions.NodeManagedIdentityResourceId(workflow ID or global ID as fallback) to the node task and changed the runner to use itManagedIdentityCredential(new ResourceIdentifier(runtimeOptions.NodeManagedIdentityResourceId));If NodeManagedIdentiyResourceId is not set, the runner will use
DefaultAzureCredentials()as a fallback, which works when identity is assigned and available.The TES server now uploads the TES task to storage account.