From 21e5b1e70756be0b30995f418a41399bb4fc2076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Bizjak?= <ab@concordium.com>
Date: Mon, 13 Jun 2022 21:05:22 +0200
Subject: [PATCH 1/2] Update installer versions, and use -I0 in mac and ubuntu
 distributions.

---
 .../LaunchDaemons/software.concordium.mainnet.node.plist      | 2 +-
 .../LaunchDaemons/software.concordium.testnet.node.plist      | 2 +-
 .../ubuntu-packages/template/debian/concordium-node.service   | 2 +-
 service/windows/installer/Node.wxs                            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.mainnet.node.plist b/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.mainnet.node.plist
index 015f0626a3..c1ba177e01 100644
--- a/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.mainnet.node.plist	
+++ b/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.mainnet.node.plist	
@@ -71,7 +71,7 @@
 
         <!-- Haskell RTS flags to pass to consensus. -->
         <key>CONCORDIUM_NODE_RUNTIME_HASKELL_RTS_FLAGS</key>
-        <string>-N2</string>
+        <string>-N2,-I0</string>
 
     </dict>
 
diff --git a/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.testnet.node.plist b/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.testnet.node.plist
index 9284fd089d..0562d316b6 100644
--- a/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.testnet.node.plist	
+++ b/scripts/distribution/macOS-package/template/payload/tmp/Concordium Node/LaunchDaemons/software.concordium.testnet.node.plist	
@@ -71,7 +71,7 @@
 
         <!-- Haskell RTS flags to pass to consensus. -->
         <key>CONCORDIUM_NODE_RUNTIME_HASKELL_RTS_FLAGS</key>
-        <string>-N2</string>
+        <string>-N2,-I0</string>
 
     </dict>
 
diff --git a/scripts/distribution/ubuntu-packages/template/debian/concordium-node.service b/scripts/distribution/ubuntu-packages/template/debian/concordium-node.service
index fa651453a0..48b383b4d7 100644
--- a/scripts/distribution/ubuntu-packages/template/debian/concordium-node.service
+++ b/scripts/distribution/ubuntu-packages/template/debian/concordium-node.service
@@ -60,7 +60,7 @@ Environment=CONCORDIUM_NODE_NO_LOG_TIMESTAMP=true
 # The bootstrapping interval in seconds.
 Environment=CONCORDIUM_NODE_CONNECTION_BOOTSTRAPPING_INTERVAL=1800
 # Haskell RTS flags to pass to consensus.
-Environment=CONCORDIUM_NODE_RUNTIME_HASKELL_RTS_FLAGS=-N2
+Environment=CONCORDIUM_NODE_RUNTIME_HASKELL_RTS_FLAGS=-N2,-I0
     
 [Install]
 # start the service when reaching multi-user target
diff --git a/service/windows/installer/Node.wxs b/service/windows/installer/Node.wxs
index 363afd0528..e87c17da4d 100644
--- a/service/windows/installer/Node.wxs
+++ b/service/windows/installer/Node.wxs
@@ -2,9 +2,9 @@
 <!-- When updating the product version, the Product Id should be refreshed, otherwise it will not be
     possible to upgrade an existing installation.
 -->
-<?define VersionNumber="4.1.1" ?>
+<?define VersionNumber="4.2.0" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:Util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Name="Concordium Node" Manufacturer="Concordium Software" Id="47060dd1-07a9-4e87-ad7d-f37f20f3ae4e" UpgradeCode="297295b4-c716-4d33-8170-0f6136663bfd" Language="1033" Codepage="1252" Version="$(var.VersionNumber)">
+    <Product Name="Concordium Node" Manufacturer="Concordium Software" Id="b4b12449-67e7-40fb-a057-f545cf8d663e" UpgradeCode="297295b4-c716-4d33-8170-0f6136663bfd" Language="1033" Codepage="1252" Version="$(var.VersionNumber)">
         <Package Id="*" Keywords="Concordium Installer" Description="Concordium Node $(var.VersionNumber) Installer" Manufacturer="Concordium Software" InstallerVersion="500" Languages="1033" Compressed="yes" InstallScope="perMachine" />
         <MajorUpgrade Schedule="afterInstallValidate" DowngradeErrorMessage="The currently-installed version of [ProductName] is newer than the version you are trying to install. The installation cannot continue. If you wish to install this version, please remove the newer version first." />
         <Media Id="1" Cabinet="Node.cab" EmbedCab="yes" />

From 56c21185458ca5afad526e15ea93e57a31c8e19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Bizjak?= <ab@concordium.com>
Date: Mon, 13 Jun 2022 21:53:27 +0200
Subject: [PATCH 2/2] Add `-I0` also to the default windows config.

---
 service/windows/installer/resources/nodes.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/service/windows/installer/resources/nodes.toml b/service/windows/installer/resources/nodes.toml
index eaee2c453d..7e7c157f5f 100644
--- a/service/windows/installer/resources/nodes.toml
+++ b/service/windows/installer/resources/nodes.toml
@@ -41,6 +41,10 @@ log.roll.count = 2
 collector.url = 'https://dashboard.mainnet.concordium.software/nodes/post'
 # Controls whether data is submitted to the network dashboard for this node.
 collector.enabled = false
+# Disable the idle major garbage collection. This is especially useful for
+# non-baker nodes. It significantly reduces CPU use when the node's database is
+# large and seems to have little downside.
+node.env.CONCORDIUM_NODE_RUNTIME_HASKELL_RTS_FLAGS = '-I0'
 
 [node.testnet]
 # Controls whether the node is enabled
@@ -77,3 +81,7 @@ log.roll.count = 2
 collector.url = 'https://dashboard.testnet.concordium.com/nodes/post'
 # Controls whether data is submitted to the network dashboard for this node.
 collector.enabled = false
+# Disable the idle major garbage collection. This is especially useful for
+# non-baker nodes. It significantly reduces CPU use when the node's database is
+# large and seems to have little downside.
+node.env.CONCORDIUM_NODE_RUNTIME_HASKELL_RTS_FLAGS = '-I0'
\ No newline at end of file