CreatBot/CreatBotMoonraker
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_manager: inotify timing fix

Browse Source 
Flush pending delete events when move and create events are detected.  This resolves timing issues with rapidfire create/delete events.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-12-08 12:06:53 -05:00
parent 1ad83cec97
commit ec29787edd
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
moonraker/components/file_manager/file_manager.py
View File

@ -802,6 +802,7 @@ class InotifyNode:
new_name: str, new_name: str,
new_parent: InotifyNode new_parent: InotifyNode
) -> None: ) -> None:
self.flush_delete()
child_node = self.pop_child_node(child_name) child_node = self.pop_child_node(child_name)
if child_node is None: if child_node is None:
logging.info(f"No child for node at path: {self.get_path()}") logging.info(f"No child for node at path: {self.get_path()}")
@ -835,6 +836,7 @@ class InotifyNode:
self.pending_file_events[file_name] = evt_name self.pending_file_events[file_name] = evt_name
async def complete_file_write(self, file_name: str) -> None: async def complete_file_write(self, file_name: str) -> None:
self.flush_delete()
evt_name = self.pending_file_events.pop(file_name, None) evt_name = self.pending_file_events.pop(file_name, None)
if evt_name is None: if evt_name is None:
logging.info(f"Invalid file write event: {file_name}") logging.info(f"Invalid file write event: {file_name}")
@ -873,6 +875,7 @@ class InotifyNode:
name: str, name: str,
notify: bool = True notify: bool = True
) -> InotifyNode: ) -> InotifyNode:
self.flush_delete()
if name in self.child_nodes: if name in self.child_nodes:
return self.child_nodes[name] return self.child_nodes[name]
new_child = InotifyNode(self.ihdlr, self, name) new_child = InotifyNode(self.ihdlr, self, name)
@ -940,6 +943,13 @@ class InotifyNode:
if hdl is not None: if hdl is not None:
hdl.cancel() hdl.cancel()
def flush_delete(self):
if 'delete_child' not in self.pending_node_events:
return
hdl = self.pending_node_events['delete_child']
hdl.cancel()
self._finish_delete_child()
def clear_events(self, include_children: bool = True) -> None: def clear_events(self, include_children: bool = True) -> None:
if include_children: if include_children:
for child in self.child_nodes.values(): for child in self.child_nodes.values():
@ -1295,6 +1305,7 @@ class INotifyHandler:
elif evt.mask & iFlags.MOVED_TO: elif evt.mask & iFlags.MOVED_TO:
logging.debug(f"Inotify file move to: {root}, " logging.debug(f"Inotify file move to: {root}, "
f"{node_path}, {evt.name}") f"{node_path}, {evt.name}")
node.flush_delete()
moved_evt = self.pending_moves.pop(evt.cookie, None) moved_evt = self.pending_moves.pop(evt.cookie, None)
# Don't emit file events if the node is processing metadata # Don't emit file events if the node is processing metadata
can_notify = not node.is_processing() can_notify = not node.is_processing()