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

perf: move project-open marker inheritance to prepare phase

Browse Source 
Previously apply_defs_to_new_link ran during finalize (after
link._created=True), issuing one PUT /nio round-trip per link end for
each inherited marker — 5000+ HTTP round-trips even for a single def.
Move it into _prepare_link_from_topology (memory_only) so the inherited
markers are already in _link_data when _prepare() constructs the NIO
specs, and create_batch_nios carries them in the single batch dispatch.

Finalize no longer calls apply_defs_to_new_link.  Interactive link
creation (dragging a cable in the UI) still goes through the per-link
create() → apply_defs_to_new_link path — a single link is fast.
This commit is contained in:
YueGuobin 2026-08-11 09:13:14 +08:00
parent e4d4282026
commit 6c0ec30d5d
No known key found for this signature in database
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gns3server/controller/project.py
View File

@ -914,6 +914,15 @@ class Project:
# a link should have 2 attached nodes, this can happen with corrupted projects # a link should have 2 attached nodes, this can happen with corrupted projects
await self.delete_link(link.id, force_delete=True) await self.delete_link(link.id, force_delete=True)
return None return None
# Apply project-level marker definitions onto the link's memory
# (memory_only) before _prepare() so the inherited markers ride the
# batch NIO dispatch — zero extra HTTP round-trips. The final
# apply_defs_to_new_link in finalize is removed.
for def_name, d in self._marker_definitions.items():
try:
await link.inherit_marker(def_name, d, dump=False, memory_only=True)
except ControllerError as e:
log.warning("Marker definition '%s' could not be applied to link %s: %s", def_name, link.id, e)
entries = await link._prepare() entries = await link._prepare()
return (link, entries) return (link, entries)
@ -1850,19 +1859,6 @@ class Project:
n["port"].link = link n["port"].link = link
link._created = True link._created = True
self.emit_notification("link.created", link.asdict()) self.emit_notification("link.created", link.asdict())
if valid and self._marker_definitions:
_marker_t0 = time.time()
log.info(
"Project '%s' [%s]: applying %d marker definition(s) to %d links...",
self._name, self._id, len(self._marker_definitions), len(valid)
)
await asyncio.gather(
*[self.apply_defs_to_new_link(link) for link, _ in valid]
)
log.info(
"Project '%s' [%s]: marker inheritance done in %.2fs",
self._name, self._id, time.time() - _marker_t0
)
log.info("Project '%s' [%s]: created %d links", self._name, self._id, len(valid)) log.info("Project '%s' [%s]: created %d links", self._name, self._id, len(valid))
# Release any pre-allocated UDP ports that were not consumed by links # Release any pre-allocated UDP ports that were not consumed by links
for compute_id, ports in self._preallocated_udp_ports.items(): for compute_id, ports in self._preallocated_udp_ports.items():