Merge branch 'develop' into user/kumarnaresh/plugin_hot_reload_2
This commit is contained in:
Naresh Kumar
GitHub
Коммит
59daa8db56
|
|
@ -23,11 +23,11 @@ function Build-SFPkg {
|
|||
try {
|
||||
Push-Location $scriptPath
|
||||
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.SelfContained.1.2.13" "$scriptPath\bin\release\FabricHealer\linux-x64\self-contained\FabricHealerType"
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.FrameworkDependent.1.2.13" "$scriptPath\bin\release\FabricHealer\linux-x64\framework-dependent\FabricHealerType"
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.SelfContained.1.2.14" "$scriptPath\bin\release\FabricHealer\linux-x64\self-contained\FabricHealerType"
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.FrameworkDependent.1.2.14" "$scriptPath\bin\release\FabricHealer\linux-x64\framework-dependent\FabricHealerType"
|
||||
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.2.13" "$scriptPath\bin\release\FabricHealer\win-x64\self-contained\FabricHealerType"
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.FrameworkDependent.1.2.13" "$scriptPath\bin\release\FabricHealer\win-x64\framework-dependent\FabricHealerType"
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.2.14" "$scriptPath\bin\release\FabricHealer\win-x64\self-contained\FabricHealerType"
|
||||
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.FrameworkDependent.1.2.14" "$scriptPath\bin\release\FabricHealer\win-x64\framework-dependent\FabricHealerType"
|
||||
}
|
||||
finally {
|
||||
Pop-Location
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
},
|
||||
"applicationTypeVersionFabricHealer": {
|
||||
"type": "string",
|
||||
"defaultValue": "1.2.13",
|
||||
"defaultValue": "1.2.14",
|
||||
"metadata": {
|
||||
"description": "Provide the app version number of FabricHealer. This must be identical to the version specified in the sfpkg."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"value": "<YOUR-CLUSTER-RESOURCE-NAME>"
|
||||
},
|
||||
"applicationTypeVersionFabricHealer": {
|
||||
"value": "1.2.13"
|
||||
"value": "1.2.14"
|
||||
},
|
||||
"packageUrlFabricHealer": {
|
||||
"value": "<PUBLIC-ACCESSIBLE-URL-FOR-FABRICHEALER-SFPKG>"
|
||||
|
|
@ -18,7 +18,7 @@ As with most of FabricHealer's application settings, you can also do this with a
|
|||
Connect-ServiceFabricCluster ...
|
||||
|
||||
$appName = "fabric:/FabricHealer"
|
||||
$appVersion = "1.2.13"
|
||||
$appVersion = "1.2.14"
|
||||
$application = Get-ServiceFabricApplication -ApplicationName $appName
|
||||
$appParamCollection = $application.ApplicationParameters
|
||||
$applicationParameterMap = @{}
|
||||
|
|
@ -56,7 +56,7 @@ Here is a full example of exactly what is sent in one of these telemetry events,
|
|||
"ClusterId": "00000000-1111-1111-0000-00f00d000d",
|
||||
"ClusterType": "SFRP",
|
||||
"NodeNameHash": "3e83569d4c6aad78083cd081215dafc81e5218556b6a46cb8dd2b183ed0095ad",
|
||||
"FHVersion": "1.2.13",
|
||||
"FHVersion": "1.2.14",
|
||||
"UpTime": "00:00:00.2164523",
|
||||
"Timestamp": "2023-09-14T21:45:25.2443014Z",
|
||||
"OS": "Windows",
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ For example:
|
|||
``` PowerShell
|
||||
|
||||
$appName = "fabric:/FabricHealer"
|
||||
$appVersion = "1.2.13"
|
||||
$appVersion = "1.2.14"
|
||||
|
||||
$myApplication = Get-ServiceFabricApplication -ApplicationName $appName
|
||||
$appParamCollection = $myApplication.ApplicationParameters
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
|
||||
<metadata minClientVersion="3.3.0">
|
||||
<id>%PACKAGE_ID%</id>
|
||||
<version>1.2.13</version>
|
||||
<version>1.2.14</version>
|
||||
<releaseNotes>
|
||||
- Added ability for customer to have predicate plugin support in FH and perform custom repairs
|
||||
- Added an api that can be used by plugins to access inmemory health events
|
||||
- This new version also contains newly properly signed binaries.
|
||||
- Updated Dependencies
|
||||
</releaseNotes>
|
||||
<authors>Microsoft</authors>
|
||||
<license type="expression">MIT</license>
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
|||
Documentation\OperationalTelemetry.md = Documentation\OperationalTelemetry.md
|
||||
README.md = README.md
|
||||
Documentation\Deployment\service-fabric-healer.json = Documentation\Deployment\service-fabric-healer.json
|
||||
Documentation\Deployment\service-fabric-healer.v1.2.13.parameters.json = Documentation\Deployment\service-fabric-healer.v1.2.13.parameters.json
|
||||
Documentation\Using.md = Documentation\Using.md
|
||||
Documentation\Deployment\service-fabric-healer.v1.2.14.parameters.json = Documentation\Deployment\service-fabric-healer.v1.2.14.parameters.json
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FHTest", "FHTest\FHTest.csproj", "{8D9712BF-C026-4A36-B6D1-6345137D3B6F}"
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
|
||||
<RuntimeIdentifiers>linux-x64;win-x64</RuntimeIdentifiers>
|
||||
<Product>FabricHealer</Product>
|
||||
<Version>1.2.13</Version>
|
||||
<FileVersion>1.2.13</FileVersion>
|
||||
<Version>1.2.14</Version>
|
||||
<FileVersion>1.2.14</FileVersion>
|
||||
<StartupObject>FabricHealer.Program</StartupObject>
|
||||
<Platforms>x64</Platforms>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ namespace FabricHealer
|
|||
private DateTime LastTelemetrySendDate { get; set; }
|
||||
|
||||
// Folks often use their own version numbers. This is for public diagnostic telemetry.
|
||||
private const string InternalVersionNumber = "1.2.13";
|
||||
private const string InternalVersionNumber = "1.2.14";
|
||||
private static FabricClient fabricClient;
|
||||
private bool disposedValue;
|
||||
private bool detectedStopJob;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ The plugin model for FabricHealer (FH) allows for a customer to hook a plugin to
|
|||
1. Create a .NET 6 Library project.
|
||||
|
||||
2. Install the Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained NuGet package from https://www.nuget.org/profiles/ServiceFabricApps as the version of FabricHealer you are deploying.
|
||||
E.g., 1.2.13 if you are going to deploy FH 1.2.13.
|
||||
E.g., 1.2.14 if you are going to deploy FH 1.2.14.
|
||||
|
||||
|
||||
3. Write a custom worker!
|
||||
|
|
@ -43,5 +43,5 @@ cd C:\Users\me\source\repos\service-fabric-healer
|
|||
./Build-FabricHealer
|
||||
./Build-NugetPackages
|
||||
|
||||
The output from the above commands contains FabricHealer platform-specific nupkgs and a package you have to use for plugin authoring named Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.2.13.nupkg. Nupkg files from above command would be located in
|
||||
The output from the above commands contains FabricHealer platform-specific nupkgs and a package you have to use for plugin authoring named Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.2.14.nupkg. Nupkg files from above command would be located in
|
||||
C:\Users\me\source\repos\service-fabric-healer\bin\release\FabricHealer\Nugets.
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
1. Create a .NET 6 Library project.
|
||||
|
||||
2. Install the Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained NuGet package from https://www.nuget.org/profiles/ServiceFabricApps as the version of FabricHealer you are deploying.
|
||||
E.g., 1.2.13 if you are going to deploy FH 1.2.13.
|
||||
E.g., 1.2.14 if you are going to deploy FH 1.2.14.
|
||||
|
||||
3. Write a custom repair class!
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ cd C:\Users\me\source\repos\service-fabric-healer
|
|||
./Build-FabricHealer
|
||||
./Build-NugetPackages
|
||||
|
||||
The output from the above commands contains FabricHealer platform-specific nupkgs and a package you have to use for plugin authoring named Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.2.13.nupkg. Nupkg files from above command would be located in
|
||||
The output from the above commands contains FabricHealer platform-specific nupkgs and a package you have to use for plugin authoring named Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.2.14.nupkg. Nupkg files from above command would be located in
|
||||
C:\Users\me\source\repos\service-fabric-healer\bin\release\FabricHealer\Nugets.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ServiceManifest Name="FabricHealerPkg"
|
||||
Version="1.2.13"
|
||||
Version="1.2.14"
|
||||
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.2.13">
|
||||
<CodePackage Name="Code" Version="1.2.14">
|
||||
<EntryPoint>
|
||||
<ExeHost>
|
||||
<Program>FabricHealer</Program>
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
<!-- Config package is the contents of the Config directory under PackageRoot that contains an
|
||||
independently-updateable and versioned set of custom configuration settings for your service. -->
|
||||
<ConfigPackage Name="Config" Version="1.2.13" />
|
||||
<ConfigPackage Name="Config" Version="1.2.14" />
|
||||
|
||||
<DataPackage Name="Data" Version="1.2.13" />
|
||||
<DataPackage Name="Data" Version="1.2.14" />
|
||||
</ServiceManifest>
|
||||
|
|
@ -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="FabricHealerType" ApplicationTypeVersion="1.2.13" 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="FabricHealerType" ApplicationTypeVersion="1.2.14" xmlns="http://schemas.microsoft.com/2011/01/fabric">
|
||||
<Parameters>
|
||||
<!-- FabricHealerManager Settings -->
|
||||
<Parameter Name="AutoMitigationEnabled" DefaultValue="true" />
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
should match the Name and Version attributes of the ServiceManifest element defined in the
|
||||
ServiceManifest.xml file. -->
|
||||
<ServiceManifestImport>
|
||||
<ServiceManifestRef ServiceManifestName="FabricHealerPkg" ServiceManifestVersion="1.2.13" />
|
||||
<ServiceManifestRef ServiceManifestName="FabricHealerPkg" ServiceManifestVersion="1.2.14" />
|
||||
<ConfigOverrides>
|
||||
<ConfigOverride Name="Config">
|
||||
<Settings>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# FabricHealerProxy 1.0.4
|
||||
# FabricHealerProxy 1.0.5
|
||||
|
||||
FabricHealerProxy is a .NET 6 library that provides a very simple and reliable way for any .NET Service Fabric service to initiate Service Fabric entity repair by the FabricHealer service running in the same cluster. It is assumed that you have experience with FabricHealer and understand how to use it.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
|
||||
<metadata minClientVersion="3.3.0">
|
||||
<id>%PACKAGE_ID%</id>
|
||||
<version>1.0.4</version>
|
||||
<version>1.0.5</version>
|
||||
<releaseNotes>
|
||||
- Code improvements.
|
||||
- This new version contains newly properly signed binaries
|
||||
- Updated dependencies.
|
||||
</releaseNotes>
|
||||
<authors>Microsoft</authors>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<TargetLatestRuntimePatch>True</TargetLatestRuntimePatch>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
<Platforms>x64</Platforms>
|
||||
<FileVersion>1.0.4</FileVersion>
|
||||
<FileVersion>1.0.5</FileVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# FabricHealerProxy 1.0.4
|
||||
# FabricHealerProxy 1.0.5
|
||||
|
||||
FabricHealerProxy is a .NET 6 library that provides a very simple and reliable way for any .NET Service Fabric service to initiate Service Fabric entity repair by the FabricHealer service running in the same cluster. You can install FabricHealerProxy into your .NET Service Fabric service from the [nuget.org package gallery](https://www.nuget.org/packages/Microsoft.ServiceFabricApps.FabricHealerProxy).
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## FabricHealer 1.2.13
|
||||
## FabricHealer 1.2.14
|
||||
### Service Fabric Auto-Repair Service with Declarative Logic for Repair Policy Specification.
|
||||
|
||||
[](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fservice-fabric-healer%2Fmain%2FDocumentation%2FDeployment%2Fservice-fabric-healer.json)
|
||||
|
|
@ -80,7 +80,7 @@ Register-ServiceFabricApplicationType -ApplicationPathInImageStore FH127
|
|||
|
||||
#Create FO application (if not already deployed at lesser version):
|
||||
|
||||
New-ServiceFabricApplication -ApplicationName fabric:/FabricHealer -ApplicationTypeName FabricHealerType -ApplicationTypeVersion 1.2.13
|
||||
New-ServiceFabricApplication -ApplicationName fabric:/FabricHealer -ApplicationTypeName FabricHealerType -ApplicationTypeVersion 1.2.14
|
||||
|
||||
#Create the Service instance:
|
||||
|
||||
|
|
@ -89,7 +89,7 @@ New-ServiceFabricService -Stateless -PartitionSchemeSingleton -ApplicationName f
|
|||
|
||||
#OR if updating existing version:
|
||||
|
||||
Start-ServiceFabricApplicationUpgrade -ApplicationName fabric:/FabricHealer -ApplicationTypeVersion 1.2.13 -Monitored -FailureAction rollback
|
||||
Start-ServiceFabricApplicationUpgrade -ApplicationName fabric:/FabricHealer -ApplicationTypeVersion 1.2.14 -Monitored -FailureAction rollback
|
||||
```
|
||||
|
||||
## Using FabricHealer
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## FabricHealer 1.2.13
|
||||
## FabricHealer 1.2.14
|
||||
### Configuration as Logic and auto-mitigation in Service Fabric clusters
|
||||
|
||||
FabricHealer (FH) is a .NET 6 Service Fabric application that attempts to automatically fix a set of reliably solvable problems that can take place in Service Fabric
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче