update: page and block size

anup-kodlekere · Jan 23, 2025 · d690ecf · d690ecf
1 parent d3e2f63
commit d690ecf
Showing 1 changed file with 89 additions and 85 deletions.
diff --git a/patches/runner-main-sdk8-ppc64le.patch b/patches/runner-main-sdk8-ppc64le.patch
@@ -1,5 +1,5 @@
 diff --git a/src/Directory.Build.props b/src/Directory.Build.props
-index 9db5faca..706cafce 100644
+index 9c069b12..d26b0dc2 100644
 --- a/src/Directory.Build.props
 +++ b/src/Directory.Build.props
 @@ -44,6 +44,12 @@
@@ -109,20 +109,43 @@ index 2c20d1b1..63957a5d 100644
  #else
              public static readonly Architecture PlatformArchitecture = Architecture.X64;
  #endif
+diff --git a/src/Runner.Common/Logging.cs b/src/Runner.Common/Logging.cs
+index 9200ca59..b9fe1415 100644
+--- a/src/Runner.Common/Logging.cs
++++ b/src/Runner.Common/Logging.cs
+@@ -18,14 +18,14 @@ namespace GitHub.Runner.Common
+     {
+         public static string PagingFolder = "pages";
+
+-        // 8 MB
+-        public const int PageSize = 8 * 1024 * 1024;
++        // 64 MB
++        public const int PageSize = 64 * 1024 * 1024;
+
+         // For Results
+         public static string BlocksFolder = "blocks";
+
+-        // 2 MB
+-        public const int BlockSize = 2 * 1024 * 1024;
++        // 16 MB
++        public const int BlockSize = 16 * 1024 * 1024;
+
+         private Guid _timelineId;
+         private Guid _timelineRecordId;
 diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj
-index 6c463562..e2796ffa 100644
+index 6c463562..25fea7c5 100644
 --- a/src/Runner.Common/Runner.Common.csproj
 +++ b/src/Runner.Common/Runner.Common.csproj
-@@ -7,6 +7,9 @@
-     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-     <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
-     <Version>$(Version)</Version>
+@@ -4,6 +4,9 @@
+     <TargetFramework>net8.0</TargetFramework>
+     <OutputType>Library</OutputType>
+     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
 +    <SelfContained>true</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-   </PropertyGroup>
-
-   <ItemGroup>
+     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+     <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+     <Version>$(Version)</Version>
 diff --git a/src/Runner.Common/Util/VarUtil.cs b/src/Runner.Common/Util/VarUtil.cs
 index 97273a1a..78f78701 100644
 --- a/src/Runner.Common/Util/VarUtil.cs
@@ -139,98 +162,85 @@ index 97273a1a..78f78701 100644
                          throw new NotSupportedException(); // Should never reach here.
                  }
 diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj
-index afd52812..ecc1c74d 100644
+index afd52812..bce46ad9 100644
 --- a/src/Runner.Listener/Runner.Listener.csproj
 +++ b/src/Runner.Listener/Runner.Listener.csproj
-@@ -10,6 +10,9 @@
-     <Version>$(Version)</Version>
-     <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
-     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-+    <SelfContained>true</SelfContained>
+@@ -5,6 +5,8 @@
+     <OutputType>Exe</OutputType>
+     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+     <SelfContained>true</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-   </PropertyGroup>
-
-   <ItemGroup>
+     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+     <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+     <Version>$(Version)</Version>
 diff --git a/src/Runner.PluginHost/Runner.PluginHost.csproj b/src/Runner.PluginHost/Runner.PluginHost.csproj
-index 81a8d2e4..0bfdc45c 100644
+index 81a8d2e4..8e54320f 100644
 --- a/src/Runner.PluginHost/Runner.PluginHost.csproj
 +++ b/src/Runner.PluginHost/Runner.PluginHost.csproj
-@@ -10,6 +10,9 @@
-     <Version>$(Version)</Version>
-     <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
-     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-+    <SelfContained>true</SelfContained>
+@@ -5,6 +5,8 @@
+     <OutputType>Exe</OutputType>
+     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+     <SelfContained>true</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-   </PropertyGroup>
-
-   <ItemGroup>
+     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+     <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+     <Version>$(Version)</Version>
 diff --git a/src/Runner.Plugins/Runner.Plugins.csproj b/src/Runner.Plugins/Runner.Plugins.csproj
-index a786cf1c..600ea167 100644
+index a786cf1c..a5a839c5 100644
 --- a/src/Runner.Plugins/Runner.Plugins.csproj
 +++ b/src/Runner.Plugins/Runner.Plugins.csproj
-@@ -8,6 +8,9 @@
+@@ -5,6 +5,8 @@
+     <OutputType>Library</OutputType>
+     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+     <SelfContained>true</SelfContained>
++    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
++    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
      <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
      <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
      <Version>$(Version)</Version>
-+    <SelfContained>true</SelfContained>
-+    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
-+    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-   </PropertyGroup>
-
-   <ItemGroup>
 diff --git a/src/Runner.Sdk/Runner.Sdk.csproj b/src/Runner.Sdk/Runner.Sdk.csproj
-index 55dbf126..d40524f0 100644
+index 55dbf126..190b306f 100644
 --- a/src/Runner.Sdk/Runner.Sdk.csproj
 +++ b/src/Runner.Sdk/Runner.Sdk.csproj
-@@ -8,6 +8,9 @@
+@@ -5,6 +5,8 @@
+     <OutputType>Library</OutputType>
+     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+     <SelfContained>true</SelfContained>
++    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
++    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
      <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
      <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
      <Version>$(Version)</Version>
