You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/01/03 09:36:00 UTC
incubator-rocketmq git commit: [ROCKETMQ-5] Avoid creating
directories in UtilAll#getDiskPartitionSpaceUsedPercent(),
closes apache/incubator-rocketmq#23
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master c4f124972 -> 9cb0a0cd4
[ROCKETMQ-5] Avoid creating directories in UtilAll#getDiskPartitionSpaceUsedPercent(), closes apache/incubator-rocketmq#23
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/9cb0a0cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/9cb0a0cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/9cb0a0cd
Branch: refs/heads/master
Commit: 9cb0a0cd46cf91b324b7c6c66d7479d21073d6f6
Parents: c4f1249
Author: shroman <rs...@yahoo.com>
Authored: Tue Jan 3 17:35:47 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Jan 3 17:35:47 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/rocketmq/common/UtilAll.java | 15 +++++++--------
.../java/org/apache/rocketmq/common/UtilAllTest.java | 13 +++++++++++++
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9cb0a0cd/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
index 56015b3..016da0b 100644
--- a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
@@ -183,17 +183,16 @@ public class UtilAll {
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) {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9cb0a0cd/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java b/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java
index 8d8cf79..0db84fe 100644
--- a/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/UtilAllTest.java
@@ -21,6 +21,8 @@ import java.net.URL;
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 {
@@ -79,6 +81,17 @@ public class UtilAllTest {
}
@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() {
{
boolean result = UtilAll.isBlank("Hello ");