Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_57962205
redisson
提交
62dbdedf
R
redisson
项目概览
weixin_57962205
/
redisson
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redisson
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
62dbdedf
编写于
9月 17, 2018
作者:
N
Nikita
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed - failedSlaveCheckInterval setting is not applied under some conditions
上级
b669a99b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
26 deletion
+34
-26
redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
...org/redisson/connection/balancer/LoadBalancerManager.java
+3
-1
redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
...ain/java/org/redisson/connection/pool/ConnectionPool.java
+31
-25
未找到文件。
redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
浏览文件 @
62dbdedf
...
@@ -155,7 +155,9 @@ public class LoadBalancerManager {
...
@@ -155,7 +155,9 @@ public class LoadBalancerManager {
}
}
public
ClientConnectionsEntry
freeze
(
ClientConnectionsEntry
connectionEntry
,
FreezeReason
freezeReason
)
{
public
ClientConnectionsEntry
freeze
(
ClientConnectionsEntry
connectionEntry
,
FreezeReason
freezeReason
)
{
if
(
connectionEntry
==
null
)
{
if
(
connectionEntry
==
null
||
(
connectionEntry
.
isFailed
()
&&
connectionEntry
.
getFreezeReason
()
==
FreezeReason
.
RECONNECT
&&
freezeReason
==
FreezeReason
.
RECONNECT
))
{
return
null
;
return
null
;
}
}
...
...
redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
浏览文件 @
62dbdedf
...
@@ -197,8 +197,8 @@ abstract class ConnectionPool<T extends RedisConnection> {
...
@@ -197,8 +197,8 @@ abstract class ConnectionPool<T extends RedisConnection> {
}
}
public
RFuture
<
T
>
get
(
RedisCommand
<?>
command
,
ClientConnectionsEntry
entry
)
{
public
RFuture
<
T
>
get
(
RedisCommand
<?>
command
,
ClientConnectionsEntry
entry
)
{
return
acquireConnection
(
command
,
entry
);
return
acquireConnection
(
command
,
entry
);
}
}
public
static
abstract
class
AcquireCallback
<
T
>
implements
Runnable
,
FutureListener
<
T
>
{
public
static
abstract
class
AcquireCallback
<
T
>
implements
Runnable
,
FutureListener
<
T
>
{
...
@@ -207,28 +207,29 @@ abstract class ConnectionPool<T extends RedisConnection> {
...
@@ -207,28 +207,29 @@ abstract class ConnectionPool<T extends RedisConnection> {
protected
final
RFuture
<
T
>
acquireConnection
(
RedisCommand
<?>
command
,
final
ClientConnectionsEntry
entry
)
{
protected
final
RFuture
<
T
>
acquireConnection
(
RedisCommand
<?>
command
,
final
ClientConnectionsEntry
entry
)
{
final
RPromise
<
T
>
result
=
new
RedissonPromise
<
T
>();
final
RPromise
<
T
>
result
=
new
RedissonPromise
<
T
>();
AcquireCallback
<
T
>
callback
=
new
AcquireCallback
<
T
>()
{
AcquireCallback
<
T
>
callback
=
new
AcquireCallback
<
T
>()
{
@Override
@Override
public
void
run
()
{
public
void
run
()
{
result
.
removeListener
(
this
);
result
.
removeListener
(
this
);
connectTo
(
entry
,
result
);
connectTo
(
entry
,
result
);
}
}
@Override
public
void
operationComplete
(
Future
<
T
>
future
)
throws
Exception
{
entry
.
removeConnection
(
this
);
}
};
@Override
result
.
addListener
(
callback
);
public
void
operationComplete
(
Future
<
T
>
future
)
throws
Exception
{
acquireConnection
(
entry
,
callback
);
entry
.
removeConnection
(
this
);
}
};
result
.
addListener
(
callback
);
acquireConnection
(
entry
,
callback
);
return
result
;
return
result
;
}
}
protected
boolean
tryAcquireConnection
(
ClientConnectionsEntry
entry
)
{
protected
boolean
tryAcquireConnection
(
ClientConnectionsEntry
entry
)
{
if
(
entry
.
getNodeType
()
==
NodeType
.
SLAVE
)
{
if
(
entry
.
getNodeType
()
==
NodeType
.
SLAVE
&&
entry
.
isFailed
())
{
return
!
entry
.
isFailed
();
checkForReconnect
(
entry
,
null
);
return
false
;
}
}
return
true
;
return
true
;
}
}
...
@@ -248,6 +249,11 @@ abstract class ConnectionPool<T extends RedisConnection> {
...
@@ -248,6 +249,11 @@ abstract class ConnectionPool<T extends RedisConnection> {
}
}
T
conn
=
poll
(
entry
);
T
conn
=
poll
(
entry
);
if
(
conn
!=
null
)
{
if
(
conn
!=
null
)
{
if
(!
conn
.
isActive
())
{
promiseFailure
(
entry
,
promise
,
conn
);
return
;
}
connectedSuccessful
(
entry
,
promise
,
conn
);
connectedSuccessful
(
entry
,
promise
,
conn
);
return
;
return
;
}
}
...
@@ -321,10 +327,10 @@ abstract class ConnectionPool<T extends RedisConnection> {
...
@@ -321,10 +327,10 @@ abstract class ConnectionPool<T extends RedisConnection> {
private
void
checkForReconnect
(
ClientConnectionsEntry
entry
,
Throwable
cause
)
{
private
void
checkForReconnect
(
ClientConnectionsEntry
entry
,
Throwable
cause
)
{
if
(
masterSlaveEntry
.
slaveDown
(
entry
,
FreezeReason
.
RECONNECT
))
{
if
(
masterSlaveEntry
.
slaveDown
(
entry
,
FreezeReason
.
RECONNECT
))
{
log
.
error
(
"slave "
+
entry
.
getClient
().
getAddr
()
+
" has been disconnected after "
log
.
error
(
"slave "
+
entry
.
getClient
().
getAddr
()
+
" has been disconnected after "
+
config
.
getFailedSlaveCheckInterval
()
+
"
time interval since moment of
first failed connection"
,
cause
);
+
config
.
getFailedSlaveCheckInterval
()
+
"
ms interval since moment of the
first failed connection"
,
cause
);
scheduleCheck
(
entry
);
scheduleCheck
(
entry
);
}
}
}
}
private
void
scheduleCheck
(
final
ClientConnectionsEntry
entry
)
{
private
void
scheduleCheck
(
final
ClientConnectionsEntry
entry
)
{
...
@@ -380,9 +386,9 @@ abstract class ConnectionPool<T extends RedisConnection> {
...
@@ -380,9 +386,9 @@ abstract class ConnectionPool<T extends RedisConnection> {
promise
.
addListener
(
new
FutureListener
<
Void
>()
{
promise
.
addListener
(
new
FutureListener
<
Void
>()
{
@Override
@Override
public
void
operationComplete
(
Future
<
Void
>
future
)
throws
Exception
{
public
void
operationComplete
(
Future
<
Void
>
future
)
throws
Exception
{
masterSlaveEntry
.
slaveUp
(
entry
,
FreezeReason
.
RECONNECT
);
masterSlaveEntry
.
slaveUp
(
entry
,
FreezeReason
.
RECONNECT
);
log
.
info
(
"slave {} has been successfully reconnected"
,
entry
.
getClient
().
getAddr
());
log
.
info
(
"slave {} has been successfully reconnected"
,
entry
.
getClient
().
getAddr
());
}
}
});
});
initConnections
(
entry
,
promise
,
false
);
initConnections
(
entry
,
promise
,
false
);
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录