-+    <SelfContained>true</SelfContained>
-+    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
-+    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-   </PropertyGroup>
-
-   <ItemGroup>
 diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj
-index 53c1610d..d3382973 100644
+index 53c1610d..9e98b961 100644
 --- a/src/Runner.Worker/Runner.Worker.csproj
 +++ b/src/Runner.Worker/Runner.Worker.csproj
-@@ -10,6 +10,9 @@
-     <Version>$(Version)</Version>
-     <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
-     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
-+    <SelfContained>true</SelfContained>
+@@ -5,6 +5,8 @@
+     <OutputType>Exe</OutputType>
+     <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+     <SelfContained>true</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
 +    <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-   </PropertyGroup>
-
-   <ItemGroup>
+     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+     <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+     <Version>$(Version)</Version>
 diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
-index 7ba73949..156616cd 100644
+index 5f2c3fd5..bd0f7754 100644
 --- a/src/Sdk/Sdk.csproj
 +++ b/src/Sdk/Sdk.csproj
-@@ -11,6 +11,9 @@
-         <DefineConstants>TRACE</DefineConstants>
-         <LangVersion>8.0</LangVersion>
-         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+@@ -4,7 +4,9 @@
+         <TargetFramework>net8.0</TargetFramework>
+         <OutputType>Library</OutputType>
+         <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
+-        <!-- <SelfContained>true</SelfContained> -->
 +        <SelfContained>true</SelfContained>
 +        <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
 +        <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
-     </PropertyGroup>
-
-     <ItemGroup>
-@@ -18,7 +21,7 @@
-         <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
--        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
-+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
-         <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-         <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
-         <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
+         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+         <NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
+         <Version>$(Version)</Version>
 diff --git a/src/Test/L0/ConstantGenerationL0.cs b/src/Test/L0/ConstantGenerationL0.cs
 index f3c1b8f9..9a1c5aa0 100644
 --- a/src/Test/L0/ConstantGenerationL0.cs
@@ -293,21 +303,21 @@ index 47a5d334..6dbdfbb8 100644
          [Trait("Level", "L0")]
          [Trait("Category", "Worker")]
 diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
-index aebe2420..efd57870 100644
+index aebe2420..90e52e00 100644
 --- a/src/Test/Test.csproj
 +++ b/src/Test/Test.csproj
-@@ -4,6 +4,9 @@
+@@ -2,6 +2,9 @@
+     <PropertyGroup>
+         <TargetFramework>net8.0</TargetFramework>
          <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
-         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-         <NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
 +        <SelfContained>true</SelfContained>
 +        <SelfContained Condition="'$(PackageRuntime)' == 'linux-s390x'">false</SelfContained>
 +        <SelfContained Condition="'$(PackageRuntime)' == 'linux-ppc64le'">false</SelfContained>
+         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+         <NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
      </PropertyGroup>
-
-     <ItemGroup>
 diff --git a/src/dev.sh b/src/dev.sh
-index 795c135a..551ead3a 100755
+index 45c3a50c..4dc96f99 100755
 --- a/src/dev.sh
 +++ b/src/dev.sh
 @@ -54,6 +54,8 @@ elif [[ "$CURRENT_PLATFORM" == 'linux' ]]; then
@@ -360,10 +370,10 @@ index 795c135a..551ead3a 100755
  heading "Dotnet SDK Version"
  dotnet --version
 diff --git a/src/dir.proj b/src/dir.proj
-index 056a312e..1f6bdb07 100644
+index 056a312e..52cb25ca 100644
 --- a/src/dir.proj
 +++ b/src/dir.proj
-@@ -41,13 +41,22 @@
+@@ -41,8 +41,17 @@
      </ItemGroup>
 
      <Target Name="Build" DependsOnTargets="GenerateConstant">
@@ -376,16 +386,10 @@ index 056a312e..1f6bdb07 100644
 +                 Perform a non-self-contained publish using the current runtime identifier instead.
 +                 In addition, when not using an explicit runtime identifier, the SDK will copy runtime assets from dependent packages;
 +                 as this would confuse the expected layout, disable that behavior as well.  -->
-+            <PublishRuntimeIdentifier Condition="'$(PackageRuntime)' == 'linux-ppc64le' Or '$(PackageRuntime)' == 'linux-s390x'">SelfContained=false;CopyLocalRuntimeTargetAssets=false</PublishRuntimeIdentifier>
++            <PublishRuntimeIdentifier Condition="'$(PackageRuntime)' == 'linux-ppc64le' Or '$(PackageRuntime)' == 'linux-s390x'">SelfContained=false</PublishRuntimeIdentifier>
 +        </PropertyGroup>
 +        <MSBuild Targets="Restore" Projects="@(ProjectFiles)" StopOnFirstFailure="true" Properties="$(PublishRuntimeIdentifier)" />
 +        <MSBuild Targets="Publish" Projects="@(ProjectFiles)" BuildInParallel="false" StopOnFirstFailure="true" Properties="Configuration=$(BUILDCONFIG);PackageRuntime=$(PackageRuntime);Version=$(RunnerVersion);$(PublishRuntimeIdentifier);PublishDir=$(MSBuildProjectDirectory)/../_layout/bin" />
          <Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
      </Target>
 
-     <Target Name="Test" DependsOnTargets="GenerateConstant">
--        <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />
-+        <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:SelfContained=false /p:CopyLocalRuntimeTargetAssets=false" ConsoleToMSBuild="true" />
-         <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />
-     </Target>
-