From 4b463057886ec2e8175db88a1213888db42848f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Jul 2021 11:49:16 +0100 Subject: [PATCH] Add cancelled property to taskinfo (#5803) (#5808) Co-authored-by: Steve Gordon --- src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs | 3 +++ .../TaskManagement/GetTask/GetTaskApiTests.cs | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs b/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs index 120c5d03021..1b7e3ef6764 100644 --- a/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs +++ b/src/Nest/Cluster/TaskManagement/GetTask/TaskInfo.cs @@ -17,6 +17,9 @@ public class TaskInfo [DataMember(Name ="cancellable")] public bool Cancellable { get; internal set; } + [DataMember(Name ="cancelled")] + public bool? Cancelled { get; internal set; } + [DataMember(Name ="children")] public IReadOnlyCollection Children { get; internal set; } = EmptyReadOnly.Collection; diff --git a/tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs b/tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs index 4b6c9f8e502..f037b75b8b4 100644 --- a/tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs +++ b/tests/Tests/Cluster/TaskManagement/GetTask/GetTaskApiTests.cs @@ -53,6 +53,12 @@ protected override void ExpectResponse(GetTaskResponse response) task.StartTimeInMilliseconds.Should().BeGreaterThan(0); task.RunningTimeInNanoseconds.Should().BeGreaterThan(0); task.Cancellable.Should().BeTrue(); + + if (Cluster.ClusterConfiguration.Version >= "7.14.0") + { + task.Cancelled.HasValue.Should().BeTrue(); + task.Cancelled.Should().BeFalse(); + } } protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values) @@ -129,6 +135,12 @@ protected override void ExpectResponse(GetTaskResponse response) task.RunningTimeInNanoseconds.Should().BeGreaterThan(0); task.Cancellable.Should().BeTrue(); + if (Cluster.ClusterConfiguration.Version >= "7.14.0") + { + task.Cancelled.HasValue.Should().BeTrue(); + task.Cancelled.Should().BeFalse(); + } + var reindexResponse = response.GetResponse(); reindexResponse.Should().NotBeNull(); reindexResponse.Took.Should().BeGreaterThan(0);