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

Fix possible race condition applying schemas

Browse Source 
Found an instance where two of these fired too close together, and
caused a fatal error. Use a write lock, and then catch the schema.apply
function in case it fails anyways.
This commit is contained in:
Joshua Boniface
2024-01-11 00:06:11 -05:00
parent 39ec427c42
commit a5763c9d25
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node-daemon/pvcnoded/Daemon.py
View File

@@ -197,6 +197,8 @@ def entrypoint():
os.execv(sys.argv[0], sys.argv) os.execv(sys.argv[0], sys.argv)
# Validate the schema # Validate the schema
with zkhandler.writelock("base.schema.version"):
sleep(0.5)
pvcnoded.util.zookeeper.validate_schema(logger, zkhandler) pvcnoded.util.zookeeper.validate_schema(logger, zkhandler)
# Define a cleanup function # Define a cleanup function

3
node-daemon/pvcnoded/util/zookeeper.py
View File

@@ -94,7 +94,10 @@ def validate_schema(logger, zkhandler):
# Validate our schema against the active version # Validate our schema against the active version
if not zkhandler.schema.validate(zkhandler, logger): if not zkhandler.schema.validate(zkhandler, logger):
logger.out("Found schema violations, applying", state="i") logger.out("Found schema violations, applying", state="i")
try:
zkhandler.schema.apply(zkhandler) zkhandler.schema.apply(zkhandler)
except Exception as e:
logger.out(f"Failed to apply schema updates: {e}", state="w")
else: else:
logger.out("Schema successfully validated", state="o") logger.out("Schema successfully validated", state="o")