implementd AsBooleanStrict and check in JobRunner

microsoft · Mar 3, 2023 · a1c0c67 · a1c0c67
1 parent 1a311da
commit a1c0c67
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Agent.Worker/JobRunner.cs b/src/Agent.Worker/JobRunner.cs
@@ -334,6 +334,25 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,
                     return await CompleteJobAsync(jobServer, jobContext, message, TaskResult.Failed);
                 }
 
+                // check if knob DrainQueuesAfterTask has correct value
+                bool defaultDrainQueuesAfterTask = AgentKnobs.DrainQueuesAfterTask.GetValue<BuiltInDefaultKnobSource>(jobContext).AsBoolean();
+                try
+                {
+                    AgentKnobs.DrainQueuesAfterTask.GetValue(jobContext).AsBooleanStrict();
+                }
+                catch (Exception ex)
+                {
+                    switch (ex)
+                    {
+                        case ArgumentException _:
+                        case FormatException _:
+                            jobContext.Warning($"Knob 'AGENT_DRAIN_QUEUES_AFTER_TASK' has wrong value, default value '{defaultDrainQueuesAfterTask}' will be set");
+                            break;
+                        default:
+                            throw;
+                    }
+                }
+
                 // trace out all steps
                 Trace.Info($"Total job steps: {jobSteps.Count}.");
                 Trace.Verbose($"Job steps: '{string.Join(", ", jobSteps.Select(x => x.DisplayName))}'");

diff --git a/src/Agent.Worker/StepsRunner.cs b/src/Agent.Worker/StepsRunner.cs
@@ -310,7 +310,14 @@ private async Task RunStepAsync(IStep step, CancellationToken jobCancellationTok
             step.ExecutionContext.Section(StringUtil.Loc("StepFinishing", step.DisplayName));
             step.ExecutionContext.Complete();
 
-            if (AgentKnobs.DrainQueuesAfterTask.GetValue(step.ExecutionContext).AsBoolean() == true)
+            bool drainQueuesAfterTask = AgentKnobs.DrainQueuesAfterTask.GetValue<BuiltInDefaultKnobSource>(step.ExecutionContext).AsBoolean();
+            try
+            {
+                drainQueuesAfterTask = AgentKnobs.DrainQueuesAfterTask.GetValue(step.ExecutionContext).AsBooleanStrict();
+            }
+            catch { }
+
+            if (drainQueuesAfterTask == true)
             {
                 try
                 {