Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Kwan的解忧杂货铺@新空间代码工作室
Rocketmq
提交
cc3f9f3b
R
Rocketmq
项目概览
Kwan的解忧杂货铺@新空间代码工作室
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
cc3f9f3b
编写于
11月 13, 2018
作者:
D
dongeforever
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix check style
上级
29fb3339
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
4 deletion
+21
-4
.gitignore
.gitignore
+2
-1
broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
...ain/java/org/apache/rocketmq/broker/BrokerController.java
+2
-2
broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java
...pache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java
+16
-0
store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
...ava/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
+1
-1
未找到文件。
.gitignore
浏览文件 @
cc3f9f3b
...
...
@@ -10,4 +10,5 @@ devenv
*.versionsBackup
!NOTICE-BIN
!LICENSE-BIN
.DS_Store
\ No newline at end of file
.DS_Store
localbin/
broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
浏览文件 @
cc3f9f3b
...
...
@@ -1029,7 +1029,7 @@ public class BrokerController {
private
void
handleSlaveSynchronize
(
BrokerRole
role
)
{
if
(
role
==
BrokerRole
.
SLAVE
)
{
if
(
null
!=
slaveSyncFuture
){
if
(
null
!=
slaveSyncFuture
)
{
slaveSyncFuture
.
cancel
(
false
);
}
this
.
slaveSynchronize
.
setMasterAddr
(
null
);
...
...
@@ -1046,7 +1046,7 @@ public class BrokerController {
},
1000
*
10
,
1000
*
60
,
TimeUnit
.
MILLISECONDS
);
}
else
{
//handle the slave synchronise
if
(
null
!=
slaveSyncFuture
){
if
(
null
!=
slaveSyncFuture
)
{
slaveSyncFuture
.
cancel
(
false
);
}
this
.
slaveSynchronize
.
setMasterAddr
(
null
);
...
...
broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java
浏览文件 @
cc3f9f3b
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.rocketmq.broker.dleger
;
import
org.apache.rocketmq.broker.BrokerController
;
...
...
store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java
浏览文件 @
cc3f9f3b
...
...
@@ -366,7 +366,7 @@ public class DLegerCommitLog extends CommitLog {
break
;
case
INCONSISTENT_LEADER:
case
NOT_LEADER:
case
NOT_READY:
case
LEADER_
NOT_READY:
case
DISK_FULL:
putMessageStatus
=
PutMessageStatus
.
SERVICE_NOT_AVAILABLE
;
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录