GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved msd state machine

Browse Source
This commit is contained in:
Devaev Maxim 2019-06-08 04:10:56 +03:00
parent 85c67ffcbb
commit 445f2f9e63
3 changed files with 86 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kvmd/apps/__init__.py
View File

@ -207,11 +207,12 @@ def _get_config_scheme(sections: List[str]) -> Dict:
"target_pin": Option(-1, type=valid_gpio_pin, only_if="enabled"), "target_pin": Option(-1, type=valid_gpio_pin, only_if="enabled"),
"reset_pin": Option(-1, type=valid_gpio_pin, only_if="enabled"), "reset_pin": Option(-1, type=valid_gpio_pin, only_if="enabled"),
"device": Option("", type=valid_abs_path, only_if="enabled", unpack_as="device_path"), "device": Option("", type=valid_abs_path, only_if="enabled", unpack_as="device_path"),
"init_delay": Option(2.0, type=valid_float_f01), "init_delay": Option(1.0, type=valid_float_f01),
"reset_delay": Option(1.0, type=valid_float_f01), "init_retries": Option(5, type=valid_int_f1),
"write_meta": Option(True, type=valid_bool), "reset_delay": Option(1.0, type=valid_float_f01),
"chunk_size": Option(65536, type=(lambda arg: valid_number(arg, min=1024))), "write_meta": Option(True, type=valid_bool),
"chunk_size": Option(65536, type=(lambda arg: valid_number(arg, min=1024))),
}, },
"streamer": { "streamer": {

134
kvmd/apps/kvmd/msd.py
View File

@ -153,21 +153,12 @@ def _parse_image_info_bytes(data: bytes) -> Optional[_ImageInfo]:
return None return None
def _explore_device(device_path: str) -> Optional[_MassStorageDeviceInfo]: def _explore_device(device_path: str) -> _MassStorageDeviceInfo:
# udevadm info -a -p $(udevadm info -q path -n /dev/sda) # udevadm info -a -p $(udevadm info -q path -n /dev/sda)
try: device = pyudev.Devices.from_device_file(pyudev.Context(), device_path)
device = pyudev.Devices.from_device_file(pyudev.Context(), device_path)
except Exception:
get_logger().exception("UDEV error")
return None
if device.subsystem != "block": if device.subsystem != "block":
return None raise RuntimeError("Not a block device")
try:
size = device.attributes.asint("size") * 512
except KeyError:
return None
hw_info: Optional[_HardwareInfo] = None hw_info: Optional[_HardwareInfo] = None
usb_device = device.find_parent("usb", "usb_device") usb_device = device.find_parent("usb", "usb_device")
@ -177,6 +168,8 @@ def _explore_device(device_path: str) -> Optional[_MassStorageDeviceInfo]:
for attr in ["manufacturer", "product", "serial"] for attr in ["manufacturer", "product", "serial"]
}) })
size = device.attributes.asint("size") * 512
with open(device_path, "rb") as device_file: with open(device_path, "rb") as device_file:
device_file.seek(size - _IMAGE_INFO_SIZE) device_file.seek(size - _IMAGE_INFO_SIZE)
image_info = _parse_image_info_bytes(device_file.read()) image_info = _parse_image_info_bytes(device_file.read())
@ -194,7 +187,7 @@ def _msd_working(method: Callable) -> Callable:
async def wrapper(self: "MassStorageDevice", *args: Any, **kwargs: Any) -> Any: async def wrapper(self: "MassStorageDevice", *args: Any, **kwargs: Any) -> Any:
if not self._enabled: # pylint: disable=protected-access if not self._enabled: # pylint: disable=protected-access
raise MsdDisabledError() raise MsdDisabledError()
if not self._device_path: # pylint: disable=protected-access if not self._device_info: # pylint: disable=protected-access
raise MsdOfflineError() raise MsdOfflineError()
return (await method(self, *args, **kwargs)) return (await method(self, *args, **kwargs))
return wrapper return wrapper
@ -211,6 +204,7 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
device_path: str, device_path: str,
init_delay: float, init_delay: float,
init_retries: int,
reset_delay: float, reset_delay: float,
write_meta: bool, write_meta: bool,
chunk_size: int, chunk_size: int,
@ -226,45 +220,44 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
self.__target_pin = -1 self.__target_pin = -1
self.__reset_pin = -1 self.__reset_pin = -1
self._device_path = device_path self.__device_path = device_path
self.__init_delay = init_delay self.__init_delay = init_delay
self.__init_retries = init_retries
self.__reset_delay = reset_delay self.__reset_delay = reset_delay
self.__write_meta = write_meta self.__write_meta = write_meta
self.chunk_size = chunk_size self.chunk_size = chunk_size
self.__device_info: Optional[_MassStorageDeviceInfo] = None
self.__saved_device_info: Optional[_MassStorageDeviceInfo] = None
self.__region = aioregion.AioExclusiveRegion(MsdIsBusyError) self.__region = aioregion.AioExclusiveRegion(MsdIsBusyError)
self._device_info: Optional[_MassStorageDeviceInfo] = None
self.__device_file: Optional[aiofiles.base.AiofilesContextManager] = None self.__device_file: Optional[aiofiles.base.AiofilesContextManager] = None
self.__written = 0 self.__written = 0
self.__on_kvm = True
self.__state_queue: asyncio.queues.Queue = asyncio.Queue() self.__state_queue: asyncio.queues.Queue = asyncio.Queue()
logger = get_logger(0) logger = get_logger(0)
if self._enabled: if self._enabled:
logger.info("Using %r as mass-storage device", self._device_path) logger.info("Using %r as mass-storage device", self.__device_path)
try: try:
logger.info("Enabled image metadata writing") aiotools.run_sync(self.__load_device_info())
aiotools.run_sync(self.connect_to_kvm(initial=True)) if self.__write_meta:
logger.info("Enabled image metadata writing")
except Exception as err: except Exception as err:
if isinstance(err, MsdError): log = (logger.error if isinstance(err, MsdError) else logger.exception)
log = logger.error
else:
log = logger.exception
log("Mass-storage device is offline: %s", err) log("Mass-storage device is offline: %s", err)
self._device_path = ""
else: else:
logger.info("Mass-storage device is disabled") logger.info("Mass-storage device is disabled")
def get_state(self) -> Dict: def get_state(self) -> Dict:
online = (self._enabled and bool(self._device_path)) online = (self._enabled and bool(self._device_info))
return { return {
"enabled": self._enabled, "enabled": self._enabled,
"online": online, "online": online,
"connected_to": (("kvm" if self.__device_info else "server") if online else None), "connected_to": (("kvm" if self.__on_kvm else "server") if online else None),
"busy": bool(self.__device_file), "busy": self.__region.is_busy(),
"written": self.__written, "written": self.__written,
"info": (dataclasses.asdict(self.__saved_device_info) if self.__saved_device_info else None), "info": (dataclasses.asdict(self._device_info) if online else None),
} }
async def poll_state(self) -> AsyncGenerator[Dict, None]: async def poll_state(self) -> AsyncGenerator[Dict, None]:
@ -283,71 +276,89 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
@_msd_working @_msd_working
@aiotools.atomic @aiotools.atomic
async def connect_to_kvm(self, initial: bool=False) -> Dict: async def connect_to_kvm(self) -> Dict:
with self.__region: with self.__region:
if self.__device_info: if self.__on_kvm:
raise MsdAlreadyConnectedToKvmError() raise MsdAlreadyConnectedToKvmError()
gpio.write(self.__target_pin, False) gpio.write(self.__target_pin, False)
if not initial:
await asyncio.sleep(self.__init_delay)
try: try:
await self.__load_device_info() await self.__load_device_info()
except MsdError: except Exception:
if not initial: if not self.__on_kvm:
gpio.write(self.__target_pin, True) gpio.write(self.__target_pin, True)
raise raise
self.__on_kvm = True
state = self.get_state() state = self.get_state()
await self.__state_queue.put(state) await self.__state_queue.put(state)
get_logger(0).info("Mass-storage device switched to KVM: %s", self.__device_info)
get_logger().info("Mass-storage device switched to KVM: %s", self._device_info)
return state return state
@_msd_working @_msd_working
@aiotools.atomic @aiotools.atomic
async def connect_to_pc(self) -> Dict: async def connect_to_pc(self) -> Dict:
with self.__region: with self.__region:
if not self.__device_info: if not self.__on_kvm:
raise MsdAlreadyConnectedToPcError() raise MsdAlreadyConnectedToPcError()
gpio.write(self.__target_pin, True) gpio.write(self.__target_pin, True)
self.__device_info = None self.__on_kvm = False
state = self.get_state() state = self.get_state()
await self.__state_queue.put(state) await self.__state_queue.put(state)
get_logger(0).info("Mass-storage device switched to Server")
get_logger().info("Mass-storage device switched to Server")
return state return state
@_msd_working
@aiotools.tasked @aiotools.tasked
@aiotools.atomic @aiotools.atomic
async def reset(self) -> None: async def reset(self) -> None:
with self.__region: with self.__region:
if not self._enabled:
raise MsdDisabledError()
get_logger(0).info("Mass-storage device reset") get_logger(0).info("Mass-storage device reset")
gpio.write(self.__reset_pin, True) gpio.write(self.__reset_pin, True)
await asyncio.sleep(self.__reset_delay) await asyncio.sleep(self.__reset_delay)
gpio.write(self.__target_pin, False)
self.__on_kvm = True
await asyncio.sleep(self.__reset_delay)
gpio.write(self.__reset_pin, False) gpio.write(self.__reset_pin, False)
try:
await self.__load_device_info()
finally:
await self.__state_queue.put(self.get_state())
@_msd_working @_msd_working
@aiotools.atomic @aiotools.atomic
async def __aenter__(self) -> "MassStorageDevice": async def __aenter__(self) -> "MassStorageDevice":
assert self._device_info
self.__region.enter() self.__region.enter()
try: try:
if not self.__device_info: if not self.__on_kvm:
raise MsdNotConnectedToKvmError() raise MsdNotConnectedToKvmError()
self.__device_file = await aiofiles.open(self.__device_info.path, mode="w+b", buffering=0) self.__device_file = await aiofiles.open(self._device_info.path, mode="w+b", buffering=0)
self.__written = 0 self.__written = 0
return self return self
except Exception:
self.__region.exit()
raise
finally: finally:
await self.__state_queue.put(self.get_state()) await self.__state_queue.put(self.get_state())
self.__region.exit()
@aiotools.atomic @aiotools.atomic
async def write_image_info(self, name: str, complete: bool) -> None: async def write_image_info(self, name: str, complete: bool) -> None:
assert self.__device_file assert self.__device_file
assert self.__device_info assert self._device_info
if self.__write_meta: if self.__write_meta:
if self.__device_info.size - self.__written > _IMAGE_INFO_SIZE: if self._device_info.size - self.__written > _IMAGE_INFO_SIZE:
await self.__device_file.seek(self.__device_info.size - _IMAGE_INFO_SIZE) await self.__device_file.seek(self._device_info.size - _IMAGE_INFO_SIZE)
await self.__write_to_device_file(_make_image_info_bytes(name, self.__written, complete)) await self.__write_to_device_file(_make_image_info_bytes(name, self.__written, complete))
await self.__device_file.seek(0) await self.__device_file.seek(0)
await self.__load_device_info()
else: else:
get_logger().error("Can't write image info because device is full") get_logger().error("Can't write image info because device is full")
@ -366,6 +377,7 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
) -> None: ) -> None:
try: try:
await self.__close_device_file() await self.__close_device_file()
await self.__load_device_info()
finally: finally:
await self.__state_queue.put(self.get_state()) await self.__state_queue.put(self.get_state())
self.__region.exit() self.__region.exit()
@ -376,19 +388,31 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
await self.__device_file.flush() await self.__device_file.flush()
await aiotools.run_async(os.fsync, self.__device_file.fileno()) await aiotools.run_async(os.fsync, self.__device_file.fileno())
async def __load_device_info(self) -> None:
device_info = await aiotools.run_async(_explore_device, self._device_path)
if not device_info:
raise MsdError("Can't explore device %r" % (self._device_path))
self.__device_info = self.__saved_device_info = device_info
async def __close_device_file(self) -> None: async def __close_device_file(self) -> None:
try: try:
if self.__device_file: if self.__device_file:
get_logger().info("Closing mass-storage device file ...") get_logger().info("Closing mass-storage device file ...")
await self.__device_file.close() await self.__device_file.close()
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception: except Exception:
get_logger().exception("Can't close mass-storage device file") get_logger().exception("Can't close mass-storage device file")
await (await self.reset()) finally:
self.__device_file = None self.__device_file = None
self.__written = 0 self.__written = 0
async def __load_device_info(self) -> None:
retries = self.__init_retries
while True:
await asyncio.sleep(self.__init_delay)
try:
self._device_info = await aiotools.run_async(_explore_device, self.__device_path)
break
except asyncio.CancelledError: # pylint: disable=try-except-raise
raise
except Exception:
if retries == 0:
self._device_info = None
raise MsdError("Can't load device info")
get_logger().exception("Can't load device info; retries=%d", retries)
retries -= 1

