microsoft
/
service-fabric-healer
зеркало из https://github.com/microsoft/service-fabric-healer.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

tested build 1.1.11

This commit is contained in:
Charles Torre 2023-02-02 12:52:27 -08:00
Родитель 46780fde92
Коммит f2be753299
14 изменённых файлов: 26 добавлений и 41 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
Build-SFPKGs.ps1
Просмотреть файл

@ -23,11 +23,11 @@ function Build-SFPkg {
try {
Push-Location $scriptPath
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.SelfContained.1.1.10" "$scriptPath\bin\release\FabricHealer\linux-x64\self-contained\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.FrameworkDependent.1.1.10" "$scriptPath\bin\release\FabricHealer\linux-x64\framework-dependent\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.SelfContained.1.1.11" "$scriptPath\bin\release\FabricHealer\linux-x64\self-contained\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Linux.FrameworkDependent.1.1.11" "$scriptPath\bin\release\FabricHealer\linux-x64\framework-dependent\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.1.10" "$scriptPath\bin\release\FabricHealer\win-x64\self-contained\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.FrameworkDependent.1.1.10" "$scriptPath\bin\release\FabricHealer\win-x64\framework-dependent\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.SelfContained.1.1.11" "$scriptPath\bin\release\FabricHealer\win-x64\self-contained\FabricHealerType"
Build-SFPkg "Microsoft.ServiceFabricApps.FabricHealer.Windows.FrameworkDependent.1.1.11" "$scriptPath\bin\release\FabricHealer\win-x64\framework-dependent\FabricHealerType"
}
finally {
Pop-Location

2
Documentation/Deployment/service-fabric-healer.json
Просмотреть файл

@ -11,7 +11,7 @@
},
"applicationTypeVersionFabricHealer": {
"type": "string",
"defaultValue": "1.1.10",
"defaultValue": "1.1.11",
"metadata": {
"description": "Provide the app version number of FabricHealer. This must be identical to the version specified in the sfpkg."
}

2
Documentation/Deployment/service-fabric-healer.v1.1.10.parameters.json → Documentation/Deployment/service-fabric-healer.v1.1.11.parameters.json
Просмотреть файл

@ -6,7 +6,7 @@
"value": "<YOUR-CLUSTER-RESOURCE-NAME>"
},
"applicationTypeVersionFabricHealer": {
"value": "1.1.10"
"value": "1.1.11"
},
"packageUrlFabricHealer": {
"value": "<PUBLIC-ACCESSIBLE-URL-FOR-FABRICHEALER-SFPKG>"

2
FHTest/FHTest.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Platforms>AnyCPU;x64</Platforms>
<Platforms>x64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>

2
FabricHealer.nuspec.template
Просмотреть файл

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="3.3.0">
<id>%PACKAGE_ID%</id>
<version>1.1.10</version>
<version>1.1.11</version>
<releaseNotes>
This release requires Service Fabric runtime version 9 and higher and at least Service Fabric SDK version 6.0.1017. There are several changes and improvements in this
release including a new machine repair model, updated logic rules, bug fixes, and many code improvements.

2
FabricHealer.sln
Просмотреть файл

@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
Documentation\Deployment\service-fabric-healer.json = Documentation\Deployment\service-fabric-healer.json
Documentation\Using.md = Documentation\Using.md
Documentation\Deployment\service-fabric-healer.v1.1.10.parameters.json = Documentation\Deployment\service-fabric-healer.v1.1.10.parameters.json
Documentation\Deployment\service-fabric-healer.v1.1.11.parameters.json = Documentation\Deployment\service-fabric-healer.v1.1.11.parameters.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FHTest", "FHTest\FHTest.csproj", "{8D9712BF-C026-4A36-B6D1-6345137D3B6F}"

21
FabricHealer/FabricHealer.csproj
Просмотреть файл

@ -1,13 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{9A19103F-16F7-4668-BE54-9A1E7A4F7556}</ProjectGuid>
<RootNamespace>FabricHealer</RootNamespace>
<AssemblyName>FabricHealer</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<Nullable>disable</Nullable>
<IsServiceFabricServiceProject>True</IsServiceFabricServiceProject>
<ServerGarbageCollection>False</ServerGarbageCollection>
<TargetLatestRuntimePatch>False</TargetLatestRuntimePatch>
<OutputType>Exe</OutputType>
<!-- ***NOTE***:
If deploying to SF cluster directly from Visual Studio, you must use single target RID.
@ -15,27 +12,17 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier>-->
<RuntimeIdentifiers>linux-x64;win-x64</RuntimeIdentifiers>
<Product>FabricHealer</Product>
<Version>1.1.10</Version>
<FileVersion>1.1.10</FileVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Version>1.1.11</Version>
<FileVersion>1.1.11</FileVersion>
<StartupObject>FabricHealer.Program</StartupObject>
<SignAssembly>false</SignAssembly>
<DelaySign>false</DelaySign>
<NoWarn>CA1822;$(NoWarn)</NoWarn>
<ResolveComReferenceSilent>true</ResolveComReferenceSilent>
<Platforms>AnyCPU;x64</Platforms>
<Platforms>x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Microsoft.Logic.Guan" Version="1.0.4" />
<PackageReference Include="Microsoft.ServiceFabric.Services" Version="6.0.1017" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="Octokit" Version="5.0.0" />
<PackageReference Include="System.Configuration.Abstractions" Version="2.0.2.45" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TelemetryLib\TelemetryLib.csproj" />

2
FabricHealer/FabricHealerManager.cs
Просмотреть файл

@ -31,7 +31,7 @@ namespace FabricHealer
internal static StatelessServiceContext ServiceContext;
// Folks often use their own version numbers. This is for internal diagnostic telemetry.
private const string InternalVersionNumber = "1.1.10";
private const string InternalVersionNumber = "1.1.11";
private static FabricHealerManager singleton;
private static FabricClient _fabricClient;
private bool disposedValue;

6
FabricHealer/PackageRoot/ServiceManifest.xml
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ServiceManifest Name="FabricHealerPkg"
Version="1.1.10"
Version="1.1.11"
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.1.10">
<CodePackage Name="Code" Version="1.1.11">
<EntryPoint>
<ExeHost>
<Program>FabricHealer</Program>
@ -21,5 +21,5 @@
<!-- 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.1.10" />
<ConfigPackage Name="Config" Version="1.1.11" />
</ServiceManifest>

4
FabricHealer/Repair/RepairTaskEngine.cs
Просмотреть файл

@ -233,7 +233,7 @@ namespace FabricHealer.Repair
{
foreach (RepairTask repair in activeRepairs)
{
// This would mean that the job has node-level impact and its state is at least Approved.
// This would mean that the job has node-level Impact and its state is at least Approved.
if (repair.Impact is NodeRepairImpactDescription impact)
{
if (!impact.ImpactedNodes.Any(
@ -246,7 +246,7 @@ namespace FabricHealer.Repair
return true;
}
// State == Created/Claimed if we get here.
// State == Created/Claimed if we get here (there is no Impact established yet).
if (repair.Target is NodeRepairTargetDescription target)
{
if (!target.Nodes.Any(n => n == repairData.NodeName))

4
FabricHealerApp/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="FabricHealerType" ApplicationTypeVersion="1.1.10" 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.1.11" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<Parameters>
<!-- FabricHealerManager Settings -->
<Parameter Name="AutoMitigationEnabled" DefaultValue="true" />
@ -30,7 +30,7 @@
should match the Name and Version attributes of the ServiceManifest element defined in the
ServiceManifest.xml file. -->
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="FabricHealerPkg" ServiceManifestVersion="1.1.10" />
<ServiceManifestRef ServiceManifestName="FabricHealerPkg" ServiceManifestVersion="1.1.11" />
<ConfigOverrides>
<ConfigOverride Name="Config">
<Settings>

6
README.md
Просмотреть файл

@ -1,4 +1,4 @@
## FabricHealer 1.1.10
## FabricHealer 1.1.11
### 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
@ -78,7 +78,7 @@ Register-ServiceFabricApplicationType -ApplicationPathInImageStore FH1110
#Create FO application (if not already deployed at lesser version):
New-ServiceFabricApplication -ApplicationName fabric:/FabricHealer -ApplicationTypeName FabricHealerType -ApplicationTypeVersion 1.1.10
New-ServiceFabricApplication -ApplicationName fabric:/FabricHealer -ApplicationTypeName FabricHealerType -ApplicationTypeVersion 1.1.11
#Create the Service instance:
@ -87,7 +87,7 @@ New-ServiceFabricService -Stateless -PartitionSchemeSingleton -ApplicationName f
#OR if updating existing version:
Start-ServiceFabricApplicationUpgrade -ApplicationName fabric:/FabricHealer -ApplicationTypeVersion 1.1.10 -Monitored -FailureAction rollback
Start-ServiceFabricApplicationUpgrade -ApplicationName fabric:/FabricHealer -ApplicationTypeVersion 1.1.11 -Monitored -FailureAction rollback
```
## Using FabricHealer

4
TelemetryLib/TelemetryLib.csproj
Просмотреть файл

@ -11,12 +11,10 @@
<FileVersion>2.1.0.0</FileVersion>
<Copyright>Copyright © 2020</Copyright>
<Product>TelemetryLib</Product>
<Platforms>AnyCPU;x64</Platforms>
<Platforms>x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Microsoft.ServiceFabric.Services" Version="6.0.1017" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
</Project>

2
fhnuget.md
Просмотреть файл

@ -1,4 +1,4 @@
## FabricHealer 1.1.10
## FabricHealer 1.1.11
### 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