Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
656961c7
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
656961c7
编写于
8月 20, 2019
作者:
J
John Hawthorn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #36999 from rails/reaper_fork2
Fix error on reap/flush for closed connection pool
上级
4d3f0217
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
0 deletion
+33
-0
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
...ve_record/connection_adapters/abstract/connection_pool.rb
+2
-0
activerecord/test/cases/reaper_test.rb
activerecord/test/cases/reaper_test.rb
+31
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
浏览文件 @
656961c7
...
...
@@ -650,6 +650,7 @@ def remove(conn)
# or a thread dies unexpectedly.
def
reap
stale_connections
=
synchronize
do
return
unless
@connections
@connections
.
select
do
|
conn
|
conn
.
in_use?
&&
!
conn
.
owner
.
alive?
end
.
each
do
|
conn
|
...
...
@@ -674,6 +675,7 @@ def flush(minimum_idle = @idle_timeout)
return
if
minimum_idle
.
nil?
idle_connections
=
synchronize
do
return
unless
@connections
@connections
.
select
do
|
conn
|
!
conn
.
in_use?
&&
conn
.
seconds_idle
>=
minimum_idle
end
.
each
do
|
conn
|
...
...
activerecord/test/cases/reaper_test.rb
浏览文件 @
656961c7
...
...
@@ -82,6 +82,37 @@ def test_connection_pool_starts_reaper
assert_not_predicate
conn
,
:in_use?
end
def
test_reaper_works_after_pool_discard
spec
=
ActiveRecord
::
Base
.
connection_pool
.
spec
.
dup
spec
.
config
[
:reaping_frequency
]
=
"0.0001"
2
.
times
do
pool
=
ConnectionPool
.
new
spec
conn
,
child
=
new_conn_in_thread
(
pool
)
assert_predicate
conn
,
:in_use?
child
.
terminate
wait_for_conn_idle
(
conn
)
assert_not_predicate
conn
,
:in_use?
pool
.
discard!
end
end
# This doesn't test the reaper directly, but we want to test the action
# it would take on a discarded pool
def
test_reap_flush_on_discarded_pool
spec
=
ActiveRecord
::
Base
.
connection_pool
.
spec
.
dup
pool
=
ConnectionPool
.
new
spec
pool
.
discard!
pool
.
reap
pool
.
flush
end
def
test_connection_pool_starts_reaper_in_fork
spec
=
ActiveRecord
::
Base
.
connection_pool
.
spec
.
dup
spec
.
config
[
:reaping_frequency
]
=
"0.0001"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录