Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tiered store README.md error about Configuration #7436

Merged
merged 3 commits into from
Nov 9, 2023
Merged

Fix tiered store README.md error about Configuration #7436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25f63f3
Fix tiered store README.md error about Configuration
yangguodongByteDance Oct 10, 2023
829451e
Fix change tieredStoreFilePath to tieredStoreFilepath
yangguodongByteDance Oct 11, 2023
371b765
revert README.md change
yangguodongByteDance Oct 11, 2023
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
10 changes: 5 additions & 5 deletions ...dstore/src/main/java/org/apache/rocketmq/tieredstore/common/TieredMessageStoreConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public boolean check(TieredStorageLevel targetLevel) {
private long readAheadCacheExpireDuration = 10 * 1000;
private double readAheadCacheSizeThresholdRate = 0.3;

private String tieredStoreFilePath = "";
private String tieredStoreFilepath = "";

private String objectStoreEndpoint = "";

Expand Down Expand Up @@ -350,12 +350,12 @@ public void setReadAheadCacheSizeThresholdRate(double rate) {
this.readAheadCacheSizeThresholdRate = rate;
}

public String getTieredStoreFilePath() {
return tieredStoreFilePath;
public String getTieredStoreFilepath() {
return tieredStoreFilepath;
}

public void setTieredStoreFilePath(String tieredStoreFilePath) {
this.tieredStoreFilePath = tieredStoreFilePath;
public void setTieredStoreFilepath(String tieredStoreFilepath) {
this.tieredStoreFilepath = tieredStoreFilepath;
}

public void setObjectStoreEndpoint(String objectStoreEndpoint) {
Expand Down
4 changes: 2 additions & 2 deletions ...dstore/src/main/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public PosixFileSegment(TieredMessageStoreConfig storeConfig,
super(storeConfig, fileType, filePath, baseOffset);

// basePath
String basePath = StringUtils.defaultString(storeConfig.getTieredStoreFilePath(),
StringUtils.appendIfMissing(storeConfig.getTieredStoreFilePath(), File.separator));
String basePath = StringUtils.defaultString(storeConfig.getTieredStoreFilepath(),
StringUtils.appendIfMissing(storeConfig.getTieredStoreFilepath(), File.separator));

// fullPath: basePath/hash_cluster/broker/topic/queueId/fileType/baseOffset
String brokerClusterName = storeConfig.getBrokerClusterName();
Expand Down
2 changes: 1 addition & 1 deletion tieredstore/src/test/java/org/apache/rocketmq/tieredstore/file/TieredCommitLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void setUp() throws ClassNotFoundException, NoSuchMethodException {
TieredMessageStoreConfig storeConfig = new TieredMessageStoreConfig();
storeConfig.setBrokerName("brokerName");
storeConfig.setStorePathRootDir(storePath);
storeConfig.setTieredStoreFilePath(storePath + File.separator);
storeConfig.setTieredStoreFilepath(storePath + File.separator);
storeConfig.setTieredBackendServiceProvider("org.apache.rocketmq.tieredstore.provider.posix.PosixFileSegment");
storeConfig.setCommitLogRollingInterval(0);
storeConfig.setTieredStoreCommitLogMaxSize(1000);
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/test/java/org/apache/rocketmq/tieredstore/provider/posix/PosixFileSegmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class PosixFileSegmentTest {
@Before
public void setUp() {
storeConfig = new TieredMessageStoreConfig();
storeConfig.setTieredStoreFilePath(storePath);
storeConfig.setTieredStoreFilepath(storePath);
mq = new MessageQueue("OSSFileSegmentTest", "broker", 0);
TieredStoreExecutor.init();
}
Expand Down
Loading