parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Correct schema and handling of network subkeys 

Required a bit of refactoring in the validation code to ensure we have
direct access, without relying on the translations done in the normal
zkhandler functions.
This commit is contained in:
Joshua Boniface 2021-06-10 00:33:17 -04:00
parent 9985e1dadd
commit f030ed974c
2 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon-common/migrations/versions/0.json
View File

@ -1 +1 @@
{"version": "0", "root": "", "base": {"schema": "/schema", "schema.version": "/schema/version", "config": "/config", "config.maintenance": "/config/maintenance", "config.primary_node": "/config/primary_node", "config.primary_node.sync_lock": "/config/primary_node/sync_lock", "config.upstream_ip": "/config/upstream_ip", "config.migration_target_selector": "/config/migration_target_selector", "cmd": "/cmd", "cmd.node": "/cmd/nodes", "cmd.domain": "/cmd/domains", "cmd.ceph": "/cmd/ceph", "node": "/nodes", "domain": "/domains", "network": "/networks", "storage": "/ceph", "storage.util": "/ceph/util", "osd": "/ceph/osds", "pool": "/ceph/pools", "volume": "/ceph/volumes", "snapshot": "/ceph/snapshots"}, "node": {"keepalive": "/keepalive", "mode": "/daemonmode", "data.active_schema": "/activeschema", "data.latest_schema": "/latestschema", "data.static": "/staticdata", "running_domains": "/runningdomains", "count.provisioned_domains": "/domainscount", "count.networks": "/networkscount", "state.daemon": "/daemonstate", "state.router": "/routerstate", "state.domain": "/domainstate", "cpu.load": "/cpuload", "vcpu.allocated": "/vcpualloc", "memory.total": "/memtotal", "memory.used": "/memused", "memory.free": "/memfree", "memory.allocated": "/memalloc", "memory.provisioned": "/memprov", "ipmi.hostname": "/ipmihostname", "ipmi.username": "/ipmiusername", "ipmi.password": "/ipmipassword"}, "domain": {"name": "", "xml": "/xml", "state": "/state", "profile": "/profile", "stats": "/stats", "node": "/node", "last_node": "/lastnode", "failed_reason": "/failedreason", "storage.volumes": "/rbdlist", "console.log": "/consolelog", "console.vnc": "/vnc", "meta.autostart": "/node_autostart", "meta.migrate_method": "/migration_method", "meta.node_selector": "/node_selector", "meta.node_limit": "/node_limit", "migrate.sync_lock": "/migrate_sync_lock"}, "network": {"type": "/nettype", "rules": "/firewall_rules", "rules.in": "/firewall_rules/in", "rules.out": "/firewall_rules/out", "nameservers": "/name_servers", "domain": "/domain", "ip4.gateway": "/ip4_gateway", "ip4.network": "/ip4_network", "ip4.dhcp": "/dhcp4_flag", "ip4.reservation": "/dhcp4_reservations", "ip4.dhcp_start": "/dhcp4_start", "ip4.dhcp_end": "/dhcp4_end", "ip6.gateway": "/ip6_gateway", "ip6.network": "/ip6_network", "ip6.dhcp": "/dhcp6_flag"}, "reservation": {"mac": "", "ip": "/ipaddr", "hostname": "/hostname"}, "osd": {"node": "/node", "device": "/device", "stats": "/stats"}, "pool": {"pgs": "/pgs", "stats": "/stats"}, "volume": {"stats": "/stats"}, "snapshot": {"stats": "/stats"}} {"version": "0", "root": "", "base": {"schema": "/schema", "schema.version": "/schema/version", "config": "/config", "config.maintenance": "/config/maintenance", "config.primary_node": "/config/primary_node", "config.primary_node.sync_lock": "/config/primary_node/sync_lock", "config.upstream_ip": "/config/upstream_ip", "config.migration_target_selector": "/config/migration_target_selector", "cmd": "/cmd", "cmd.node": "/cmd/nodes", "cmd.domain": "/cmd/domains", "cmd.ceph": "/cmd/ceph", "node": "/nodes", "domain": "/domains", "network": "/networks", "storage": "/ceph", "storage.util": "/ceph/util", "osd": "/ceph/osds", "pool": "/ceph/pools", "volume": "/ceph/volumes", "snapshot": "/ceph/snapshots"}, "node": {"keepalive": "/keepalive", "mode": "/daemonmode", "data.active_schema": "/activeschema", "data.latest_schema": "/latestschema", "data.static": "/staticdata", "running_domains": "/runningdomains", "count.provisioned_domains": "/domainscount", "count.networks": "/networkscount", "state.daemon": "/daemonstate", "state.router": "/routerstate", "state.domain": "/domainstate", "cpu.load": "/cpuload", "vcpu.allocated": "/vcpualloc", "memory.total": "/memtotal", "memory.used": "/memused", "memory.free": "/memfree", "memory.allocated": "/memalloc", "memory.provisioned": "/memprov", "ipmi.hostname": "/ipmihostname", "ipmi.username": "/ipmiusername", "ipmi.password": "/ipmipassword"}, "domain": {"name": "", "xml": "/xml", "state": "/state", "profile": "/profile", "stats": "/stats", "node": "/node", "last_node": "/lastnode", "failed_reason": "/failedreason", "storage.volumes": "/rbdlist", "console.log": "/consolelog", "console.vnc": "/vnc", "meta.autostart": "/node_autostart", "meta.migrate_method": "/migration_method", "meta.node_selector": "/node_selector", "meta.node_limit": "/node_limit", "migrate.sync_lock": "/migrate_sync_lock"}, "network": {"type": "/nettype", "rule": "/firewall_rules", "rule.in": "/firewall_rules/in", "rule.out": "/firewall_rules/out", "nameservers": "/name_servers", "domain": "/domain", "reservation": "/dhcp4_reservations", "ip4.gateway": "/ip4_gateway", "ip4.network": "/ip4_network", "ip4.dhcp": "/dhcp4_flag", "ip4.dhcp_start": "/dhcp4_start", "ip4.dhcp_end": "/dhcp4_end", "ip6.gateway": "/ip6_gateway", "ip6.network": "/ip6_network", "ip6.dhcp": "/dhcp6_flag"}, "reservation": {"mac": "", "ip": "/ipaddr", "hostname": "/hostname"}, "rule": {"rule": "/rule", "order": "/order"}, "osd": {"node": "/node", "device": "/device", "stats": "/stats"}, "pool": {"pgs": "/pgs", "stats": "/stats"}, "volume": {"stats": "/stats"}, "snapshot": {"stats": "/stats"}}

