Merge pull request #27 from microsoft/TimeoutRepairCompleteRepairTask…

…Issue Timeout repair complete repair task issue
microsoft · Jun 14, 2019 · 7dedde6 · 7dedde6
2 parents db5a1ef + 718b98e
commit 7dedde6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml b/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceManifest Name="CoordinatorServicePkg"
-                 Version="1.4.0"
+                 Version="1.4.1"
                  xmlns="http://schemas.microsoft.com/2011/01/fabric"
                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -11,7 +11,7 @@
   </ServiceTypes>
 
   <!-- Code package is your service executable. -->
-  <CodePackage Name="Code" Version="1.4.0">
+  <CodePackage Name="Code" Version="1.4.1">
     <EntryPoint>
       <ExeHost>
         <Program>CoordinatorService.exe</Program>
@@ -21,7 +21,7 @@
 
   <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
        independently-updateable and versioned set of custom configuration settings for your service. -->
-  <ConfigPackage Name="Config" Version="1.4.0" />
+  <ConfigPackage Name="Config" Version="1.4.1" />
 
   <Resources>
     <Endpoints>

diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs b/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs
@@ -632,7 +632,8 @@ internal async Task TimeoutRepairTasks(CancellationToken cancellationToken)
                     if (!nodeExists)
                     {
                         // If node does not exist now, there is no point in waiting on the task.
-                        await UpdateRepairTaskState(task, nodeName, RepairTaskState.Completed, executorData.ExecutorTimeoutInMinutes, cancellationToken, nodeExists);
+                        ServiceEventSource.Current.VerboseMessage("Cancelling repair task {0} which is in {1} state as the node {2} does not exist anymore.", task.TaskId, task.State, nodeName);
+                        await this.CancelRepairTask(task);
                         continue;
                     }
 

diff --git a/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml b/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceManifest Name="NodeAgentServicePkg"
-                 Version="1.4.0"
+                 Version="1.4.1"
                  xmlns="http://schemas.microsoft.com/2011/01/fabric"
                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -11,7 +11,7 @@
   </ServiceTypes>
 
   <!-- Code package is your service executable. -->
-  <CodePackage Name="Code" Version="1.4.0">
+  <CodePackage Name="Code" Version="1.4.1">
     <SetupEntryPoint>
       <ExeHost>
         <Program>SetupEntryPoint.bat</Program>
@@ -27,7 +27,7 @@
 
   <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
        independently-updateable and versioned set of custom configuration settings for your service. -->
-  <ConfigPackage Name="Config" Version="1.4.0" />
+  <ConfigPackage Name="Config" Version="1.4.1" />
 
   <Resources>
     <Endpoints>

diff --git a/...nApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml b/...nApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="PatchOrchestrationApplicationType" ApplicationTypeVersion="1.4.0" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="PatchOrchestrationApplicationType" ApplicationTypeVersion="1.4.1" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
     <Parameter Name="CoordinatorService_MinReplicaSetSize" DefaultValue="3" />
     <Parameter Name="CoordinatorService_TargetReplicaSetSize" DefaultValue="3" />
@@ -49,7 +49,7 @@
        should match the Name and Version attributes of the ServiceManifest element defined in the 
        ServiceManifest.xml file. -->
   <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="CoordinatorServicePkg" ServiceManifestVersion="1.4.0" />
+    <ServiceManifestRef ServiceManifestName="CoordinatorServicePkg" ServiceManifestVersion="1.4.1" />
     <ConfigOverrides>
       <ConfigOverride Name="Config">
         <Settings>
@@ -62,7 +62,7 @@
     </ConfigOverrides>
   </ServiceManifestImport>
   <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="NodeAgentServicePkg" ServiceManifestVersion="1.4.0" />
+    <ServiceManifestRef ServiceManifestName="NodeAgentServicePkg" ServiceManifestVersion="1.4.1" />
     <ConfigOverrides>
       <ConfigOverride Name="Config">
         <Settings>

diff --git a/...cation/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj b/...cation/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Configuration">
     <Id>ServiceFabric.PatchOrchestrationApplication</Id>
     <Title>ServiceFabric.PatchOrchestrationApplication</Title>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <Authors>brkhande;raunakp</Authors>
     <Owners>brkhande;raunakp</Owners>
     <Description>This package contains Service Fabric Patch Orchestration Application.</Description>

diff --git 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.0",
+    $ApplicationVersion = "1.4.1",
 
     [hashtable]
     $ApplicationParameters = @{}

diff --git 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.0"
+    $ApplicationVersion = "1.4.1"
 )
 
 Remove-ServiceFabricApplication -ApplicationName fabric:/PatchOrchestrationApplication -Force

diff --git 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.0",
+    $ApplicationVersion = "1.4.1",
 
     [hashtable]
     $ApplicationParameters = @{},

diff --git 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.0";
+        private const string ApplicationVersion = "1.4.1";
 
         public TelemetryEvents(FabricClient fabricClient, ITelemetryEventSource eventSource)
         {