diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml b/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml index 545aa6e..bc640b2 100644 --- a/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml +++ b/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml @@ -1,6 +1,6 @@  @@ -11,7 +11,7 @@ - + CoordinatorService.exe @@ -21,7 +21,7 @@ - + diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs b/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs index dd06d7b..4def4fd 100644 --- a/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs +++ b/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs @@ -553,10 +553,14 @@ internal async Task PrepareRepairTasks(CancellationToken cancellationToken) { if (claimedTaskList.Any()) { - RepairTask lastCompletedTask = (await this.GetCompletedRepairTasks(nodeList, cancellationToken))?.Aggregate( - (curMax, task) => (task.CompletedTimestamp > curMax.CompletedTimestamp ? task : curMax)); + IList completedTasks = await this.GetCompletedRepairTasks(nodeList, cancellationToken); + TimeSpan? timePastAfterCompletedTask = null; + if (completedTasks.Any()) + { + RepairTask lastCompletedTask = completedTasks.Aggregate((curMax, task) => (task.CompletedTimestamp > curMax.CompletedTimestamp ? task : curMax)); + timePastAfterCompletedTask = DateTime.UtcNow - lastCompletedTask?.CompletedTimestamp; + } - TimeSpan? timePastAfterCompletedTask = DateTime.UtcNow - lastCompletedTask?.CompletedTimestamp; if (!timePastAfterCompletedTask.HasValue || timePastAfterCompletedTask.Value > MinWaitTimeBetweenNodes) diff --git a/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml b/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml index 923d2c9..642eb65 100644 --- a/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml +++ b/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml @@ -1,6 +1,6 @@  @@ -11,7 +11,7 @@ - + SetupEntryPoint.bat @@ -27,7 +27,7 @@ - + diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml index da6d88f..f3d5153 100644 --- a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml +++ b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml @@ -1,5 +1,5 @@  - + @@ -52,7 +52,7 @@ should match the Name and Version attributes of the ServiceManifest element defined in the ServiceManifest.xml file. --> - + @@ -66,7 +66,7 @@ - + diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj index e50cbc5..7aa0deb 100644 --- a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj +++ b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj @@ -16,7 +16,7 @@ ServiceFabric.PatchOrchestrationApplication ServiceFabric.PatchOrchestrationApplication - 1.4.2 + 1.4.3 brkhande;raunakp brkhande;raunakp This package contains Service Fabric Patch Orchestration Application. diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Deploy.ps1 b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Deploy.ps1 index 91902d1..874218c 100644 --- a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Deploy.ps1 +++ b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Deploy.ps1 @@ -11,7 +11,7 @@ Param $ImageStoreConnectionString = "fabric:ImageStore", [string] - $ApplicationVersion = "1.4.2", + $ApplicationVersion = "1.4.3", [hashtable] $ApplicationParameters = @{} diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Undeploy.ps1 b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Undeploy.ps1 index 2903a5d..caf0baf 100644 --- a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Undeploy.ps1 +++ b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Undeploy.ps1 @@ -8,7 +8,7 @@ Param $ImageStoreConnectionString = "fabric:ImageStore", [string] - $ApplicationVersion = "1.4.2" + $ApplicationVersion = "1.4.3" ) Remove-ServiceFabricApplication -ApplicationName fabric:/PatchOrchestrationApplication -Force diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Upgrade.ps1 b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Upgrade.ps1 index d880da1..b076059 100644 --- a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Upgrade.ps1 +++ b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Upgrade.ps1 @@ -11,7 +11,7 @@ Param $ImageStoreConnectionString = "fabric:ImageStore", [string] - $ApplicationVersion = "1.4.2", + $ApplicationVersion = "1.4.3", [hashtable] $ApplicationParameters = @{}, diff --git a/src/PatchOrchestrationApplication/TelemetryLib/src/TelemetryEvents.cs b/src/PatchOrchestrationApplication/TelemetryLib/src/TelemetryEvents.cs index 8693f04..20dc19e 100644 --- a/src/PatchOrchestrationApplication/TelemetryLib/src/TelemetryEvents.cs +++ b/src/PatchOrchestrationApplication/TelemetryLib/src/TelemetryEvents.cs @@ -27,7 +27,7 @@ public class TelemetryEvents // Every time a new version of application would be release, manually update this version. // This application version is used for telemetry // For consistency keep this applicaiton version same as application version from application manifest. - private const string ApplicationVersion = "1.4.2"; + private const string ApplicationVersion = "1.4.3"; public TelemetryEvents(FabricClient fabricClient, ITelemetryEventSource eventSource) { diff --git a/src/properties/common.props b/src/properties/common.props index 83447f4..0dfb1dc 100644 --- a/src/properties/common.props +++ b/src/properties/common.props @@ -25,7 +25,7 @@ 1. Assembly info 2. File info 3. Not yet in Telemetry of windows --> - 1.4.2 + 1.4.3 Microsoft