summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.core
diff options
context:
space:
mode:
authorShireesh Anjal <shireesh@gluster.com>2011-07-19 22:04:46 +0530
committerShireesh Anjal <shireesh@gluster.com>2011-07-21 18:58:28 +0530
commit99dfb86d11034f3452899c8fe1c5e5023712cd87 (patch)
tree3241628eb1f5e73f9b1bcd3a2e89da9ca52d947b /src/com.gluster.storage.management.core
parent20e5a7311a7a25b438896b5b0347fb605008f89f (diff)
Story #38 - CPU Usage graph
Diffstat (limited to 'src/com.gluster.storage.management.core')
-rw-r--r--src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java4
-rw-r--r--src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
index 7c1d3d54..4a00ac5a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
@@ -88,6 +88,10 @@ public class Device extends Entity {
return getStatus() == DEVICE_STATUS.IO_ERROR;
}
+ public boolean isInitialized() {
+ return getStatus() == DEVICE_STATUS.INITIALIZED;
+ }
+
public boolean isReady() {
return (getStatus() == DEVICE_STATUS.INITIALIZED && getType() == DEVICE_TYPE.DATA);
}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
index d464ee9e..f06ca258 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
@@ -166,7 +166,7 @@ public class Disk extends Device {
Double space = 0d;
if (hasPartitions()) {
for (Partition partition : getPartitions()) {
- if (partition.isReady()) {
+ if (partition.isInitialized()) {
space += partition.getSpace();
}
}
@@ -181,7 +181,7 @@ public class Disk extends Device {
Double spaceInUse = 0d;
if (hasPartitions()) {
for (Partition partition : getPartitions()) {
- if (partition.isReady()) {
+ if (partition.isInitialized()) {
spaceInUse += partition.getSpaceInUse();
}
}