Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void updateLockFreeTimestamp(String topic, String group, int queueId, Lon
}
});
} catch (Exception e) {
POP_LOGGER.error("unexpect error when updateLockFreeTimestamp. topic:{}, group:{}, queueId:{}, lockFreeTimestamp:{}",
POP_LOGGER.error("unexpected error when updateLockFreeTimestamp. topic:{}, group:{}, queueId:{}, lockFreeTimestamp:{}",
topic, group, queueId, lockFreeTimestamp, e);
}
}
Expand All @@ -108,7 +108,7 @@ protected void notifyLockIsFree(Key key) {
try {
this.brokerController.getPopMessageProcessor().notifyLongPollingRequestIfNeed(key.topic, key.group, key.queueId);
} catch (Exception e) {
POP_LOGGER.error("unexpect error when notifyLockIsFree. key:{}", key, e);
POP_LOGGER.error("unexpected error when notifyLockIsFree. key:{}", key, e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void setDropped(boolean dropped) {

public void fillPopProcessQueueInfo(final PopProcessQueueInfo info) {
info.setWaitAckCount(getWaiAckMsgCount());
info.setDroped(isDropped());
info.setDropped(isDropped());
info.setLastPopTimestamp(getLastPopTimestamp());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ public void fillProcessQueueInfo(final ProcessQueueInfo info) {
info.setTryUnlockTimes(this.tryUnlockTimes.get());
info.setLastLockTimestamp(this.lastLockTimestamp);

info.setDroped(this.dropped);
info.setDropped(this.dropped);
info.setLastPullTimestamp(this.lastPullTimestamp);
info.setLastConsumeTimestamp(this.lastConsumeTimestamp);
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -731,10 +731,10 @@ public boolean removeUnnecessaryPopMessageQueue(final MessageQueue mq, final Pop
public void removeProcessQueue(final MessageQueue mq) {
ProcessQueue prev = this.processQueueTable.remove(mq);
if (prev != null) {
boolean droped = prev.isDropped();
boolean dropped = prev.isDropped();
prev.setDropped(true);
this.removeUnnecessaryMessageQueue(mq, prev);
log.info("Fix Offset, {}, remove unnecessary mq, {} Droped: {}", consumerGroup, mq, droped);
log.info("Fix Offset, {}, remove unnecessary mq, {} Dropped: {}", consumerGroup, mq, dropped);
}
}

Expand Down
2 changes: 1 addition & 1 deletion docs/cn/operation.md
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ RocketMQ 5.0 开始支持自动主从切换的模式,可参考以下文档
</tr>
<tr height=23 style='height:17.0pt'>
<td height=23 class=xl67 width=87 style='height:17.0pt;width:65pt'>-i</td>
<td class=xl67 width=87 style='width:65pt'>uniqe msg id</td>
<td class=xl67 width=87 style='width:65pt'>unique msg id</td>
</tr>
<tr height=36 style='height:27.0pt'>
<td height=36 class=xl67 width=87 style='height:27.0pt;width:65pt'>-g</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/en/Operations_Trace.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

## 2 Support for Message Trace Cluster Deployment

### 2.1 Broker Configuration Fille
### 2.1 Broker Configuration File

The properties profile content of the Broker side enabled message trace feature is pasted here:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ public static void checkLessThanOperand(Expression expr) {

/**
* Validates that the expression can be used in == or <> expression. Cannot
* not be NULL TRUE or FALSE litterals.
* not be NULL TRUE or FALSE literals.
*/
public static void checkEqualOperand(Expression expr) {
if (expr instanceof ConstantExpression) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private static Number negate(Number left) {
} else if (clazz == Double.class) {
return new Double(-left.doubleValue());
} else if (clazz == BigDecimal.class) {
// We ussually get a big deciamal when we have Long.MIN_VALUE
// We usually get a big decimal when we have Long.MIN_VALUE
// constant in the
// Selector. Long.MIN_VALUE is too big to store in a Long as a
// positive so we store it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public ParseException(String message) {
/**
* This is the last token that has been consumed successfully. If
* this object has been created due to a parse error, the token
* followng this token will (therefore) be the first error token.
* following this token will (therefore) be the first error token.
*/
public Token currentToken;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ final public String stringLitteral() throws ParseException {
StringBuffer rc = new StringBuffer();
boolean first = true;
t = jj_consume_token(STRING_LITERAL);
// Decode the sting value.
// Decode the string value.
String image = t.image;
for (int i = 1; i < image.length() - 1; i++) {
char c = image.charAt(i);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static void main(String[] args) {
}));
} catch (Exception e) {
e.printStackTrace();
log.error("find an unexpect err.", e);
log.error("find an unexpected err.", e);
System.exit(1);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected void scheduleRenewTask() {
});
}
} catch (Exception e) {
log.error("unexpect error when schedule renew task", e);
log.error("unexpected error when schedule renew task", e);
}

log.debug("scan for renewal done. cost:{}ms", stopwatch.elapsed().toMillis());
Expand Down Expand Up @@ -227,7 +227,7 @@ protected CompletableFuture<MessageReceiptHandle> startRenewMessage(ProxyContext
});
}
} catch (Throwable t) {
log.error("unexpect error when renew message, stop to renew it. handle:{}", messageReceiptHandle, t);
log.error("unexpected error when renew message, stop to renew it. handle:{}", messageReceiptHandle, t);
resFuture.complete(null);
}
return resFuture;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class TlsHelper {

public interface DecryptionStrategy {
/**
* Decrypt the target encrpted private key file.
* Decrypt the target encrypted private key file.
*
* @param privateKeyEncryptPath A pathname string
* @param forClient tells whether it's a client-side key file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static String analyzeProcessQueue(final String clientId, ConsumerRunningI
mq,
System.currentTimeMillis() - pq.getLastLockTimestamp()));
} else {
if (pq.isDroped() && pq.getTryUnlockTimes() > 0) {
if (pq.isDropped() && pq.getTryUnlockTimes() > 0) {
sb.append(String.format("%s %s unlock %d times, still failed%n",
clientId,
mq,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

public class PopProcessQueueInfo {
private int waitAckCount;
private boolean droped;
private boolean dropped;
private long lastPopTimestamp;


Expand All @@ -32,13 +32,13 @@ public void setWaitAckCount(int waitAckCount) {
}


public boolean isDroped() {
return droped;
public boolean isDropped() {
return dropped;
}


public void setDroped(boolean droped) {
this.droped = droped;
public void setDropped(boolean dropped) {
this.dropped = dropped;
}


Expand All @@ -54,6 +54,6 @@ public void setLastPopTimestamp(long lastPopTimestamp) {
@Override
public String toString() {
return "PopProcessQueueInfo [waitAckCount:" + waitAckCount +
", droped:" + droped + ", lastPopTimestamp:" + lastPopTimestamp + "]";
", dropped:" + dropped + ", lastPopTimestamp:" + lastPopTimestamp + "]";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ProcessQueueInfo {
private long tryUnlockTimes;
private long lastLockTimestamp;

private boolean droped;
private boolean dropped;
private long lastPullTimestamp;
private long lastConsumeTimestamp;

Expand Down Expand Up @@ -119,12 +119,12 @@ public void setLastLockTimestamp(long lastLockTimestamp) {
this.lastLockTimestamp = lastLockTimestamp;
}

public boolean isDroped() {
return droped;
public boolean isDropped() {
return dropped;
}

public void setDroped(boolean droped) {
this.droped = droped;
public void setDropped(boolean dropped) {
this.dropped = dropped;
}

public long getLastPullTimestamp() {
Expand Down Expand Up @@ -159,8 +159,8 @@ public String toString() {
+ ", transactionMsgMinOffset=" + transactionMsgMinOffset
+ ", transactionMsgMaxOffset=" + transactionMsgMaxOffset + ", transactionMsgCount="
+ transactionMsgCount + ", locked=" + locked + ", tryUnlockTimes=" + tryUnlockTimes
+ ", lastLockTimestamp=" + UtilAll.timeMillisToHumanString(lastLockTimestamp) + ", droped="
+ droped + ", lastPullTimestamp=" + UtilAll.timeMillisToHumanString(lastPullTimestamp)
+ ", lastLockTimestamp=" + UtilAll.timeMillisToHumanString(lastLockTimestamp) + ", dropped="
+ dropped + ", lastPullTimestamp=" + UtilAll.timeMillisToHumanString(lastPullTimestamp)
+ ", lastConsumeTimestamp=" + UtilAll.timeMillisToHumanString(lastConsumeTimestamp) + "]";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class LogicQueueMappingItem extends RemotingSerializable {
private String bname; //important, immutable
private long logicOffset; // the start of the logic offset, important, can be changed by command only once
private long startOffset; // the start of the physical offset, should always be 0, immutable
private long endOffset = -1; // the end of the physical offset, excluded, revered -1, mutable
private long endOffset = -1; // the end of the physical offset, excluded, reversed -1, mutable
private long timeOfStart = -1; // mutable, reserved
private long timeOfEnd = -1; // mutable, reserved

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public interface MappedFile {
/**
* Returns the flushed position of this mapped file.
*
* @return the flushed posotion
* @return the flushed position
*/
int getFlushedPosition();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ public static RMQNormalConsumer getRMQNormalConsumer(String nsAddr, String consu

public static RMQBroadCastConsumer getRMQBroadCastConsumer(String nsAddr, String consumerGroup,
String topic, String subExpression,
AbstractListener listner) {
AbstractListener listener) {
RMQBroadCastConsumer consumer = new RMQBroadCastConsumer(nsAddr, topic, subExpression,
consumerGroup, listner);
consumerGroup, listener);
consumer.create();
consumer.start();
return consumer;
}

public static RMQSqlConsumer getRMQSqlConsumer(String nsAddr, String consumerGroup,
String topic, MessageSelector selector,
AbstractListener listner) {
AbstractListener listener) {
RMQSqlConsumer consumer = new RMQSqlConsumer(nsAddr, topic, selector,
consumerGroup, listner);
consumerGroup, listener);
consumer.create();
consumer.start();
return consumer;
Expand Down
2 changes: 1 addition & 1 deletion tieredstore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The following are some core configurations, for more details, see [TieredMessage
| tieredStoreFileReservedTime | 72 | hour | Default topic TTL in tiered storage |
| tieredStoreGroupCommitCount | 2500 | | The number of messages that trigger one batch transfer |
| tieredStoreGroupCommitSize | 33554432 | byte | The size of messages that trigger one batch transfer, 32M by default |
| tieredStoreMaxGroupCommitCount | 10000 | | The maximum number of messages waiting to be transfered per queue |
| tieredStoreMaxGroupCommitCount | 10000 | | The maximum number of messages waiting to be transferred per queue |
| readAheadCacheExpireDuration | 1000 | millisecond | Read-ahead cache expiration time |
| readAheadCacheSizeThresholdRate | 0.3 | | The maximum heap space occupied by the read-ahead cache |

Expand Down
Loading