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

Use absolute path for ZK schema

This commit is contained in:
Joshua Boniface 2024-08-27 09:39:32 -04:00
parent 26d0d08873
commit 8177d5f8b7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon-common/zkhandler.py
View File

@ -30,6 +30,9 @@ from kazoo.client import KazooClient, KazooState
from kazoo.exceptions import NoNodeError from kazoo.exceptions import NoNodeError
SCHEMA_ROOT_PATH = "/usr/share/pvc/daemon_lib/migrations/versions"
# #
# Function decorators # Function decorators
# #
@ -869,7 +872,7 @@ class ZKSchema(object):
if not quiet: if not quiet:
print(f"Loading schema version {version}") print(f"Loading schema version {version}")
with open(f"daemon_lib/migrations/versions/{version}.json", "r") as sfh: with open(f"{SCHEMA_ROOT_PATH}/{version}.json", "r") as sfh:
self.schema = json.load(sfh) self.schema = json.load(sfh)
self.version = self.schema.get("version") self.version = self.schema.get("version")
@ -1218,7 +1221,7 @@ class ZKSchema(object):
# Write the latest schema to a file # Write the latest schema to a file
@classmethod @classmethod
def write(cls): def write(cls):
schema_file = "daemon_lib/migrations/versions/{}.json".format(cls._version) schema_file = f"{SCHEMA_ROOT_PATH}/{cls._version}.json"
with open(schema_file, "w") as sfh: with open(schema_file, "w") as sfh:
json.dump(cls._schema, sfh) json.dump(cls._schema, sfh)
@ -1226,7 +1229,7 @@ class ZKSchema(object):
@staticmethod @staticmethod
def find_all(start=0, end=None): def find_all(start=0, end=None):
versions = list() versions = list()
for version in os.listdir("daemon_lib/migrations/versions"): for version in os.listdir(SCHEMA_ROOT_PATH):
sequence_id = int(version.split(".")[0]) sequence_id = int(version.split(".")[0])
if end is None: if end is None:
if sequence_id > start: if sequence_id > start:
@ -1242,7 +1245,7 @@ class ZKSchema(object):
@staticmethod @staticmethod
def find_latest(): def find_latest():
latest_version = 0 latest_version = 0
for version in os.listdir("daemon_lib/migrations/versions"): for version in os.listdir(SCHEMA_ROOT_PATH):
sequence_id = int(version.split(".")[0]) sequence_id = int(version.split(".")[0])
if sequence_id > latest_version: if sequence_id > latest_version:
latest_version = sequence_id latest_version = sequence_id