Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2021

This is an automatic backport of pull request #2295 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

In uWSGI, the current code starts in the forked process the ProfilerInstance
that has been created in the master process. That actually works fine, except
all Events are discarded by the Recorder because its `pid` attribute is not
updated: it is still the pid of the master process.

Using the `_restart_on_fork` method makes sure that the `ProfilerInstance` gets
a new `Recorder` object with the correct PID.

The test is updated to not test only for file presence, but making sure that
there is at least one sample included.

This removes test_call_script_pprof_output_interval as it is flaky by
construction and fails with the new extended test.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit ea5992b)
@mergify mergify bot requested a review from a team as a code owner April 12, 2021 17:28
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (0.48@7198d79). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             0.48    #2302   +/-   ##
=======================================
  Coverage        ?   91.73%           
=======================================
  Files           ?      575           
  Lines           ?    41258           
  Branches        ?        0           
=======================================
  Hits            ?    37849           
  Misses          ?     3409           
  Partials        ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7198d79...6f08d03. Read the comment docs.

@mergify mergify bot merged commit 340f8d4 into 0.48 Apr 23, 2021
@mergify mergify bot deleted the mergify/bp/0.48/pr-2295 branch April 23, 2021 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants