From cd6dcbefedac0d33e625ab844c03e7fff3f0e64d Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Sun, 9 Oct 2016 15:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9volume=E6=93=8D=E4=BD=9C=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=88=96=E5=A4=B1=E8=B4=A5=E9=83=BD=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VolumeServiceImpl.java       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/com/platform/service/impl/VolumeServiceImpl.java b/src/com/platform/service/impl/VolumeServiceImpl.java
index 1884d8c9..4527f603 100644
--- a/src/com/platform/service/impl/VolumeServiceImpl.java
+++ b/src/com/platform/service/impl/VolumeServiceImpl.java
@@ -33,6 +33,7 @@ public class VolumeServiceImpl implements IVolumeService {
 
 	@Override
 	public int save(VolumeEntity entity) throws Exception {
+		int rest = 1;
 		//createVolume("lili_test1", 0, "distributed", bricksToCreate, "/home/lili_test1_point")
 		List<VolumeEntity> result = gfsService.getAllVolumes();
 		List<VolumeEntity> addVolumes = new ArrayList<VolumeEntity>();
@@ -76,7 +77,10 @@ public class VolumeServiceImpl implements IVolumeService {
 			
 			//创建volume
 			if (bristr.size() > 0) {
-				volumeService.createVolume(add.getName(), 0, "distributed", bristr, add.getPath());
+				int createreslt = volumeService.createVolume(add.getName(), 0, "distributed", bristr, add.getPath());
+				if (createreslt != 1) {
+					rest = createreslt;
+				}
 			}
 			//记录volume信息，
 			VolumeInitEntity volInSql = new VolumeInitEntity();
@@ -107,7 +111,10 @@ public class VolumeServiceImpl implements IVolumeService {
 			newKeys.addAll(newBrickKeys);
 			// 新增brick s，
 			if (newKeys.size() > 0) {
-				volumeService.addBrickVolume(entity.getName(), newKeys, 0, "distributed");
+				int createreslt = volumeService.addBrickVolume(entity.getName(), newKeys, 0, "distributed");
+				if (createreslt != 1) {
+					rest = createreslt;
+				}
 			}
 			//待删除的Brick的 Keys
 			for (Brick brick : newBricks) {
@@ -120,7 +127,10 @@ public class VolumeServiceImpl implements IVolumeService {
 			deleteKeys.addAll(serverBrickKeys);
 			// 删除brick s，
 			if (deleteKeys.size() > 0) {
-				volumeService.deleteBrickVolume(entity.getName(), deleteKeys, 0, "distributed");
+				int createreslt = volumeService.deleteBrickVolume(entity.getName(), deleteKeys, 0, "distributed");
+				if (createreslt != 1) {
+					rest = createreslt;
+				}
 			}
 			// ---对比volume信息--原数据有该volume，则对比brick信息，确认那几个brick是新增的，那几个brick是待删除的----- end
 		
@@ -134,7 +144,7 @@ public class VolumeServiceImpl implements IVolumeService {
 				}
 			}
 		}
-		return 0;
+		return rest;
 	}
 
 	@Override
@@ -142,9 +152,9 @@ public class VolumeServiceImpl implements IVolumeService {
 		if (null == entity.getName() || "".equals(entity.getName())) {
 			return -1;
 		}
-		volumeService.deleteVolume(entity.getName());
+		int rest = volumeService.deleteVolume(entity.getName());
 		volumeDao.remove(entity.getName());
-		return 0;
+		return rest;
 	}
 
 	@Override