Skip to content

Fix stale profile-running state after /profile start conflicts #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afurm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix stale profile-running state after /profile start conflicts #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/app_profiler/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,12 @@ def start_running(stackprof_args)

@profile_running = true

AppProfiler.start(**stackprof_args)
AppProfiler.start(**stackprof_args).tap do |started|
@profile_running = false unless started
end
rescue
@profile_running = false
raise
end
end

Expand Down
13 changes: 13 additions & 0 deletions test/app_profiler/profile_server_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,19 @@ def app
AppProfiler.stop
end

test "app can start profiling again after external conflict clears" do
begin
AppProfiler.start
get("/profile?duration=0.01")
assert_equal(decode_status(last_response.status), Net::HTTPConflict)
ensure
AppProfiler.stop
end

get("/profile?duration=0.01")
assert(last_response.ok?)
end

private

def with_profiled_workload(workload, &block)
Expand Down