Skip to content

Commit 1754cec

Browse files
authored
Restore the lost PR 3460 (#10067)
1 parent 26480dd commit 1754cec

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,6 @@ public CompletableFuture<PutMessageResult> asyncPutMessage(final MessageExtBroke
10951095
}
10961096
if (null == mappedFile) {
10971097
log.error("create mapped file1 error, topic: {} clientAddr: {}", msg.getTopic(), msg.getBornHostString());
1098-
beginTimeInLock = 0;
10991098
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.CREATE_MAPPED_FILE_FAILED, null));
11001099
}
11011100

@@ -1112,7 +1111,6 @@ public CompletableFuture<PutMessageResult> asyncPutMessage(final MessageExtBroke
11121111
if (null == mappedFile) {
11131112
// XXX: warn and notify me
11141113
log.error("create mapped file2 error, topic: {} clientAddr: {}", msg.getTopic(), msg.getBornHostString());
1115-
beginTimeInLock = 0;
11161114
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.CREATE_MAPPED_FILE_FAILED, result));
11171115
}
11181116
if (isCloseReadAhead()) {
@@ -1125,17 +1123,15 @@ public CompletableFuture<PutMessageResult> asyncPutMessage(final MessageExtBroke
11251123
break;
11261124
case MESSAGE_SIZE_EXCEEDED:
11271125
case PROPERTIES_SIZE_EXCEEDED:
1128-
beginTimeInLock = 0;
11291126
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.MESSAGE_ILLEGAL, result));
11301127
case UNKNOWN_ERROR:
11311128
default:
1132-
beginTimeInLock = 0;
11331129
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.UNKNOWN_ERROR, result));
11341130
}
11351131

11361132
elapsedTimeInLock = this.defaultMessageStore.getSystemClock().now() - beginLockTimestamp;
1137-
beginTimeInLock = 0;
11381133
} finally {
1134+
beginTimeInLock = 0;
11391135
putMessageLock.unlock();
11401136
}
11411137
// Increase queue offset when messages are successfully written
@@ -1260,7 +1256,6 @@ public CompletableFuture<PutMessageResult> asyncPutMessages(final MessageExtBatc
12601256
}
12611257
if (null == mappedFile) {
12621258
log.error("Create mapped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
1263-
beginTimeInLock = 0;
12641259
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.CREATE_MAPPED_FILE_FAILED, null));
12651260
}
12661261

@@ -1275,7 +1270,6 @@ public CompletableFuture<PutMessageResult> asyncPutMessages(final MessageExtBatc
12751270
if (null == mappedFile) {
12761271
// XXX: warn and notify me
12771272
log.error("Create mapped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
1278-
beginTimeInLock = 0;
12791273
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.CREATE_MAPPED_FILE_FAILED, result));
12801274
}
12811275
if (isCloseReadAhead()) {
@@ -1285,17 +1279,15 @@ public CompletableFuture<PutMessageResult> asyncPutMessages(final MessageExtBatc
12851279
break;
12861280
case MESSAGE_SIZE_EXCEEDED:
12871281
case PROPERTIES_SIZE_EXCEEDED:
1288-
beginTimeInLock = 0;
12891282
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.MESSAGE_ILLEGAL, result));
12901283
case UNKNOWN_ERROR:
12911284
default:
1292-
beginTimeInLock = 0;
12931285
return CompletableFuture.completedFuture(new PutMessageResult(PutMessageStatus.UNKNOWN_ERROR, result));
12941286
}
12951287

12961288
elapsedTimeInLock = this.defaultMessageStore.getSystemClock().now() - beginLockTimestamp;
1297-
beginTimeInLock = 0;
12981289
} finally {
1290+
beginTimeInLock = 0;
12991291
putMessageLock.unlock();
13001292
}
13011293

0 commit comments

Comments
 (0)