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

Fix possible race condition applying schemas 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
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")
zkhandler.schema.apply(zkhandler) try:
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")