Fix a race in pkg/discovery/memory Upstream-commit: cef4ea0b9759386800aae27d6fa92c80d4465745 Component: engine