提交 dc4f3686 编写于 作者: Z zander 提交者: GitHub

Merge pull request #108 from aCoder2013/feature/correct-spelling-mistake

[ROCKETMQ-207]Correct spelling mistake in RouteInfoManager.java
...@@ -161,7 +161,7 @@ public class ConsumeMessageConcurrentlyService implements ConsumeMessageService ...@@ -161,7 +161,7 @@ public class ConsumeMessageConcurrentlyService implements ConsumeMessageService
final long beginTime = System.currentTimeMillis(); final long beginTime = System.currentTimeMillis();
log.info("consumeMessageDirectly receive new messge: {}", msg); log.info("consumeMessageDirectly receive new message: {}", msg);
try { try {
ConsumeConcurrentlyStatus status = this.messageListener.consumeMessage(msgs, context); ConsumeConcurrentlyStatus status = this.messageListener.consumeMessage(msgs, context);
......
...@@ -144,7 +144,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService { ...@@ -144,7 +144,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
final long beginTime = System.currentTimeMillis(); final long beginTime = System.currentTimeMillis();
log.info("consumeMessageDirectly receive new messge: {}", msg); log.info("consumeMessageDirectly receive new message: {}", msg);
try { try {
ConsumeOrderlyStatus status = this.messageListener.consumeMessage(msgs, context); ConsumeOrderlyStatus status = this.messageListener.consumeMessage(msgs, context);
......
...@@ -152,7 +152,7 @@ public class RouteInfoManager { ...@@ -152,7 +152,7 @@ public class RouteInfoManager {
channel, channel,
haServerAddr)); haServerAddr));
if (null == prevBrokerLiveInfo) { if (null == prevBrokerLiveInfo) {
log.info("new broker registerd, {} HAServer: {}", brokerAddr, haServerAddr); log.info("new broker registered, {} HAServer: {}", brokerAddr, haServerAddr);
} }
if (filterServerList != null) { if (filterServerList != null) {
...@@ -205,7 +205,7 @@ public class RouteInfoManager { ...@@ -205,7 +205,7 @@ public class RouteInfoManager {
queueDataList = new LinkedList<QueueData>(); queueDataList = new LinkedList<QueueData>();
queueDataList.add(queueData); queueDataList.add(queueData);
this.topicQueueTable.put(topicConfig.getTopicName(), queueDataList); this.topicQueueTable.put(topicConfig.getTopicName(), queueDataList);
log.info("new topic registerd, {} {}", topicConfig.getTopicName(), queueData); log.info("new topic registered, {} {}", topicConfig.getTopicName(), queueData);
} else { } else {
boolean addNewOne = true; boolean addNewOne = true;
......
...@@ -185,7 +185,7 @@ public class CommitLog { ...@@ -185,7 +185,7 @@ public class CommitLog {
index++; index++;
if (index >= mappedFiles.size()) { if (index >= mappedFiles.size()) {
// Current branch can not happen // Current branch can not happen
log.info("recover last 3 physics file over, last maped file " + mappedFile.getFileName()); log.info("recover last 3 physics file over, last mapped file " + mappedFile.getFileName());
break; break;
} else { } else {
mappedFile = mappedFiles.get(index); mappedFile = mappedFiles.get(index);
...@@ -403,7 +403,7 @@ public class CommitLog { ...@@ -403,7 +403,7 @@ public class CommitLog {
for (; index >= 0; index--) { for (; index >= 0; index--) {
mappedFile = mappedFiles.get(index); mappedFile = mappedFiles.get(index);
if (this.isMappedFileMatchedRecover(mappedFile)) { if (this.isMappedFileMatchedRecover(mappedFile)) {
log.info("recover from this maped file " + mappedFile.getFileName()); log.info("recover from this mapped file " + mappedFile.getFileName());
break; break;
} }
} }
...@@ -445,7 +445,7 @@ public class CommitLog { ...@@ -445,7 +445,7 @@ public class CommitLog {
if (index >= mappedFiles.size()) { if (index >= mappedFiles.size()) {
// The current branch under normal circumstances should // The current branch under normal circumstances should
// not happen // not happen
log.info("recover physics file over, last maped file " + mappedFile.getFileName()); log.info("recover physics file over, last mapped file " + mappedFile.getFileName());
break; break;
} else { } else {
mappedFile = mappedFiles.get(index); mappedFile = mappedFiles.get(index);
...@@ -571,7 +571,7 @@ public class CommitLog { ...@@ -571,7 +571,7 @@ public class CommitLog {
mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise
} }
if (null == mappedFile) { if (null == mappedFile) {
log.error("create maped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString()); log.error("create mapped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
beginTimeInLock = 0; beginTimeInLock = 0;
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null); return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null);
} }
...@@ -586,7 +586,7 @@ public class CommitLog { ...@@ -586,7 +586,7 @@ public class CommitLog {
mappedFile = this.mappedFileQueue.getLastMappedFile(0); mappedFile = this.mappedFileQueue.getLastMappedFile(0);
if (null == mappedFile) { if (null == mappedFile) {
// XXX: warn and notify me // XXX: warn and notify me
log.error("create maped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString()); log.error("create mapped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
beginTimeInLock = 0; beginTimeInLock = 0;
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result); return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result);
} }
...@@ -721,7 +721,7 @@ public class CommitLog { ...@@ -721,7 +721,7 @@ public class CommitLog {
mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise
} }
if (null == mappedFile) { if (null == mappedFile) {
log.error("Create maped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString()); log.error("Create mapped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
beginTimeInLock = 0; beginTimeInLock = 0;
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null); return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null);
} }
...@@ -736,7 +736,7 @@ public class CommitLog { ...@@ -736,7 +736,7 @@ public class CommitLog {
mappedFile = this.mappedFileQueue.getLastMappedFile(0); mappedFile = this.mappedFileQueue.getLastMappedFile(0);
if (null == mappedFile) { if (null == mappedFile) {
// XXX: warn and notify me // XXX: warn and notify me
log.error("Create maped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString()); log.error("Create mapped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
beginTimeInLock = 0; beginTimeInLock = 0;
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result); return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result);
} }
......
...@@ -121,7 +121,7 @@ public class ConsumeQueue { ...@@ -121,7 +121,7 @@ public class ConsumeQueue {
index++; index++;
if (index >= mappedFiles.size()) { if (index >= mappedFiles.size()) {
log.info("recover last consume queue file over, last maped file " log.info("recover last consume queue file over, last mapped file "
+ mappedFile.getFileName()); + mappedFile.getFileName());
break; break;
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册