diff options
| author | selvam <selvam@selvam-Studio-XPS-1340.(none)> | 2011-05-31 14:30:37 +0530 |
|---|---|---|
| committer | selvam <selvam@selvam-Studio-XPS-1340.(none)> | 2011-06-01 14:03:18 +0530 |
| commit | ea83cf916261dadce09a3f9ffb7267ae7c825642 (patch) | |
| tree | ad142f69112dd13ac261e565acefe7e030a64c13 /src/com.gluster.storage.management.client | |
| parent | 0e78b61ba5ac8bbb493a567032176c372def32bc (diff) | |
| parent | a1edd29efb3af8e34627113b5f5e700c61084737 (diff) | |
Merge branch 'master' of github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.client')
| -rw-r--r-- | src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java index 693c81a0..194859e1 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java @@ -28,6 +28,7 @@ import com.gluster.storage.management.core.model.Cluster; import com.gluster.storage.management.core.model.ClusterListener; import com.gluster.storage.management.core.model.Disk; import com.gluster.storage.management.core.model.Event; +import com.gluster.storage.management.core.model.Disk.DISK_STATUS; import com.gluster.storage.management.core.model.Event.EVENT_TYPE; import com.gluster.storage.management.core.model.GlusterDataModel; import com.gluster.storage.management.core.model.GlusterServer; @@ -214,8 +215,15 @@ public class GlusterDataModelManager { */ Disk disk = null; List<Disk> volumeDisks = new ArrayList<Disk>(); - for (String volumeDisk : volume.getDisks()) { - disk = getDisk(volumeDisk); + for (Brick brick : volume.getBricks()) { + disk = getDisk(brick.getDiskName()); + // disk = new Disk(); + // disk.setServerName(brick.getServerName()); + // disk.setName(brick.getDiskName()); + // disk.setStatus(DISK_STATUS.READY); + // disk.setMountPoint("/export/" + disk.getName()); + // disk.setSpace(250d); + // disk.setSpaceInUse(186.39); if (disk != null && disk.isReady()) { volumeDisks.add(disk); } @@ -226,7 +234,7 @@ public class GlusterDataModelManager { public List<Brick> getOnlineBricks(Volume volume) { List<Brick> onlineBricks = new ArrayList<Brick>(); for (Brick brick : volume.getBricks()) { - if (!isOnlineDisk(brick.getDiskName())) { + if (isOnlineDisk(brick.getDiskName())) { onlineBricks.add(brick); } } |