2
web/share/js/kvm/msd.js
View File

@ -159,7 +159,7 @@ function Msd() {
wm.switchDisabled($("msd-select-new-image-button"), (!__state.online || __state.connected_to !== "kvm" || __state.busy || __upload_http)); wm.switchDisabled($("msd-select-new-image-button"), (!__state.online || __state.connected_to !== "kvm" || __state.busy || __upload_http));
wm.switchDisabled($("msd-upload-new-image-button"), (!__state.online || __state.connected_to !== "kvm" || __state.busy || !__image_file)); wm.switchDisabled($("msd-upload-new-image-button"), (!__state.online || __state.connected_to !== "kvm" || __state.busy || !__image_file));
wm.switchDisabled($("msd-abort-uploading-button"), (!__state.online || !__upload_http)); wm.switchDisabled($("msd-abort-uploading-button"), (!__state.online || !__upload_http));
wm.switchDisabled($("msd-reset-button"), (!__state.online || __upload_http)); wm.switchDisabled($("msd-reset-button"), (!__state.enabled || __state.busy));
$("msd-new-image").style.display = (__image_file ? "block" : "none"); $("msd-new-image").style.display = (__image_file ? "block" : "none");
$("msd-progress").setAttribute("data-label", "Waiting for upload ..."); $("msd-progress").setAttribute("data-label", "Waiting for upload ...");