vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 68 Wiki Activity

Fix osd tags

Vitaliy Filippov 2020-10-16 23:28:48 +00:00
parent ece14a7d65
commit 9350656af6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mon/mon.js
View File

@ -691,7 +691,7 @@ class Mon
{ {
if (!tags) if (!tags)
{ {
return false; return;
} }
for (const tag of (tags instanceof Array ? tags : [ tags ])) for (const tag of (tags instanceof Array ? tags : [ tags ]))
{ {
@ -738,7 +738,7 @@ class Mon
let pool_tree = osd_tree[pool_cfg.root_node || '']; let pool_tree = osd_tree[pool_cfg.root_node || ''];
pool_tree = pool_tree ? pool_tree.children : []; pool_tree = pool_tree ? pool_tree.children : [];
pool_tree = LPOptimizer.flatten_tree(pool_tree, levels, pool_cfg.failure_domain, 'osd'); pool_tree = LPOptimizer.flatten_tree(pool_tree, levels, pool_cfg.failure_domain, 'osd');
pool_tree = this.filter_osds_by_tags(osd_tree, pool_tree, pool_cfg.osd_tags); this.filter_osds_by_tags(osd_tree, pool_tree, pool_cfg.osd_tags);
const prev_pgs = []; const prev_pgs = [];
for (const pg in ((this.state.config.pgs.items||{})[pool_id]||{})||{}) for (const pg in ((this.state.config.pgs.items||{})[pool_id]||{})||{})
{ {
@ -804,7 +804,7 @@ class Mon
const replicated = pool_cfg.scheme === 'replicated'; const replicated = pool_cfg.scheme === 'replicated';
for (const pg_num in ((this.state.config.pgs.items||{})[pool_id]||{})||{}) for (const pg_num in ((this.state.config.pgs.items||{})[pool_id]||{})||{})
{ {
const pg_cfg = this.state.config.pgs.items[pool_id][pg]; const pg_cfg = this.state.config.pgs.items[pool_id][pg_num];
if (!Number(pg_cfg.primary) || !up_osds[pg_cfg.primary]) if (!Number(pg_cfg.primary) || !up_osds[pg_cfg.primary])
{ {
let alive_set; let alive_set;