diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-04-12 12:02:51 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-04-12 12:02:51 +0530 |
| commit | d4ed073c4d386724e4d0376e296ca84f975c3ad4 (patch) | |
| tree | d1c1cef65f249dd1ef8e7eaed8f96fdba849770d /src/com.gluster.storage.management.core | |
| parent | 5cf991b09c3a04c2d98a2e3e60c6d2797f306038 (diff) | |
| parent | 793358f8e1068c944a15d6e16b90dcb4cc1c2950 (diff) | |
Merge branch 'volume-options'
Diffstat (limited to 'src/com.gluster.storage.management.core')
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java index 65501a2b..bac86a2e 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java @@ -24,7 +24,8 @@ public class Event { DISK_REMOVED, NETWORK_INTERFACE_ADDED, NETWORK_INTERFACE_REMOVED, - VOLUME_STATUS_CHANGED + VOLUME_STATUS_CHANGED, + VOLUME_OPTIONS_RESET } private EVENT_TYPE eventType; diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java index 38de196a..d1533f25 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java @@ -178,9 +178,11 @@ public class GlusterUtil { List<String> command = prepareVolumeCreateCommand(volume, bricks, count, volumeType, transportTypeStr); ProcessResult result = processUtil.executeCommand(command); if(!result.isSuccess()) { + // TODO: Perform cleanup on all nodes before returning return new Status(result); } - return new Status(result); + + return createOptions(volume); } private List<String> prepareVolumeCreateCommand(Volume volume, List<String> bricks, int count, String volumeType, |