101
daemon-common/zkhandler.py
View File

@ -492,15 +492,15 @@ class ZKSchema(object):
# The schema of an individual network entry (/networks/{vni}) # The schema of an individual network entry (/networks/{vni})
'network': { 'network': {
'type': '/nettype', 'type': '/nettype',
'rules': '/firewall_rules', 'rule': '/firewall_rules',
'rules.in': '/firewall_rules/in', 'rule.in': '/firewall_rules/in',
'rules.out': '/firewall_rules/out', 'rule.out': '/firewall_rules/out',
'nameservers': '/name_servers', 'nameservers': '/name_servers',
'domain': '/domain', 'domain': '/domain',
'reservation': '/dhcp4_reservations',
'ip4.gateway': '/ip4_gateway', 'ip4.gateway': '/ip4_gateway',
'ip4.network': '/ip4_network', 'ip4.network': '/ip4_network',
'ip4.dhcp': '/dhcp4_flag', 'ip4.dhcp': '/dhcp4_flag',
'ip4.reservation': '/dhcp4_reservations',
'ip4.dhcp_start': '/dhcp4_start', 'ip4.dhcp_start': '/dhcp4_start',
'ip4.dhcp_end': '/dhcp4_end', 'ip4.dhcp_end': '/dhcp4_end',
'ip6.gateway': '/ip6_gateway', 'ip6.gateway': '/ip6_gateway',
@ -513,6 +513,11 @@ class ZKSchema(object):
'ip': '/ipaddr', 'ip': '/ipaddr',
'hostname': '/hostname' 'hostname': '/hostname'
}, },
# The schema for an individual network ACL entry (/networks/{vni}/firewall_rules/(in|out)/{acl}
'rule': {
'rule': '/rule',
'order': '/order'
},
# The schema of an individual OSD entry (/ceph/osds/{osd_id}) # The schema of an individual OSD entry (/ceph/osds/{osd_id})
'osd': { 'osd': {
'node': '/node', 'node': '/node',
@ -643,52 +648,66 @@ class ZKSchema(object):
for elem in ['base']: for elem in ['base']:
for key in self.keys(elem): for key in self.keys(elem):
kpath = f'{elem}.{key}' kpath = f'{elem}.{key}'
if not zkhandler.exists(self.path(kpath)): if not zkhandler.zk_conn.exists(self.path(kpath)):
if logger is not None: if logger is not None:
logger.out(f'Key not found: {self.path(kpath)}', state='w') logger.out(f'Key not found: {self.path(kpath)}', state='w')
result = False result = False
for elem in ['node', 'domain', 'network', 'osd', 'pool']: for elem in ['node', 'domain', 'network', 'osd', 'pool']:
# First read all the subelements of the key class # First read all the subelements of the key class
for child in zkhandler.children(self.path(f'base.{elem}')): for child in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
# For each key in the schema for that particular elem # For each key in the schema for that particular elem
for ikey in self.keys(elem): for ikey in self.keys(elem):
kpath = f'{elem}.{ikey}' kpath = f'{elem}.{ikey}'
# Validate that the key exists for that child # Validate that the key exists for that child
if not zkhandler.exists(self.path(kpath, child)): if not zkhandler.zk_conn.exists(self.path(kpath, child)):
if logger is not None: if logger is not None:
logger.out(f'Key not found: {self.path(kpath, child)}', state='w') logger.out(f'Key not found: {self.path(kpath, child)}', state='w')
result = False result = False
# Continue for child keys under network (reservation, acl)
if elem in ['network'] and ikey in ['reservation', 'rule.in', 'rule.out']:
if ikey in ['rule.in', 'rule.out']:
sikey = 'rule'
else:
sikey = ikey
npath = self.path(f'{elem}.{ikey}', child)
for nchild in zkhandler.zk_conn.get_children(npath):
nkpath = f'{npath}/{nchild}'
for esikey in self.keys(sikey):
nkikey = f'{nkpath}/{esikey}'
if not zkhandler.zk_conn.exists(nkikey):
result = False
# These two have several children layers that must be parsed through # These two have several children layers that must be parsed through
for elem in ['volume']: for elem in ['volume']:
# First read all the subelements of the key class (pool layer) # First read all the subelements of the key class (pool layer)
for pchild in zkhandler.children(self.path(f'base.{elem}')): for pchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
# Finally read all the subelements of the key class (volume layer) # Finally read all the subelements of the key class (volume layer)
for vchild in zkhandler.children(self.path(f'base.{elem}') + f'/{pchild}'): for vchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}') + f'/{pchild}'):
child = f'{pchild}/{vchild}' child = f'{pchild}/{vchild}'
# For each key in the schema for that particular elem # For each key in the schema for that particular elem
for ikey in self.keys(elem): for ikey in self.keys(elem):
kpath = f'{elem}.{ikey}' kpath = f'{elem}.{ikey}'
# Validate that the key exists for that child # Validate that the key exists for that child
if not zkhandler.exists(self.path(kpath, child)): if not zkhandler.zk_conn.exists(self.path(kpath, child)):
if logger is not None: if logger is not None:
logger.out(f'Key not found: {self.path(kpath, child)}', state='w') logger.out(f'Key not found: {self.path(kpath, child)}', state='w')
result = False result = False
for elem in ['snapshot']: for elem in ['snapshot']:
# First read all the subelements of the key class (pool layer) # First read all the subelements of the key class (pool layer)
for pchild in zkhandler.children(self.path(f'base.{elem}')): for pchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
# Next read all the subelements of the key class (volume layer) # Next read all the subelements of the key class (volume layer)
for vchild in zkhandler.children(self.path(f'base.{elem}') + f'/{pchild}'): for vchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}') + f'/{pchild}'):
# Finally read all the subelements of the key class (volume layer) # Finally read all the subelements of the key class (volume layer)
for schild in zkhandler.children(self.path(f'base.{elem}') + f'/{pchild}/{vchild}'): for schild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}') + f'/{pchild}/{vchild}'):
child = f'{pchild}/{vchild}/{schild}' child = f'{pchild}/{vchild}/{schild}'
# For each key in the schema for that particular elem # For each key in the schema for that particular elem
for ikey in self.keys(elem): for ikey in self.keys(elem):
kpath = f'{elem}.{ikey}' kpath = f'{elem}.{ikey}'
# Validate that the key exists for that child # Validate that the key exists for that child
if not zkhandler.exists(self.path(kpath, child)): if not zkhandler.zk_conn.exists(self.path(kpath, child)):
if logger is not None: if logger is not None:
logger.out(f'Key not found: {self.path(kpath, child)}', state='w') logger.out(f'Key not found: {self.path(kpath, child)}', state='w')
result = False result = False
@ -701,59 +720,63 @@ class ZKSchema(object):
for elem in ['base']: for elem in ['base']:
for key in self.keys(elem): for key in self.keys(elem):
kpath = f'{elem}.{key}' kpath = f'{elem}.{key}'
if not zkhandler.exists(self.path(kpath)): if not zkhandler.zk_conn.exists(self.path(kpath)):
zkhandler.write([ zkhandler.zk_conn.create(self.path(kpath), '')
(self.path(kpath), '')
])
for elem in ['node', 'domain', 'network', 'osd', 'pool']: for elem in ['node', 'domain', 'network', 'osd', 'pool']:
# First read all the subelements of the key class # First read all the subelements of the key class
for child in zkhandler.children(self.path(f'base.{elem}')): for child in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
# For each key in the schema for that particular elem # For each key in the schema for that particular elem
for ikey in self.keys(elem): for ikey in self.keys(elem):
kpath = f'{elem}.{ikey}' kpath = f'{elem}.{ikey}'
# Validate that the key exists for that child # Validate that the key exists for that child
if not zkhandler.exists(self.path(kpath, child)): if not zkhandler.zk_conn.exists(self.path(kpath, child)):
zkhandler.write([ zkhandler.zk_conn.create(self.path(kpath), '')
(self.path(kpath), '')
]) # Continue for child keys under network (reservation, acl)
if elem in ['network'] and ikey in ['reservation', 'rule.in', 'rule.out']:
if ikey in ['rule.in', 'rule.out']:
sikey = 'rule'
else:
sikey = ikey
npath = self.path(f'{elem}.{ikey}', child)
for nchild in zkhandler.zk_conn.get_children(npath):
nkpath = f'{npath}/{nchild}'
for esikey in self.keys(sikey):
nkikey = f'{nkpath}/{esikey}'
if not zkhandler.zk_conn.exists(nkikey):
zkhandler.zk_conn.create(nkpath + self.path(ikey, nchild), '')
# These two have several children layers that must be parsed through # These two have several children layers that must be parsed through
for elem in ['volume']: for elem in ['volume']:
# First read all the subelements of the key class (pool layer) # First read all the subelements of the key class (pool layer)
for pchild in zkhandler.children(self.path(f'base.{elem}')): for pchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
# Finally read all the subelements of the key class (volume layer) # Finally read all the subelements of the key class (volume layer)
for vchild in zkhandler.children(self.path(f'base.{elem}') + f'/{pchild}'): for vchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}') + f'/{pchild}'):
child = f'{pchild}/{vchild}' child = f'{pchild}/{vchild}'
# For each key in the schema for that particular elem # For each key in the schema for that particular elem
for ikey in self.keys(elem): for ikey in self.keys(elem):
kpath = f'{elem}.{ikey}' kpath = f'{elem}.{ikey}'
# Validate that the key exists for that child # Validate that the key exists for that child
if not zkhandler.exists(self.path(kpath, child)): if not zkhandler.zk_conn.exists(self.path(kpath, child)):
zkhandler.write([ zkhandler.zk_conn.create(self.path(kpath), '')
(self.path(kpath), '')
])
for elem in ['snapshot']: for elem in ['snapshot']:
# First read all the subelements of the key class (pool layer) # First read all the subelements of the key class (pool layer)
for pchild in zkhandler.children(self.path(f'base.{elem}')): for pchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}')):
# Next read all the subelements of the key class (volume layer) # Next read all the subelements of the key class (volume layer)
for vchild in zkhandler.children(self.path(f'base.{elem}') + f'/{pchild}'): for vchild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}') + f'/{pchild}'):
# Finally read all the subelements of the key class (volume layer) # Finally read all the subelements of the key class (volume layer)
for schild in zkhandler.children(self.path(f'base.{elem}') + f'/{pchild}/{vchild}'): for schild in zkhandler.zk_conn.get_children(self.path(f'base.{elem}') + f'/{pchild}/{vchild}'):
child = f'{pchild}/{vchild}/{schild}' child = f'{pchild}/{vchild}/{schild}'
# For each key in the schema for that particular elem # For each key in the schema for that particular elem
for ikey in self.keys(elem): for ikey in self.keys(elem):
kpath = f'{elem}.{ikey}' kpath = f'{elem}.{ikey}'
# Validate that the key exists for that child # Validate that the key exists for that child
if not zkhandler.exists(self.path(kpath, child)): if not zkhandler.zk_conn.exists(self.path(kpath, child)):
zkhandler.write([ zkhandler.zk_conn.create(self.path(kpath), '')
(self.path(kpath), '')
])
zkhandler.write([ zkhandler.zk_conn.create(self.path('base.schema.version'), self.version)
(self.path('base.schema.version'), self.version)
])
# Migrate key diffs # Migrate key diffs
def run_migrate(self, zkhandler, changes): def run_migrate(self, zkhandler, changes):