NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-23 11:22:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(marker): clean inherited markers on def delete

Browse Source 
delete_marker_definition removed the def but left the inherited global-*
copies on every link: it called stop_marker(), which rejects inherited
markers (409), and the ControllerError was swallowed as a warning. The
orphaned copies were in-memory only (_persist_markers filters inherited
markers) so a restart hid the symptom, but during a running session they
were undeletable via either the per-link or project API.

Add the same inherited=True bypass that update_marker already has, and
pass it from the def-delete fan-out so the copies are removed for real.
This commit is contained in:
YueGuobin 2026-07-13 23:32:42 +08:00
parent 98bcd5eddd
commit cdc27c37a7
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/project.py
View File

@ -994,7 +994,7 @@ class Project:
marker_name = f"global-{name}" marker_name = f"global-{name}"
if marker_name in link.markers and link.markers[marker_name].get("inherited_from") == name: if marker_name in link.markers and link.markers[marker_name].get("inherited_from") == name:
try: try:
await link.stop_marker(marker_name) await link.stop_marker(marker_name, inherited=True)
except ControllerError: except ControllerError:
# A missing compute or broken link shouldn't block the delete. # A missing compute or broken link shouldn't block the delete.
log.warning( log.warning(

6
gns3server/controller/udp_link.py
View File

@ -367,7 +367,7 @@ class UDPLink(Link):
self._project.emit_notification("link.updated", self.asdict()) self._project.emit_notification("link.updated", self.asdict())
self._project.dump() self._project.dump()
async def stop_marker(self, name): async def stop_marker(self, name, inherited=False):
""" """
Remove a traffic-insight marker from this link. Remove a traffic-insight marker from this link.
@ -376,12 +376,14 @@ class UDPLink(Link):
drops it from uBridge. Mirrors how deleting a packet filter works. drops it from uBridge. Mirrors how deleting a packet filter works.
:param name: filter name to remove :param name: filter name to remove
:param inherited: set by project-level def-delete to bypass the
inheritance guard (the project layer is the legitimate remover)
""" """
if name not in self._markers: if name not in self._markers:
raise ControllerNotFoundError(f"Marker '{name}' not found on link {self._id}") raise ControllerNotFoundError(f"Marker '{name}' not found on link {self._id}")
if self._markers[name].get("inherited_from"): if self._markers[name].get("inherited_from") and not inherited:
raise ControllerError( raise ControllerError(
f"Marker '{name}' is inherited from the project-level " f"Marker '{name}' is inherited from the project-level "
f"definition '{self._markers[name]['inherited_from']}'. " f"definition '{self._markers[name]['inherited_from']}'. "