Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ SM_LIBS += mpathcount
SM_LIBS += refcounter
SM_LIBS += journaler
SM_LIBS += fjournaler
SM_LIBS += jutils
SM_LIBS += lock
SM_LIBS += flock
SM_LIBS += lock_queue
Expand Down
3 changes: 2 additions & 1 deletion drivers/CephFSSR.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"VDI_CREATE", "VDI_DELETE", "VDI_ATTACH", "VDI_DETACH",
"VDI_UPDATE", "VDI_CLONE", "VDI_SNAPSHOT", "VDI_RESIZE", "VDI_MIRROR",
"VDI_GENERATE_CONFIG",
"VDI_RESET_ON_BOOT/2", "ATOMIC_PAUSE"]
"VDI_RESET_ON_BOOT/2", "ATOMIC_PAUSE", "VDI_REVERT"]

CONFIGURATION = [
['server', 'Ceph server(s) (required, ex: "192.168.0.12" or "10.10.10.10,10.10.10.26")'],
Expand Down Expand Up @@ -120,6 +120,7 @@ def load(self, sr_uuid) -> None:
self.linkpath = os.path.join(self.mountpoint, sr_uuid or "")
self.path = os.path.join(SR.MOUNT_BASE, sr_uuid)
self._check_o_direct()
self._undo_all_journals()

def checkmount(self):
return util.ioretry(lambda: ((util.pathexists(self.mountpoint) and
Expand Down
4 changes: 3 additions & 1 deletion drivers/EXTSR.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"VDI_UPDATE", "VDI_CLONE", "VDI_SNAPSHOT", "VDI_RESIZE", "VDI_MIRROR",
"VDI_GENERATE_CONFIG",
"VDI_RESET_ON_BOOT/2", "ATOMIC_PAUSE", "VDI_CONFIG_CBT",
"VDI_ACTIVATE", "VDI_DEACTIVATE", "THIN_PROVISIONING", "VDI_READ_CACHING"]
"VDI_ACTIVATE", "VDI_DEACTIVATE", "THIN_PROVISIONING", "VDI_READ_CACHING",
"VDI_REVERT"]

CONFIGURATION = [['device', 'local device path (required) (e.g. /dev/sda3)']]

Expand Down Expand Up @@ -75,6 +76,7 @@ def load(self, sr_uuid) -> None:
self.remotepath = os.path.join("/dev", self.vgname, sr_uuid)
self.attached = self._checkmount()
self.driver_config = DRIVER_CONFIG
self._undo_all_journals()

@override
def delete(self, sr_uuid) -> None:
Expand Down
Loading