Bound Tari resources and stagger periodic service restarts

Author: MoneroOcean

deployment/common.bash

@@ -299,11 +299,17 @@ After=network.target
 [Service]
 ExecStart=$exec_start
 Restart=always
+RestartSec=10s
+RuntimeMaxSec=6h
+RuntimeRandomizedExtraSec=30min
+TimeoutStopSec=60s
+OOMPolicy=kill
 User=$TARI_USER
 Environment=HOME=$TARI_HOME
 Nice=10
-CPUQuota=400%
+CPUQuota=200%
 MemoryHigh=$TARI_MEMORY_HIGH
+MemoryMax=${TARI_MEMORY_MAX:-14G}
 MemorySwapMax=$TARI_MEMORY_SWAP_MAX
 
 [Install]

deployment/deploy.bash

@@ -116,11 +116,13 @@ Unattended-Upgrade::Package-Blacklist {
 EOF
 }
 
-TARI_MEMORY_HIGH="${TARI_MEMORY_HIGH:-10G}"
+TARI_MEMORY_HIGH="${TARI_MEMORY_HIGH:-12G}"
+TARI_MEMORY_MAX="${TARI_MEMORY_MAX:-14G}"
 TARI_MEMORY_SWAP_MAX="${TARI_MEMORY_SWAP_MAX:-768M}"
 TARI_MM_MEMORY_HIGH="${TARI_MM_MEMORY_HIGH:-1200M}"
 TARI_MM_MEMORY_SWAP_MAX="${TARI_MM_MEMORY_SWAP_MAX:-384M}"
 validate_systemd_memory_limit "$TARI_MEMORY_HIGH" TARI_MEMORY_HIGH
+validate_systemd_memory_limit "$TARI_MEMORY_MAX" TARI_MEMORY_MAX
 validate_systemd_memory_limit "$TARI_MEMORY_SWAP_MAX" TARI_MEMORY_SWAP_MAX
 validate_systemd_memory_limit "$TARI_MM_MEMORY_HIGH" TARI_MM_MEMORY_HIGH
 validate_systemd_memory_limit "$TARI_MM_MEMORY_SWAP_MAX" TARI_MM_MEMORY_SWAP_MAX

deployment/leaf.bash

@@ -401,12 +401,14 @@ configure_pool_firewall() {
   ufw reload
 }
 
-TARI_MEMORY_HIGH="${TARI_MEMORY_HIGH:-$(default_tari_memory_high)}"
+TARI_MEMORY_HIGH="${TARI_MEMORY_HIGH:-12G}"
+TARI_MEMORY_MAX="${TARI_MEMORY_MAX:-14G}"
 TARI_MEMORY_SWAP_MAX="${TARI_MEMORY_SWAP_MAX:-768M}"
 TARI_MM_MEMORY_HIGH="${TARI_MM_MEMORY_HIGH:-1200M}"
 TARI_MM_MEMORY_SWAP_MAX="${TARI_MM_MEMORY_SWAP_MAX:-384M}"
 
 validate_systemd_memory_limit "$TARI_MEMORY_HIGH" TARI_MEMORY_HIGH
+validate_systemd_memory_limit "$TARI_MEMORY_MAX" TARI_MEMORY_MAX
 validate_systemd_memory_limit "$TARI_MEMORY_SWAP_MAX" TARI_MEMORY_SWAP_MAX
 validate_systemd_memory_limit "$TARI_MM_MEMORY_HIGH" TARI_MM_MEMORY_HIGH
 validate_systemd_memory_limit "$TARI_MM_MEMORY_SWAP_MAX" TARI_MM_MEMORY_SWAP_MAX

deployment/patch-tari-config.sh

@@ -180,7 +180,7 @@ lines = Path(src).read_text().splitlines(keepends=True)
 
 section_re = re.compile(r"^\s*\[([A-Za-z0-9_.-]+)\]\s*(?:#.*)?$")
 sections = {m.group(1): i for i, line in enumerate(lines) if (m := section_re.match(line))}
-required = {"base_node", "base_node.storage", "base_node.p2p", "base_node.p2p.transport", "wallet", "merge_mining_proxy"}
+required = {"base_node", "base_node.lmdb", "base_node.storage", "base_node.p2p", "base_node.p2p.transport", "wallet", "merge_mining_proxy"}
 missing = sorted(required - set(sections))
 if missing:
     raise SystemExit(f"missing required section(s): {', '.join(missing)}")
@@ -258,6 +258,7 @@ set_value("base_node", "use_libtor", "false")
 set_value("base_node.storage", "pruning_horizon", pruning_horizon)
 set_value("base_node.storage", "pruning_interval", pruning_interval)
 
+set_value("base_node.lmdb", "no_read_ahead", "true")
 set_value("base_node.p2p", "public_addresses", f'["/ip4/{external_ip}/tcp/18189",]')
 set_value("base_node.p2p.transport", "type", '"tcp"')
 set_value("base_node.p2p.transport", "tcp.listener_address", '"/ip4/0.0.0.0/tcp/18189"')

tests/deploy/common.js

@@ -1,6 +1,7 @@
 "use strict";
 const assert = require("node:assert/strict");
 const fs = require("node:fs");
+const os = require("node:os");
 const path = require("node:path");
 const { spawnSync } = require("node:child_process");
 const test = require("node:test");
@@ -9,6 +10,28 @@ const DEPLOYMENT_DIR = path.join(__dirname, "..", "..", "deployment");
 const COMMON_PATH = path.join(DEPLOYMENT_DIR, "common.bash");
 const ENTRYPOINTS = ["deploy.bash", "leaf.bash"];
 
+test("Tari config patch disables read-ahead and remains idempotent", () => {
+    const shim = fs.readFileSync(path.join(__dirname, "common", "container_shim.sh"), "utf8");
+    const fixture = shim.match(/const configToml = String.raw`([\s\S]*?)`;/)[1];
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "tari-config-test-"));
+    try {
+        const config = path.join(dir, "config.toml");
+        fs.writeFileSync(config, fixture);
+        const args = [path.join(DEPLOYMENT_DIR, "patch-tari-config.sh"), config,
+            "--external-ip", "127.0.0.1", "--no-backup"];
+        const first = runBash(args);
+        assert.equal(first.status, 0, first.stderr);
+        const contents = fs.readFileSync(config, "utf8");
+        assert.match(contents, /\[base_node\.lmdb\]\s+no_read_ahead = true/);
+        assert.match(contents, /pruning_horizon = 10000/);
+        const second = runBash(args);
+        assert.equal(second.status, 0, second.stderr);
+        assert.equal(fs.readFileSync(config, "utf8"), contents);
+    } finally {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+});
+
 function runBash(args, options = {}) {
     return spawnSync("bash", args, {
         cwd: path.join(__dirname, "..", ".."),

tests/deploy/common/container_shim.sh

@@ -120,6 +120,9 @@ grpc_server_allow_methods = [
 ]
 use_libtor = true
 
+[base_node.lmdb]
+no_read_ahead = false
+
 [base_node.storage]
 pruning_horizon = 0
 pruning_interval = 0