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

minor msd fixes for slow devices

Browse Source
This commit is contained in:
Devaev Maxim 2019-06-03 00:42:32 +03:00
parent d1266ea09b
commit ea856561c5
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kvmd/apps/__init__.py
View File

@ -219,7 +219,7 @@ def _get_config_scheme(sections: List[str]) -> Dict:
"conv_pin": Option(-1, type=valid_gpio_pin_optional), "conv_pin": Option(-1, type=valid_gpio_pin_optional),
"sync_delay": Option(1.0, type=valid_float_f01), "sync_delay": Option(1.0, type=valid_float_f01),
"init_delay": Option(1.0, type=valid_float_f01), "init_delay": Option(3.0, type=valid_float_f01),
"init_restart_after": Option(0.0, type=(lambda arg: valid_number(arg, min=0.0, type=float))), "init_restart_after": Option(0.0, type=(lambda arg: valid_number(arg, min=0.0, type=float))),
"shutdown_delay": Option(10.0, type=valid_float_f01), "shutdown_delay": Option(10.0, type=valid_float_f01),
"state_poll": Option(1.0, type=valid_float_f01), "state_poll": Option(1.0, type=valid_float_f01),

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

@ -154,11 +154,15 @@ def _parse_image_info_bytes(data: bytes) -> Optional[_ImageInfo]:
def _explore_device(device_path: str) -> Optional[_MassStorageDeviceInfo]: def _explore_device(device_path: str) -> Optional[_MassStorageDeviceInfo]:
# udevadm info -a -p $(udevadm info -q path -n /dev/sda) # udevadm info -a -p $(udevadm info -q path -n /dev/sda)
ctx = pyudev.Context() try:
device = pyudev.Devices.from_device_file(pyudev.Context(), device_path)
except Exception:
get_logger().exception("UDEV error")
return None
device = pyudev.Devices.from_device_file(ctx, device_path)
if device.subsystem != "block": if device.subsystem != "block":
return None return None
try: try:
size = device.attributes.asint("size") * 512 size = device.attributes.asint("size") * 512
except KeyError: except KeyError:
@ -240,7 +244,7 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
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") logger.info("Enabled image metadata writing")
asyncio.get_event_loop().run_until_complete(self.connect_to_kvm(no_delay=True)) asyncio.get_event_loop().run_until_complete(self.connect_to_kvm(initial=True))
except Exception as err: except Exception as err:
if isinstance(err, MsdError): if isinstance(err, MsdError):
log = logger.error log = logger.error
@ -276,14 +280,19 @@ class MassStorageDevice: # pylint: disable=too-many-instance-attributes
gpio.write(self.__reset_pin, False) gpio.write(self.__reset_pin, False)
@_msd_working @_msd_working
async def connect_to_kvm(self, no_delay: bool=False) -> Dict: async def connect_to_kvm(self, initial: bool=False) -> Dict:
with self.__region: with self.__region:
if self.__device_info: if self.__device_info:
raise MsdAlreadyConnectedToKvmError() raise MsdAlreadyConnectedToKvmError()
gpio.write(self.__target_pin, False) gpio.write(self.__target_pin, False)
if not no_delay: if not initial:
await asyncio.sleep(self.__init_delay) await asyncio.sleep(self.__init_delay)
await self.__load_device_info() try:
await self.__load_device_info()
except MsdError:
if not initial:
gpio.write(self.__target_pin, True)
raise
state = self.get_state() state = self.get_state()
await self.__state_queue.put(state) await self.__state_queue.put(state)
get_logger().info("Mass-storage device switched to KVM: %s", self.__device_info) get_logger().info("Mass-storage device switched to KVM: %s", self.__device_info)