From 848c2d2722306b403318ad03c5857bf933dc76e0 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 5 Jun 2024 01:29:57 +0300 Subject: [PATCH] Move LPOptimizer, DSL and tests to lp_optimizer/ --- mon/{ => lp_optimizer}/dsl_pgs.js | 0 mon/{lp-optimizer.js => lp_optimizer/lp_optimizer.js} | 0 mon/{ => lp_optimizer}/murmur3.js | 0 mon/{ => lp_optimizer}/simple_pgs.js | 0 mon/{ => lp_optimizer}/test-nonuniform.js | 2 +- mon/{ => lp_optimizer}/test-optimize-simple.js | 2 +- mon/{ => lp_optimizer}/test-optimize-undersized.js | 2 +- mon/{ => lp_optimizer}/test-optimize-unfeasible.js | 2 +- mon/{ => lp_optimizer}/test-optimize.js | 2 +- mon/{ => lp_optimizer}/test-parse-dsl.js | 0 mon/mon.js | 6 +++--- mon/package.json | 2 +- mon/pool_config.js | 2 +- 13 files changed, 10 insertions(+), 10 deletions(-) rename mon/{ => lp_optimizer}/dsl_pgs.js (100%) rename mon/{lp-optimizer.js => lp_optimizer/lp_optimizer.js} (100%) rename mon/{ => lp_optimizer}/murmur3.js (100%) rename mon/{ => lp_optimizer}/simple_pgs.js (100%) rename mon/{ => lp_optimizer}/test-nonuniform.js (99%) rename mon/{ => lp_optimizer}/test-optimize-simple.js (97%) rename mon/{ => lp_optimizer}/test-optimize-undersized.js (98%) rename mon/{ => lp_optimizer}/test-optimize-unfeasible.js (94%) rename mon/{ => lp_optimizer}/test-optimize.js (98%) rename mon/{ => lp_optimizer}/test-parse-dsl.js (100%) diff --git a/mon/dsl_pgs.js b/mon/lp_optimizer/dsl_pgs.js similarity index 100% rename from mon/dsl_pgs.js rename to mon/lp_optimizer/dsl_pgs.js diff --git a/mon/lp-optimizer.js b/mon/lp_optimizer/lp_optimizer.js similarity index 100% rename from mon/lp-optimizer.js rename to mon/lp_optimizer/lp_optimizer.js diff --git a/mon/murmur3.js b/mon/lp_optimizer/murmur3.js similarity index 100% rename from mon/murmur3.js rename to mon/lp_optimizer/murmur3.js diff --git a/mon/simple_pgs.js b/mon/lp_optimizer/simple_pgs.js similarity index 100% rename from mon/simple_pgs.js rename to mon/lp_optimizer/simple_pgs.js diff --git a/mon/test-nonuniform.js b/mon/lp_optimizer/test-nonuniform.js similarity index 99% rename from mon/test-nonuniform.js rename to mon/lp_optimizer/test-nonuniform.js index 746c9a18..508fce6e 100644 --- a/mon/test-nonuniform.js +++ b/mon/lp_optimizer/test-nonuniform.js @@ -8,7 +8,7 @@ // But we support this case with the "parity_space" parameter in optimize_initial()/optimize_change(). const { SimpleCombinator } = require('./simple_pgs.js'); -const LPOptimizer = require('./lp-optimizer.js'); +const LPOptimizer = require('./lp_optimizer.js'); const osd_tree = { ripper5: { diff --git a/mon/test-optimize-simple.js b/mon/lp_optimizer/test-optimize-simple.js similarity index 97% rename from mon/test-optimize-simple.js rename to mon/lp_optimizer/test-optimize-simple.js index a439c4a2..c7c1f0e0 100644 --- a/mon/test-optimize-simple.js +++ b/mon/lp_optimizer/test-optimize-simple.js @@ -2,7 +2,7 @@ // License: VNPL-1.1 (see README.md for details) const { compat } = require('./simple_pgs.js'); -const LPOptimizer = require('./lp-optimizer.js'); +const LPOptimizer = require('./lp_optimizer.js'); async function run() { diff --git a/mon/test-optimize-undersized.js b/mon/lp_optimizer/test-optimize-undersized.js similarity index 98% rename from mon/test-optimize-undersized.js rename to mon/lp_optimizer/test-optimize-undersized.js index 824404ae..7cf00105 100644 --- a/mon/test-optimize-undersized.js +++ b/mon/lp_optimizer/test-optimize-undersized.js @@ -2,7 +2,7 @@ // License: VNPL-1.1 (see README.md for details) const { compat, flatten_tree } = require('./simple_pgs.js'); -const LPOptimizer = require('./lp-optimizer.js'); +const LPOptimizer = require('./lp_optimizer.js'); const crush_tree = [ { level: 1, children: [ diff --git a/mon/test-optimize-unfeasible.js b/mon/lp_optimizer/test-optimize-unfeasible.js similarity index 94% rename from mon/test-optimize-unfeasible.js rename to mon/lp_optimizer/test-optimize-unfeasible.js index 8c685eca..b5393b8b 100644 --- a/mon/test-optimize-unfeasible.js +++ b/mon/lp_optimizer/test-optimize-unfeasible.js @@ -2,7 +2,7 @@ // License: VNPL-1.1 (see README.md for details) const { compat } = require('./simple_pgs.js'); -const LPOptimizer = require('./lp-optimizer.js'); +const LPOptimizer = require('./lp_optimizer.js'); const osd_tree = { 100: { diff --git a/mon/test-optimize.js b/mon/lp_optimizer/test-optimize.js similarity index 98% rename from mon/test-optimize.js rename to mon/lp_optimizer/test-optimize.js index 0ae931aa..2ebb4fe6 100644 --- a/mon/test-optimize.js +++ b/mon/lp_optimizer/test-optimize.js @@ -2,7 +2,7 @@ // License: VNPL-1.1 (see README.md for details) const { compat, flatten_tree } = require('./simple_pgs.js'); -const LPOptimizer = require('./lp-optimizer.js'); +const LPOptimizer = require('./lp_optimizer.js'); const osd_tree = { 100: { diff --git a/mon/test-parse-dsl.js b/mon/lp_optimizer/test-parse-dsl.js similarity index 100% rename from mon/test-parse-dsl.js rename to mon/lp_optimizer/test-parse-dsl.js diff --git a/mon/mon.js b/mon/mon.js index 195304b8..bc222e05 100644 --- a/mon/mon.js +++ b/mon/mon.js @@ -6,12 +6,12 @@ const http = require('http'); const crypto = require('crypto'); const os = require('os'); const WebSocket = require('ws'); -const { RuleCombinator } = require('./dsl_pgs.js'); -const { SimpleCombinator, flatten_tree } = require('./simple_pgs.js'); +const { RuleCombinator } = require('./lp_optimizer/dsl_pgs.js'); +const { SimpleCombinator, flatten_tree } = require('./lp_optimizer/simple_pgs.js'); const { etcd_tree, etcd_allow, etcd_nonempty_keys } = require('./etcd_schema.js'); const { validate_pool_cfg, get_pg_rules } = require('./pool_config.js'); const { sum_op_stats, sum_object_counts, sum_inode_stats, serialize_bigints } = require('./stats.js'); -const LPOptimizer = require('./lp-optimizer.js'); +const LPOptimizer = require('./lp_optimizer/lp_optimizer.js'); const stableStringify = require('./stable-stringify.js'); const PGUtil = require('./PGUtil.js'); diff --git a/mon/package.json b/mon/package.json index 898ba622..7b6aee5e 100644 --- a/mon/package.json +++ b/mon/package.json @@ -4,7 +4,7 @@ "description": "Vitastor SDS monitor service", "main": "mon-main.js", "scripts": { - "lint": "eslint *.js" + "lint": "eslint *.js lp_optimizer/*.js scripts/*.js" }, "author": "Vitaliy Filippov", "license": "UNLICENSED", diff --git a/mon/pool_config.js b/mon/pool_config.js index 28d85767..400dc6df 100644 --- a/mon/pool_config.js +++ b/mon/pool_config.js @@ -1,7 +1,7 @@ // Copyright (c) Vitaliy Filippov, 2019+ // License: VNPL-1.1 (see README.md for details) -const { parse_level_indexes, parse_pg_dsl } = require('./dsl_pgs.js'); +const { parse_level_indexes, parse_pg_dsl } = require('./lp_optimizer/dsl_pgs.js'); function validate_pool_cfg(pool_id, pool_cfg, placement_levels, warn) {