Skip to content

Commit ac4fd91

Browse files
authored
[ISSUE apache#2334] Polish the log and response remark when service not available (apache#2335)
* enhancement(response & log):polish the log and response remark when service not available * enhancement(response remark & log): make log and response remark better understand * chore(style): modify code style to pass CI tests
1 parent 26db484 commit ac4fd91

3 files changed

Lines changed: 14 additions & 11 deletions

File tree

broker/src/main/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessor.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,28 +251,29 @@ private void handlePutMessageResult(PutMessageResult putMessageResult,
251251

252252
// Failed
253253
case CREATE_MAPEDFILE_FAILED:
254-
log.info("create mapped file failed, server is busy or broken.");
254+
log.warn("create mapped file failed, server is busy or broken.");
255255
break;
256256
case MESSAGE_ILLEGAL:
257-
log.info(
257+
log.warn(
258258
"the message is illegal, maybe msg properties length limit 32k.");
259259
break;
260260
case PROPERTIES_SIZE_EXCEEDED:
261-
log.info(
261+
log.warn(
262262
"the message is illegal, maybe msg body or properties length not matched. msg body length limit 128k.");
263263
break;
264264
case SERVICE_NOT_AVAILABLE:
265-
log.info(
266-
"service not available now, maybe disk full, maybe your broker machine memory too small.");
265+
log.warn(
266+
"service not available now. It may be caused by one of the following reasons: " +
267+
"the broker's disk is full, messages are put to the slave, message store has been shut down, etc.");
267268
break;
268269
case OS_PAGECACHE_BUSY:
269-
log.info("[PC_SYNCHRONIZED]broker busy, start flow control for a while");
270+
log.warn("[PC_SYNCHRONIZED]broker busy, start flow control for a while");
270271
break;
271272
case UNKNOWN_ERROR:
272-
log.info("UNKNOWN_ERROR");
273+
log.warn("UNKNOWN_ERROR");
273274
break;
274275
default:
275-
log.info("UNKNOWN_ERROR DEFAULT");
276+
log.warn("UNKNOWN_ERROR DEFAULT");
276277
break;
277278
}
278279

broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,8 @@ private RemotingCommand handlePutMessageResult(PutMessageResult putMessageResult
480480
case SERVICE_NOT_AVAILABLE:
481481
response.setCode(ResponseCode.SERVICE_NOT_AVAILABLE);
482482
response.setRemark(
483-
"service not available now, maybe disk full, " + diskUtil() + ", maybe your broker machine memory too small.");
483+
"service not available now. It may be caused by one of the following reasons: " +
484+
"the broker's disk is full [" + diskUtil() + "], messages are put to the slave, message store has been shut down, etc.");
484485
break;
485486
case OS_PAGECACHE_BUSY:
486487
response.setCode(ResponseCode.SYSTEM_ERROR);

store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,16 @@ private PutMessageStatus checkStoreStatus() {
392392
if (BrokerRole.SLAVE == this.messageStoreConfig.getBrokerRole()) {
393393
long value = this.printTimes.getAndIncrement();
394394
if ((value % 50000) == 0) {
395-
log.warn("message store has shutdown, so putMessage is forbidden");
395+
log.warn("broke role is slave, so putMessage is forbidden");
396396
}
397397
return PutMessageStatus.SERVICE_NOT_AVAILABLE;
398398
}
399399

400400
if (!this.runningFlags.isWriteable()) {
401401
long value = this.printTimes.getAndIncrement();
402402
if ((value % 50000) == 0) {
403-
log.warn("message store has shutdown, so putMessage is forbidden");
403+
log.warn("the message store is not writable. It may be caused by one of the following reasons: " +
404+
"the broker's disk is full, write to logic queue error, write to index file error, etc");
404405
}
405406
return PutMessageStatus.SERVICE_NOT_AVAILABLE;
406407
} else {

0 commit comments

Comments
 (0)