Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

CORTX-32348: Add log device entries in motr sysconfig file from CDF.yaml #2144

Merged
merged 5 commits into from
Aug 3, 2022
Merged

CORTX-32348: Add log device entries in motr sysconfig file from CDF.yaml #2144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea7ab45
CORTX-32348: Part 1 - cfgen changes
d-nayak Jul 27, 2022
c48a458
CORTX-32348: Parts 1 and 2: Changes in cfgen and update-consul-conf
d-nayak Jul 27, 2022
4361ce7
CORTX-32348: Changes to handle both log device path and size strings
d-nayak Jul 28, 2022
425f2e1
CORTX-32348: Addressing pylinting typos in cfgen
d-nayak Jul 28, 2022
e883fea
CORTX-32348: Validation checks for disks between log/meta_data/data
d-nayak Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 42 additions & 6 deletions cfgen/cfgen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ nodes:
meta_data: <str> # device path for meta-data;
# optional, Motr will use "/var/motr/m0d-<FID>/"
# by default
log: [ <str> ] # e.g. [ "/dev/loop0", "/dev/loop1", "/dev/loop2" ]
# Empty list means no log device.
data: [ <str> ] # e.g. [ "/dev/loop0", "/dev/loop1", "/dev/loop2" ]
# Empty list means no IO service.
m0_clients:
Expand Down Expand Up @@ -437,13 +439,23 @@ def enrich_cluster_desc(desc: Dict[str, Any], mock_p: bool) -> None:
if 'meta_data' in m0d['io_disks']:
if m0d['io_disks']['meta_data'] is None:
del m0d['io_disks']['meta_data']
if 'log' in m0d['io_disks']:
if m0d['io_disks']['log'] is None:
del m0d['io_disks']['log']
m0d['_io_disks'] = get_disks_from_cdf(node['hostname'], mock_p,
m0d['io_disks']['data'])

if not m0d['_io_disks']:
m0d['_io_disks'] = get_disks_ssh(node['hostname'], mock_p,
m0d['io_disks']['data'])

m0d['_log_disks'] = get_disks_from_cdf(node['hostname'], mock_p,
m0d['io_disks']['log'])

if not m0d['_log_disks']:
m0d['_log_disks'] = get_disks_ssh(node['hostname'], mock_p,
m0d['io_disks']['log'])

