Skip to content

[ROCKETMQ-5] Avoid creating directories in UtilAll#getDiskPartitionSp… #23

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

Closed
wants to merge 1 commit into from
Closed

[ROCKETMQ-5] Avoid creating directories in UtilAll#getDiskPartitionSp… #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions common/src/main/java/org/apache/rocketmq/common/UtilAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,16 @@ public static double getDiskPartitionSpaceUsedPercent(final String path) {

try {
File file = new File(path);
if (!file.exists()) {
boolean result = file.mkdirs();
if (!result) {
//TO DO
}
}

if (!file.exists())
return -1;

long totalSpace = file.getTotalSpace();
long freeSpace = file.getFreeSpace();
long usedSpace = totalSpace - freeSpace;

if (totalSpace > 0) {
long freeSpace = file.getFreeSpace();
long usedSpace = totalSpace - freeSpace;

return usedSpace / (double) totalSpace;
}
} catch (Exception e) {
Expand Down
13 changes: 13 additions & 0 deletions common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import java.util.Properties;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;

public class UtilAllTest {
Expand Down Expand Up @@ -78,6 +80,17 @@ public void test_getpid() {
assertTrue(pid > 0);
}

@Test
public void test_getDiskPartitionSpaceUsedPercent() {
assertEquals(-1, UtilAll.getDiskPartitionSpaceUsedPercent(null), 0);
assertEquals(-1, UtilAll.getDiskPartitionSpaceUsedPercent(""), 0);

assertEquals(-1, UtilAll.getDiskPartitionSpaceUsedPercent("nonExistingPath"), 0);

String tmpDir = System.getProperty("java.io.tmpdir");
assertNotEquals(-1, UtilAll.getDiskPartitionSpaceUsedPercent(tmpDir), 0);
}

@Test
public void test_isBlank() {
{
Expand Down