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

Fix some bugs with migrations

This commit is contained in:
Joshua Boniface 2021-06-09 00:04:16 -04:00
parent e475552391
commit f2b55ba937
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemon-common/zkhandler.py
View File

@ -703,9 +703,6 @@ class ZKSchema(object):
for key in diff_rename.keys(): for key in diff_rename.keys():
rename_tasks.append((diff_rename[key]['from'], diff_rename[key]['to'])) rename_tasks.append((diff_rename[key]['from'], diff_rename[key]['to']))
print(add_tasks)
print(remove_tasks)
print(rename_tasks)
zkhandler.write(add_tasks) zkhandler.write(add_tasks)
zkhandler.delete(remove_tasks) zkhandler.delete(remove_tasks)
zkhandler.rename(rename_tasks) zkhandler.rename(rename_tasks)
@ -714,7 +711,8 @@ class ZKSchema(object):
def migrate(self, zkhandler, new_version): def migrate(self, zkhandler, new_version):
# Determine the versions in between # Determine the versions in between
versions = ZKSchema.find_all(start=self.version, end=new_version) versions = ZKSchema.find_all(start=self.version, end=new_version)
print(versions) if versions is None:
return
for version in versions: for version in versions:
# Create a new schema at that version # Create a new schema at that version
@ -722,7 +720,6 @@ class ZKSchema(object):
zkschema_new.load(version) zkschema_new.load(version)
# Get a list of changes # Get a list of changes
changes = ZKSchema.key_diff(self, zkschema_new) changes = ZKSchema.key_diff(self, zkschema_new)
print(changes)
# Apply those changes # Apply those changes
self.run_migrate(zkhandler, changes) self.run_migrate(zkhandler, changes)
@ -730,8 +727,10 @@ class ZKSchema(object):
def rollback(self, zkhandler, old_version): def rollback(self, zkhandler, old_version):
# Determine the versions in between # Determine the versions in between
versions = ZKSchema.find_all(start=old_version - 1, end=self.version - 1) versions = ZKSchema.find_all(start=old_version - 1, end=self.version - 1)
if versions is None:
return
versions.reverse() versions.reverse()
print(versions)
for version in versions: for version in versions:
# Create a new schema at that version # Create a new schema at that version
@ -739,13 +738,8 @@ class ZKSchema(object):
zkschema_old.load(version) zkschema_old.load(version)
# Get a list of changes # Get a list of changes
changes = ZKSchema.key_diff(self, zkschema_old) changes = ZKSchema.key_diff(self, zkschema_old)
print(changes)
# Apply those changes # Apply those changes
self.run_migrate(zkhandler, changes) self.run_migrate(zkhandler, changes)
# Update the schema version key
zkhandler.write([
(self.key('base.schema.version'), zkschema_old.version)
])
@classmethod @classmethod
def key_diff(cls, schema_a, schema_b): def key_diff(cls, schema_a, schema_b):