if 'profiles' not in desc:
sns_pools = [pool['name'] for pool in desc['pools']
if pool_type(pool) is PoolT.sns]
Expand Down Expand Up @@ -504,18 +516,28 @@ Make sure the value of data_iface in the CDF is correct.""")
f'Node {name}: Too many confd services: {nr_confds} >= 2')
total_nr_confds += nr_confds

disks_list = []
for m0d in node['m0_servers']:
d = m0d['io_disks']
_assert(m0d['runs_confd'] or d['data'],
f"Node {name}: Either 'runs_confd' or"
"'io_disks.data' must be set")
_assert('' not in d['data'], f"Node {name}: Empty strings "
"in 'io_disks.data' are not allowed")
for x in d['data']:
disks_list.append(x['path'])
if 'meta_data' in d:
_assert(d['meta_data'], f"Node {name}: 'io_disks.meta_data'"
'must not be an empty string')
_assert(d['meta_data'] not in d['data'], f"Node {name}: "
'Meta-data disk must not belong io_disks.data')
disks_list.append(d['meta_data'])
if 'log' in d:
_assert('' not in d['log'], f"Node {name}: Empty strings "
"in 'io_disks.log' are not allowed")
for x in d['log']:
disks_list.append(x['path'])

_assert(all_unique(disks_list),
f'Node {name}: Disk repeated in log / meta_data / data!')

disks: List[Disk] = []
for m0d in node['m0_servers']:
Expand Down Expand Up @@ -1205,13 +1227,14 @@ class ConfProcess(ToDhall):
def __init__(self, nr_cpu: int, memsize_MB: int,
endpoint,
services: List[Oid], meta_data: str = None,
proc_name: str = None):
log: List[Disk] = [], proc_name: str = None):
_assert(nr_cpu > 0, 'nr_cpu must be positive')
self.nr_cpu = nr_cpu
_assert(memsize_MB > 0, 'memsize_MB must be positive')
self.memsize_MB = memsize_MB
self.endpoint = endpoint
self.meta_data = meta_data
self.log = log
self.proc_name = proc_name
_assert(all(x.type is ObjT.service for x in services),
'All services must be of ObjT.service type')
Expand Down Expand Up @@ -1282,13 +1305,16 @@ class ConfProcess(ToDhall):
portalgroup=portal)
proc_id = new_oid(ObjT.process)
meta_data = None
log = []
if proc_desc is not None and proc_t is ProcT.m0_server:
meta_data = proc_desc['io_disks'].get('meta_data')
log = proc_desc['_log_disks']

m0conf[proc_id] = cls(nr_cpu=facts['processorcount'],
memsize_MB=facts['_memsize_MB'],
endpoint=ep,
meta_data=meta_data,
log=log,
services=[],
proc_name=proc_name)
m0conf[parent].processes.append(proc_id)
Expand Down Expand Up @@ -2441,7 +2467,8 @@ def generate_consul_kv(cluster: Cluster, dhall_dir: str) -> str:

ConsulService = NamedTuple('ConsulService', [
('node_name', str), ('proc_id', Oid), ('ep', Any),
('svc_id', Oid), ('stype', str), ('meta_data', Optional[str])])
('svc_id', Oid), ('stype', str), ('meta_data', Optional[str]),
('log', Optional[List[Disk]])])

def processes() -> Iterator[ConsulService]:
for node_id, node in m0conf.items():
Expand All @@ -2457,15 +2484,17 @@ def generate_consul_kv(cluster: Cluster, dhall_dir: str) -> str:
ep=proc.endpoint,
svc_id=svc_id,
stype=stype,
meta_data=proc.meta_data)
meta_data=proc.meta_data,
log=proc.log)
# Add Motr clients to consul kv
if proc_id in cluster.m0_clients:
yield ConsulService(node_name=node.name,
proc_id=proc_id,
ep=proc.endpoint,
svc_id=cluster.m0_clients[proc_id],
stype=m0conf[proc_id].proc_name,
meta_data=None)
meta_data=None,
log=[])

def sns_pools() -> List[Oid]:
for root_id, root in m0conf.items():
Expand Down Expand Up @@ -2513,6 +2542,13 @@ def generate_consul_kv(cluster: Cluster, dhall_dir: str) -> str:
*[(f'm0conf/nodes/{x.node_name}/processes/{x.proc_id.fidk}/'
f'meta_data', x.meta_data)
for x in processes() if x.stype == 'ios' and x.meta_data],
*[(f'm0conf/nodes/{x.node_name}/processes/{x.proc_id.fidk}/'
f'log',
json.dumps({
'path': x.log[0].path,
'size': x.log[0].size
}))
for x in processes() if x.stype == 'ios' and x.log],
*[(f'm0conf/nodes/{x.node_name}/processes/{x.proc_id.fidk}/endpoint',
str(x.ep))
for x in processes()],
Expand Down
23 changes: 23 additions & 0 deletions utils/update-consul-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,16 @@ get_ios_meta_data_from_kv_file() {
eval $cmd || true
}

get_ios_log_from_kv_file() {
local process_fidk=$1
local key="m0conf/nodes/$(get_node_name)/processes/$process_fidk/log"

local cmd="jq -r '.[] | select(.key==\"$key\") |
.value' $kv_file"

eval $cmd || true
}

get_service_ids_from_kv_file() {
local filter=$1
local key="m0conf/nodes/$(get_node_name)/processes/*"
Expand Down Expand Up @@ -400,6 +410,9 @@ append_ios_svc() {
local port=$(get_service_port $ep)
local host=$(get_service_host $addr)
local meta_data=$(get_ios_meta_data_from_kv_file $id)
local log_path=$(get_ios_log_from_kv_file $id | jq -r .path)
local log_size=$(get_ios_log_from_kv_file $id | jq -r .size)

SVCS_CONF+="${SVCS_CONF:+,}{
\"id\": \"$id\",
\"name\": \"ios\",
Expand Down Expand Up @@ -434,6 +447,16 @@ EOF
cat <<EOF | sudo tee -a /tmp/m0d-$fid > /dev/null
MOTR_NODE_UUID='$UUID'
EOF
if [[ $log_path ]]; then
cat <<EOF | sudo tee -a /tmp/m0d-$fid > /dev/null
MOTR_LOG_PATH='$log_path'
EOF
fi
if [[ $log_size ]]; then
cat <<EOF | sudo tee -a /tmp/m0d-$fid > /dev/null
MOTR_LOG_SIZE='$log_size'
EOF
fi
install_motr_conf /tmp/m0d-$fid
}

Expand Down