diff --git a/arm/template.json b/arm/template.json index 0fc9c99..88dfcb0 100644 --- a/arm/template.json +++ b/arm/template.json @@ -3,14 +3,14 @@ "contentVersion": "1.0.0.0", "parameters": { "appPackageUrl": { - "defaultValue": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.4.8/PatchOrchestrationApplication_v1.4.8.sfpkg", + "defaultValue": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.4.9/PatchOrchestrationApplication_v1.4.9.sfpkg", "metadata": { "description": "The URL to the application package sfpkg file. example: https://github.com/microsoft/Service-Fabric-POA/releases/download/{{version}}/PatchOrchestrationApplication_{{version}}.sfpkg" }, "type": "String" }, "applicationTypeVersion": { - "defaultValue": "1.4.8", + "defaultValue": "1.4.9", "metadata": { "description": "The application type version." }, diff --git a/arm/template.parameters.json b/arm/template.parameters.json index 350e874..14232c6 100644 --- a/arm/template.parameters.json +++ b/arm/template.parameters.json @@ -3,10 +3,10 @@ "contentVersion": "1.0.0.0", "parameters": { "appPackageUrl": { - "value": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.4.8/PatchOrchestrationApplication_v1.4.8.sfpkg" + "value": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.4.9/PatchOrchestrationApplication_v1.4.9.sfpkg" }, "applicationTypeVersion": { - "value": "1.4.8" + "value": "1.4.9" }, "clusterName": { "value": "{{cluster name}}" diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/CoordinatorService.csproj b/src/PatchOrchestrationApplication/CoordinatorService/src/CoordinatorService.csproj index 9b1f3cf..24bfc27 100644 --- a/src/PatchOrchestrationApplication/CoordinatorService/src/CoordinatorService.csproj +++ b/src/PatchOrchestrationApplication/CoordinatorService/src/CoordinatorService.csproj @@ -13,29 +13,30 @@ true - - - - - - - - - - - + + + + + + + + + + + - + - - + + - + + diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml b/src/PatchOrchestrationApplication/CoordinatorService/src/PackageRoot/ServiceManifest.xml index 69d61ee..7cfe712 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/Properties/AssemblyInfo.cs b/src/PatchOrchestrationApplication/CoordinatorService/src/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..9c650f8 --- /dev/null +++ b/src/PatchOrchestrationApplication/CoordinatorService/src/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Microsoft.ServiceFabric.PatchOrchestration.CoordinatorService")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Inc.")] +[assembly: AssemblyProduct("Microsoft.ServiceFabric.PatchOrchestration.CoordinatorService")] +[assembly: AssemblyCopyright("Copyright © Microsoft Inc. 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("bbbc23a5-1439-4fbf-84e1-c26c23d4aec1")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.4.9")] +[assembly: AssemblyFileVersion("1.4.9")] diff --git a/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs b/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs index bbb1ddd..3460478 100644 --- a/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs +++ b/src/PatchOrchestrationApplication/CoordinatorService/src/RepairManagerHelper.cs @@ -124,11 +124,19 @@ internal async Task CheckRepairManagerStatus(CancellationToken cancellatio /// List of repair tasks in claimed state private async Task> GetClaimedRepairTasks(NodeList nodeList, CancellationToken cancellationToken) { + IList repairTasks = new List(); - IList repairTasks = await this.fabricClient.RepairManager.GetRepairTaskListAsync(TaskIdPrefix, - RepairTaskStateFilter.Claimed, - ExecutorName, this.DefaultTimeoutForOperation, cancellationToken); - + try + { + repairTasks = await this.fabricClient.RepairManager.GetRepairTaskListAsync(TaskIdPrefix, + RepairTaskStateFilter.Claimed, + ExecutorName, this.DefaultTimeoutForOperation, cancellationToken); + } + catch ( Exception ex) + { + ServiceEventSource.Current.VerboseMessage("Exception occured in fetching Repair Tasks from Fabric in GetClaimedRepairTasks. Exception- {0}", ex); + } + int claimedRepairTaskCount = repairTasks.Count; IList selectedRepairTasks = new List(); @@ -180,9 +188,18 @@ private async Task> GetClaimedRepairTasks(NodeList nodeList, C private async Task> GetCompletedRepairTasks(NodeList nodeList, CancellationToken cancellationToken) { - IList repairTasks = await this.fabricClient.RepairManager.GetRepairTaskListAsync(TaskIdPrefix, + IList repairTasks = new List(); + + try + { + repairTasks = await this.fabricClient.RepairManager.GetRepairTaskListAsync(TaskIdPrefix, RepairTaskStateFilter.Completed, ExecutorName, this.DefaultTimeoutForOperation, cancellationToken); + } + catch (Exception ex) + { + ServiceEventSource.Current.VerboseMessage("Exception occured in fetching Repair Tasks from Fabric in GetCompletedRepairTasks. Exception- {0}", ex); + } return repairTasks; } diff --git a/src/PatchOrchestrationApplication/NodeAgentNTService/src/NodeAgentNTService.csproj b/src/PatchOrchestrationApplication/NodeAgentNTService/src/NodeAgentNTService.csproj index e267098..1cb9279 100644 --- a/src/PatchOrchestrationApplication/NodeAgentNTService/src/NodeAgentNTService.csproj +++ b/src/PatchOrchestrationApplication/NodeAgentNTService/src/NodeAgentNTService.csproj @@ -37,6 +37,7 @@ + diff --git a/src/PatchOrchestrationApplication/NodeAgentNTService/src/Properties/AssemblyInfo.cs b/src/PatchOrchestrationApplication/NodeAgentNTService/src/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..8321a97 --- /dev/null +++ b/src/PatchOrchestrationApplication/NodeAgentNTService/src/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Microsoft.ServiceFabric.PatchOrchestration.NodeAgentNTService")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Inc.")] +[assembly: AssemblyProduct("Microsoft.ServiceFabric.PatchOrchestration.NodeAgentNTService")] +[assembly: AssemblyCopyright("Copyright © Microsoft Inc. 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("223c284c-5930-453e-89c0-0be1fdea4c04")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.4.9")] +[assembly: AssemblyFileVersion("1.4.9")] diff --git a/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtility.csproj b/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtility.csproj index 37c620c..c713cfa 100644 --- a/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtility.csproj +++ b/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtility.csproj @@ -14,12 +14,13 @@ - - - + + + + diff --git a/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtilityDll.csproj b/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtilityDll.csproj index 0d66613..33e7ea1 100644 --- a/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtilityDll.csproj +++ b/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/NodeAgentSFUtilityDll.csproj @@ -17,11 +17,11 @@ - - - - - + + + + + @@ -42,5 +42,8 @@ + + + \ No newline at end of file diff --git a/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/Properties/AssemblyInfo.cs b/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..7d723a8 --- /dev/null +++ b/src/PatchOrchestrationApplication/NodeAgentSFUtility/src/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Microsoft.ServiceFabric.PatchOrchestration.NodeAgentSFUtility")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Inc.")] +[assembly: AssemblyProduct("Microsoft.ServiceFabric.PatchOrchestration.NodeAgentSFUtility")] +[assembly: AssemblyCopyright("Copyright © Microsoft Inc. 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("26069ca9-6b35-49f2-9775-23949a01394e")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.4.9")] +[assembly: AssemblyFileVersion("1.4.9")] diff --git a/src/PatchOrchestrationApplication/NodeAgentService/src/NodeAgentService.csproj b/src/PatchOrchestrationApplication/NodeAgentService/src/NodeAgentService.csproj index b8d5eb6..3f4d9fe 100644 --- a/src/PatchOrchestrationApplication/NodeAgentService/src/NodeAgentService.csproj +++ b/src/PatchOrchestrationApplication/NodeAgentService/src/NodeAgentService.csproj @@ -28,6 +28,7 @@ + diff --git a/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml b/src/PatchOrchestrationApplication/NodeAgentService/src/PackageRoot/ServiceManifest.xml index 4973092..317b9b2 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/NodeAgentService/src/Properties/AssemblyInfo.cs b/src/PatchOrchestrationApplication/NodeAgentService/src/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..1f47479 --- /dev/null +++ b/src/PatchOrchestrationApplication/NodeAgentService/src/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Microsoft.ServiceFabric.PatchOrchestration.NodeAgentService")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft Inc.")] +[assembly: AssemblyProduct("Microsoft.ServiceFabric.PatchOrchestration.NodeAgentService")] +[assembly: AssemblyCopyright("Copyright © Microsoft Inc. 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("6d1f2fa9-23e5-4153-9558-de376d7a65cd")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.4.9")] +[assembly: AssemblyFileVersion("1.4.9")] diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml index a15515e..20d4e58 100644 --- a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml +++ b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/ApplicationPackageRoot/ApplicationManifest.xml @@ -1,5 +1,5 @@  - + @@ -54,7 +54,7 @@ should match the Name and Version attributes of the ServiceManifest element defined in the ServiceManifest.xml file. --> - + @@ -68,7 +68,7 @@ - + diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/NugetPackage/PatchOrchestrationApplicationPkg.nuproj index 9ce2cc5..1b5e27c 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.8 + 1.4.9 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 e9a8fa1..19cbd1a 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.8", + $ApplicationVersion = "1.4.9", [hashtable] $ApplicationParameters = @{} diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Undeploy.ps1 b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Undeploy.ps1 index b84924d..e0a0fa2 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.8" + $ApplicationVersion = "1.4.9" ) Remove-ServiceFabricApplication -ApplicationName fabric:/PatchOrchestrationApplication -Force diff --git a/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Upgrade.ps1 b/src/PatchOrchestrationApplication/PatchOrchestrationApplication/Scripts/Upgrade.ps1 index ce6f382..0bbed46 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.8", + $ApplicationVersion = "1.4.9", [hashtable] $ApplicationParameters = @{}, diff --git a/src/PatchOrchestrationApplication/TelemetryLib/src/Properties/AssemblyInfo.cs b/src/PatchOrchestrationApplication/TelemetryLib/src/Properties/AssemblyInfo.cs index 5cd0c0b..906989e 100644 --- a/src/PatchOrchestrationApplication/TelemetryLib/src/Properties/AssemblyInfo.cs +++ b/src/PatchOrchestrationApplication/TelemetryLib/src/Properties/AssemblyInfo.cs @@ -13,7 +13,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("TelemetryLib")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.4.9")] +[assembly: AssemblyFileVersion("1.4.9")] diff --git a/src/PatchOrchestrationApplication/TelemetryLib/src/TelemetryEvents.cs b/src/PatchOrchestrationApplication/TelemetryLib/src/TelemetryEvents.cs index 3686c1e..b835551 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.8"; + private const string ApplicationVersion = "1.4.9"; public TelemetryEvents(FabricClient fabricClient, ITelemetryEventSource eventSource) { diff --git a/src/properties/common.props b/src/properties/common.props index b70bfaa..805af2a 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.8 + 1.4.9 Microsoft