From 87b3ab94feea4c457d49f69399ce263b3c9d60a9 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Sat, 20 Apr 2024 02:02:13 +0300
Subject: [PATCH] Do not disable require-atomic-updates and no-unused-vars

---
 mon/.eslintrc.js      |  6 ------
 mon/PGUtil.js         |  1 -
 mon/lp-optimizer.js   |  2 +-
 mon/mon.js            | 12 +++++-------
 mon/simple-offsets.js |  2 +-
 mon/simple_pgs.js     |  2 +-
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/mon/.eslintrc.js b/mon/.eslintrc.js
index 385082bb..0cca88f9 100644
--- a/mon/.eslintrc.js
+++ b/mon/.eslintrc.js
@@ -30,18 +30,12 @@ module.exports = {
             "error",
             "always"
         ],
-        "require-atomic-updates": [
-            "off"
-        ],
         "no-useless-escape": [
             "off"
         ],
         "no-control-regex": [
             "off"
         ],
-        "no-unused-vars": [
-            "off"
-        ],
         "no-empty": [
             "off"
         ],
diff --git a/mon/PGUtil.js b/mon/PGUtil.js
index d233d4b3..1e410fa1 100644
--- a/mon/PGUtil.js
+++ b/mon/PGUtil.js
@@ -97,7 +97,6 @@ function scale_pg_history(prev_pg_history, prev_pgs, new_pgs)
 
 function scale_pg_count(prev_pgs, new_pg_count)
 {
-    const old_pg_count = prev_pgs.length;
     // Just for the lp_solve optimizer - pick a "previous" PG for each "new" one
     if (prev_pgs.length < new_pg_count)
     {
diff --git a/mon/lp-optimizer.js b/mon/lp-optimizer.js
index 63703532..d9ff4e56 100644
--- a/mon/lp-optimizer.js
+++ b/mon/lp-optimizer.js
@@ -215,7 +215,7 @@ function calc_intersect_weights(old_pg_size, pg_size, pg_count, prev_weights, al
                 {
                     const intersect_count = ordered
                         ? pg.reduce((a, osd, i) => a + (prev_hash[osd] == 1+i ? 1 : 0), 0)
-                        : pg.reduce((a, osd, i) => a + (prev_hash[osd] ? 1 : 0), 0);
+                        : pg.reduce((a, osd) => a + (prev_hash[osd] ? 1 : 0), 0);
                     if (max_int < intersect_count)
                     {
                         max_int = intersect_count;
diff --git a/mon/mon.js b/mon/mon.js
index 244785f0..94036ec9 100644
--- a/mon/mon.js
+++ b/mon/mon.js
@@ -585,7 +585,7 @@ class Mon
                 now = Date.now();
             }
             tried[base] = now;
-            const ok = await new Promise((ok, no) =>
+            const ok = await new Promise(ok =>
             {
                 const timer_id = setTimeout(() =>
                 {
@@ -994,7 +994,7 @@ class Mon
                 const key = b64(this.etcd_prefix+'/osd/state/'+osd_num);
                 checks.push({ key, target: 'MOD', result: 'LESS', mod_revision: ''+this.etcd_watch_revision });
             }
-            const res = await this.etcd_call('/kv/txn', {
+            await this.etcd_call('/kv/txn', {
                 compare: [
                     { key: b64(this.etcd_prefix+'/mon/master'), target: 'LEASE', lease: ''+this.etcd_lease_id },
                     { key: b64(this.etcd_prefix+'/config/pgs'), target: 'MOD', mod_revision: ''+this.etcd_watch_revision, result: 'LESS' },
@@ -1522,7 +1522,6 @@ class Mon
                 {
                     continue;
                 }
-                const replicated = pool_cfg.scheme === 'replicated';
                 const aff_osds = this.get_affinity_osds(pool_cfg, up_osds, osd_tree);
                 this.reset_rng();
                 for (let pg_num = 1; pg_num <= pool_cfg.pg_count; pg_num++)
@@ -1696,7 +1695,6 @@ class Mon
 
     derive_osd_stats(st, prev, prev_diff)
     {
-        const zero_stats = { op: { bps: 0n, iops: 0n, lat: 0n }, subop: { iops: 0n, lat: 0n }, recovery: { bps: 0n, iops: 0n } };
         const diff = { op_stats: {}, subop_stats: {}, recovery_stats: {}, inode_stats: {} };
         if (!st || !st.time || !prev || !prev.time || prev.time >= st.time)
         {
@@ -1736,7 +1734,7 @@ class Mon
         }
         for (const pool_id in st.inode_stats||{})
         {
-            const pool_diff = diff.inode_stats[pool_id] = {};
+            diff.inode_stats[pool_id] = {};
             for (const inode_num in st.inode_stats[pool_id])
             {
                 const inode_diff = diff.inode_stats[pool_id][inode_num] = {};
@@ -2154,7 +2152,7 @@ class Mon
     _die(err, code)
     {
         // In fact we can just try to rejoin
-        console.error(new Error(err || 'Cluster connection failed'));
+        console.error(err instanceof Error ? err : new Error(err || 'Cluster connection failed'));
         process.exit(code || 2);
     }
 
@@ -2178,7 +2176,7 @@ class Mon
 
 function POST(url, body, timeout)
 {
-    return new Promise((ok, no) =>
+    return new Promise(ok =>
     {
         const body_text = Buffer.from(JSON.stringify(body));
         let timer_id = timeout > 0 ? setTimeout(() =>
diff --git a/mon/simple-offsets.js b/mon/simple-offsets.js
index 72a5b6de..053a37c4 100644
--- a/mon/simple-offsets.js
+++ b/mon/simple-offsets.js
@@ -91,7 +91,7 @@ async function run()
 
 function system(cmd)
 {
-    return new Promise((ok, no) => child_process.exec(cmd, { maxBuffer: 64*1024*1024 }, (err, stdout, stderr) => (err ? no(err.message) : ok(stdout))));
+    return new Promise((ok, no) => child_process.exec(cmd, { maxBuffer: 64*1024*1024 }, (err, stdout/*, stderr*/) => (err ? no(err.message) : ok(stdout))));
 }
 
 run().catch(err => { console.error(err); process.exit(1); });
diff --git a/mon/simple_pgs.js b/mon/simple_pgs.js
index f4ed52e1..7f449cba 100644
--- a/mon/simple_pgs.js
+++ b/mon/simple_pgs.js
@@ -198,7 +198,6 @@ function all_combinations(osd_tree, pg_size, ordered, count)
 
 function check_combinations(osd_tree, pgs)
 {
-    const hosts = Object.keys(osd_tree).sort();
     const host_per_osd = {};
     for (const host in osd_tree)
     {
@@ -235,6 +234,7 @@ function compat(params)
 
 module.exports = {
     flatten_tree,
+    all_combinations,
     SimpleCombinator,
     compat,
     NO_OSD,