openstack/manila
Code Issues Proposed changes

Initialize profiler after ProcessLauncher fork

Browse Source 
Closes-Bug: #2067609
Change-Id: I988779cea3e57a846a7f4a542dd0c6efee2009a8
This commit is contained in:
Sylvan Le Deunff 2024-05-31 10:58:00 +02:00
parent a56725c3d3
commit c4144bd5a3
No known key found for this signature in database
GPG Key ID: 906DB2319C859F5F
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/service.py
View File

@ -132,7 +132,6 @@ class Service(service.Service):
self.saved_args, self.saved_kwargs = args, kwargs self.saved_args, self.saved_kwargs = args, kwargs
self.coordinator = coordination self.coordinator = coordination
setup_profiler(binary, host)
self.rpcserver = None self.rpcserver = None
def start(self): def start(self):
@ -141,6 +140,7 @@ class Service(service.Service):
{'topic': self.topic, 'version_string': version_string}) {'topic': self.topic, 'version_string': version_string})
self.model_disconnected = False self.model_disconnected = False
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
setup_profiler(self.binary, self.host)
try: try:
service_ref = db.service_get_by_args(ctxt, service_ref = db.service_get_by_args(ctxt,
@ -362,7 +362,6 @@ class WSGIService(service.ServiceBase):
"greater than 1. Input value ignored.", {'name': name}) "greater than 1. Input value ignored.", {'name': name})
# Reset workers to default # Reset workers to default
self.workers = None self.workers = None
setup_profiler(name, self.host)
self.server = wsgi.Server( self.server = wsgi.Server(
CONF, CONF,
@ -403,6 +402,7 @@ class WSGIService(service.ServiceBase):
:returns: None :returns: None
""" """
setup_profiler(self.name, self.host)
if self.manager: if self.manager:
self.manager.init_host() self.manager.init_host()
self.server.start() self.server.start()

6
releasenotes/notes/bug-2067609-make-osprofiler-initialization-compatible-with-forks.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
OSprofiler is now initialized after forking because at
least its opentelemetry driver loses tracing context
when process is forked.