This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 46ad109 correct spelling
new b057f93 Merge pull request #1646 from liaozan/master
46ad109 is described below
commit 46ad1096ee60dda43ed476eafe934602df70ec3d
Author: liaozan <[email protected]>
AuthorDate: Thu Dec 12 23:37:39 2019 +0800
correct spelling
---
.../main/java/org/apache/rocketmq/store/CommitLog.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
index 3d89fe4..352585c 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -596,7 +596,7 @@ public class CommitLog {
msg.setStoreHostAddressV6Flag();
}
- long eclipsedTimeInLock = 0;
+ long elapsedTimeInLock = 0;
MappedFile unlockMappedFile = null;
MappedFile mappedFile = this.mappedFileQueue.getLastMappedFile();
@@ -647,14 +647,14 @@ public class CommitLog {
return new
PutMessageResult(PutMessageStatus.UNKNOWN_ERROR, result);
}
- eclipsedTimeInLock =
this.defaultMessageStore.getSystemClock().now() - beginLockTimestamp;
+ elapsedTimeInLock =
this.defaultMessageStore.getSystemClock().now() - beginLockTimestamp;
beginTimeInLock = 0;
} finally {
putMessageLock.unlock();
}
- if (eclipsedTimeInLock > 500) {
- log.warn("[NOTIFYME]putMessage in lock cost time(ms)={},
bodyLength={} AppendMessageResult={}", eclipsedTimeInLock,
msg.getBody().length, result);
+ if (elapsedTimeInLock > 500) {
+ log.warn("[NOTIFYME]putMessage in lock cost time(ms)={},
bodyLength={} AppendMessageResult={}", elapsedTimeInLock, msg.getBody().length,
result);
}
if (null != unlockMappedFile &&
this.defaultMessageStore.getMessageStoreConfig().isWarmMapedFileEnable()) {
@@ -752,7 +752,7 @@ public class CommitLog {
messageExtBatch.setStoreHostAddressV6Flag();
}
- long eclipsedTimeInLock = 0;
+ long elapsedTimeInLock = 0;
MappedFile unlockMappedFile = null;
MappedFile mappedFile = this.mappedFileQueue.getLastMappedFile();
@@ -807,14 +807,14 @@ public class CommitLog {
return new
PutMessageResult(PutMessageStatus.UNKNOWN_ERROR, result);
}
- eclipsedTimeInLock =
this.defaultMessageStore.getSystemClock().now() - beginLockTimestamp;
+ elapsedTimeInLock =
this.defaultMessageStore.getSystemClock().now() - beginLockTimestamp;
beginTimeInLock = 0;
} finally {
putMessageLock.unlock();
}
- if (eclipsedTimeInLock > 500) {
- log.warn("[NOTIFYME]putMessages in lock cost time(ms)={},
bodyLength={} AppendMessageResult={}", eclipsedTimeInLock,
messageExtBatch.getBody().length, result);
+ if (elapsedTimeInLock > 500) {
+ log.warn("[NOTIFYME]putMessages in lock cost time(ms)={},
bodyLength={} AppendMessageResult={}", elapsedTimeInLock,
messageExtBatch.getBody().length, result);
}
if (null != unlockMappedFile &&
this.defaultMessageStore.getMessageStoreConfig().isWarmMapedFileEnable()) {