Repository: hadoop Updated Branches: refs/heads/HDFS-7240 3983e94f0 -> 9cb63fdba
HDFS-11774. Ozone: KSM: add deleteVolume. Contributed by Mukul Kumar Singh. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9cb63fdb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cb63fdb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cb63fdb Branch: refs/heads/HDFS-7240 Commit: 9cb63fdba0f10b3f42afb4a139f14e37664ee618 Parents: 3983e94 Author: Xiaoyu Yao <x...@apache.org> Authored: Wed May 31 14:21:17 2017 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Wed May 31 14:21:17 2017 -0700 ---------------------------------------------------------------------- ...ceManagerProtocolClientSideTranslatorPB.java | 17 +++++- .../org/apache/hadoop/ozone/ksm/KSMMetrics.java | 20 +++++++ .../hadoop/ozone/ksm/KeySpaceManager.java | 8 ++- .../hadoop/ozone/ksm/MetadataManager.java | 6 ++ .../hadoop/ozone/ksm/MetadataManagerImpl.java | 19 ++++++ .../apache/hadoop/ozone/ksm/VolumeManager.java | 8 +++ .../hadoop/ozone/ksm/VolumeManagerImpl.java | 51 ++++++++++++++-- .../ozone/ksm/exceptions/KSMException.java | 1 + ...ceManagerProtocolServerSideTranslatorPB.java | 11 +++- .../web/storage/DistributedStorageHandler.java | 2 +- .../hadoop/ozone/ksm/TestKeySpaceManager.java | 62 ++++++++++++++++++++ 11 files changed, 195 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ksm/protocolPB/KeySpaceManagerProtocolClientSideTranslatorPB.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ksm/protocolPB/KeySpaceManagerProtocolClientSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ksm/protocolPB/KeySpaceManagerProtocolClientSideTranslatorPB.java index 15b633c..edc9101 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ksm/protocolPB/KeySpaceManagerProtocolClientSideTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ksm/protocolPB/KeySpaceManagerProtocolClientSideTranslatorPB.java @@ -59,6 +59,10 @@ import org.apache.hadoop.ozone.protocol.proto import org.apache.hadoop.ozone.protocol.proto .KeySpaceManagerProtocolProtos.SetVolumePropertyResponse; import org.apache.hadoop.ozone.protocol.proto + .KeySpaceManagerProtocolProtos.DeleteVolumeRequest; +import org.apache.hadoop.ozone.protocol.proto + .KeySpaceManagerProtocolProtos.DeleteVolumeResponse; +import org.apache.hadoop.ozone.protocol.proto .KeySpaceManagerProtocolProtos.InfoVolumeRequest; import org.apache.hadoop.ozone.protocol.proto .KeySpaceManagerProtocolProtos.InfoVolumeResponse; @@ -233,7 +237,18 @@ public final class KeySpaceManagerProtocolClientSideTranslatorPB */ @Override public void deleteVolume(String volume) throws IOException { - + DeleteVolumeRequest.Builder req = DeleteVolumeRequest.newBuilder(); + req.setVolumeName(volume); + final DeleteVolumeResponse resp; + try { + resp = rpcProxy.deleteVolume(NULL_RPC_CONTROLLER, req.build()); + } catch (ServiceException e) { + throw ProtobufHelper.getRemoteException(e); + } + if (resp.getStatus() != Status.OK) { + throw new + IOException("Delete Volume failed, error:" + resp.getStatus()); + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMMetrics.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMMetrics.java index 31e4756..88ffb1a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMMetrics.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KSMMetrics.java @@ -32,6 +32,7 @@ public class KSMMetrics { private @Metric MutableCounterLong numVolumeModifies; private @Metric MutableCounterLong numVolumeInfos; private @Metric MutableCounterLong numBucketCreates; + private @Metric MutableCounterLong numVolumeDeletes; private @Metric MutableCounterLong numBucketInfos; private @Metric MutableCounterLong numBucketModifies; private @Metric MutableCounterLong numKeyAllocate; @@ -41,6 +42,7 @@ public class KSMMetrics { private @Metric MutableCounterLong numVolumeCreateFails; private @Metric MutableCounterLong numVolumeModifyFails; private @Metric MutableCounterLong numVolumeInfoFails; + private @Metric MutableCounterLong numVolumeDeleteFails; private @Metric MutableCounterLong numBucketCreateFails; private @Metric MutableCounterLong numBucketInfoFails; private @Metric MutableCounterLong numBucketModifyFails; @@ -69,6 +71,10 @@ public class KSMMetrics { numVolumeInfos.incr(); } + public void incNumVolumeDeletes() { + numVolumeDeletes.incr(); + } + public void incNumBucketCreates() { numBucketCreates.incr(); } @@ -93,6 +99,10 @@ public class KSMMetrics { numVolumeInfoFails.incr(); } + public void incNumVolumeDeleteFails() { + numVolumeDeleteFails.incr(); + } + public void incNumBucketCreateFails() { numBucketCreateFails.incr(); } @@ -137,6 +147,11 @@ public class KSMMetrics { } @VisibleForTesting + public long getNumVolumeDeletes() { + return numVolumeDeletes.value(); + } + + @VisibleForTesting public long getNumBucketCreates() { return numBucketCreates.value(); } @@ -167,6 +182,11 @@ public class KSMMetrics { } @VisibleForTesting + public long getNumVolumeDeleteFails() { + return numVolumeDeleteFails.value(); + } + + @VisibleForTesting public long getNumBucketCreateFails() { return numBucketCreateFails.value(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KeySpaceManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KeySpaceManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KeySpaceManager.java index 0ee5cab..8589e4b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KeySpaceManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/KeySpaceManager.java @@ -335,7 +335,13 @@ public class KeySpaceManager implements KeySpaceManagerProtocol { */ @Override public void deleteVolume(String volume) throws IOException { - + try { + metrics.incNumVolumeDeletes(); + volumeManager.deleteVolume(volume); + } catch (Exception ex) { + metrics.incNumVolumeDeleteFails(); + throw ex; + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManager.java index 78d0193..cba2dc9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManager.java @@ -104,4 +104,10 @@ public interface MetadataManager { * @return bytes of DB key. */ byte[] getDBKeyForKey(String volume, String bucket, String key); + + /** + * Given a volume, check if it is empty, i.e there are no buckets inside it. + * @param volume - Volume name + */ + boolean isVolumeEmpty(String volume) throws IOException; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManagerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManagerImpl.java index fdd035a..8efe724 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManagerImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/MetadataManagerImpl.java @@ -21,6 +21,7 @@ import org.apache.hadoop.ozone.OzoneConfiguration; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.web.utils.OzoneUtils; import org.apache.hadoop.utils.LevelDBStore; +import org.iq80.leveldb.DBIterator; import org.iq80.leveldb.Options; import org.iq80.leveldb.WriteBatch; @@ -188,4 +189,22 @@ public class MetadataManagerImpl implements MetadataManager { } } + /** + * Given a volume, check if it is empty, i.e there are no buckets inside it. + * @param volume - Volume name + * @return true if the volume is empty + */ + public boolean isVolumeEmpty(String volume) throws IOException { + try (DBIterator iterator = store.getIterator()) { + String dbVolumeRootName = OzoneConsts.KSM_VOLUME_PREFIX + volume + + OzoneConsts.KSM_BUCKET_PREFIX; + byte[] dbVolumeRootKey = DFSUtil.string2Bytes(dbVolumeRootName); + // Seek to the root of the volume and look for the next key + iterator.seek(dbVolumeRootKey); + String firstBucketKey = DFSUtil.bytes2String(iterator.next().getKey()); + // if the key starts with /<volume name> + // then there is at least one bucket + return !firstBucketKey.startsWith(OzoneConsts.KSM_VOLUME_PREFIX + volume); + } + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManager.java index 489646d..6f3339f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManager.java @@ -56,4 +56,12 @@ public interface VolumeManager { * @throws IOException */ KsmVolumeArgs getVolumeInfo(String volume) throws IOException; + + /** + * Deletes an existing empty volume. + * + * @param volume - Name of the volume. + * @throws IOException + */ + void deleteVolume(String volume) throws IOException; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManagerImpl.java index 7b96da7..a7c080e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManagerImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/VolumeManagerImpl.java @@ -167,8 +167,8 @@ public class VolumeManagerImpl implements VolumeManager { public void setOwner(String volume, String owner) throws IOException { Preconditions.checkNotNull(volume); Preconditions.checkNotNull(owner); - List<Map.Entry<byte[], byte[]>> putbatch = new LinkedList<>(); - List<byte[]> deletebatch = new LinkedList<>(); + List<Map.Entry<byte[], byte[]>> putBatch = new LinkedList<>(); + List<byte[]> deleteBatch = new LinkedList<>(); metadataManager.writeLock().lock(); try { byte[] dbVolumeKey = metadataManager.getVolumeKey(volume); @@ -182,8 +182,8 @@ public class VolumeManagerImpl implements VolumeManager { Preconditions.checkState(volume.equalsIgnoreCase(volumeInfo.getVolume())); delVolumeFromOwnerList(volume, volumeArgs.getOwnerName(), - putbatch, deletebatch); - addVolumeToOwnerList(volume, owner, putbatch); + putBatch, deleteBatch); + addVolumeToOwnerList(volume, owner, putBatch); KsmVolumeArgs newVolumeArgs = KsmVolumeArgs.newBuilder().setVolume(volumeArgs.getVolume()) @@ -193,9 +193,9 @@ public class VolumeManagerImpl implements VolumeManager { .build(); VolumeInfo newVolumeInfo = newVolumeArgs.getProtobuf(); - putbatch.add(batchEntry(dbVolumeKey, newVolumeInfo.toByteArray())); + putBatch.add(batchEntry(dbVolumeKey, newVolumeInfo.toByteArray())); - metadataManager.batchPutDelete(putbatch, deletebatch); + metadataManager.batchPutDelete(putBatch, deleteBatch); } catch (IOException ex) { LOG.error("Changing volume ownership failed for user:{} volume:{}", owner, volume, ex); @@ -271,4 +271,43 @@ public class VolumeManagerImpl implements VolumeManager { metadataManager.readLock().unlock(); } } + + /** + * Deletes an existing empty volume. + * + * @param volume - Name of the volume. + * @throws IOException + */ + @Override + public void deleteVolume(String volume) throws IOException { + Preconditions.checkNotNull(volume); + metadataManager.writeLock().lock(); + try { + List<Map.Entry<byte[], byte[]>> putBatch = new LinkedList<>(); + List<byte[]> deleteBatch = new LinkedList<>(); + byte[] dbVolumeKey = metadataManager.getVolumeKey(volume); + byte[] volInfo = metadataManager.get(dbVolumeKey); + if (volInfo == null) { + throw new KSMException(ResultCodes.FAILED_VOLUME_NOT_FOUND); + } + + if (!metadataManager.isVolumeEmpty(volume)) { + throw new KSMException(ResultCodes.FAILED_VOLUME_NOT_EMPTY); + } + + VolumeInfo volumeInfo = VolumeInfo.parseFrom(volInfo); + Preconditions.checkState(volume.equalsIgnoreCase(volumeInfo.getVolume())); + // delete the volume from the owner list + // as well as delete the volume entry + delVolumeFromOwnerList(volume, volumeInfo.getOwnerName(), + putBatch, deleteBatch); + deleteBatch.add(dbVolumeKey); + metadataManager.batchPutDelete(putBatch, deleteBatch); + } catch (IOException ex) { + LOG.error("Delete volume failed for volume:{}", volume, ex); + throw ex; + } finally { + metadataManager.writeLock().unlock(); + } + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/exceptions/KSMException.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/exceptions/KSMException.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/exceptions/KSMException.java index 97be35c..cf8c4c7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/exceptions/KSMException.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/ksm/exceptions/KSMException.java @@ -99,6 +99,7 @@ public class KSMException extends IOException { FAILED_TOO_MANY_USER_VOLUMES, FAILED_VOLUME_ALREADY_EXISTS, FAILED_VOLUME_NOT_FOUND, + FAILED_VOLUME_NOT_EMPTY, FAILED_USER_NOT_FOUND, FAILED_BUCKET_ALREADY_EXISTS, FAILED_BUCKET_NOT_FOUND, http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/protocolPB/KeySpaceManagerProtocolServerSideTranslatorPB.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/protocolPB/KeySpaceManagerProtocolServerSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/protocolPB/KeySpaceManagerProtocolServerSideTranslatorPB.java index e096742..57dd9fe 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/protocolPB/KeySpaceManagerProtocolServerSideTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/protocolPB/KeySpaceManagerProtocolServerSideTranslatorPB.java @@ -104,6 +104,8 @@ public class KeySpaceManagerProtocolServerSideTranslatorPB implements return Status.USER_TOO_MANY_VOLUMES; case FAILED_VOLUME_NOT_FOUND: return Status.VOLUME_NOT_FOUND; + case FAILED_VOLUME_NOT_EMPTY: + return Status.VOLUME_NOT_EMPTY; case FAILED_USER_NOT_FOUND: return Status.USER_NOT_FOUND; case FAILED_BUCKET_ALREADY_EXISTS: @@ -186,7 +188,14 @@ public class KeySpaceManagerProtocolServerSideTranslatorPB implements public DeleteVolumeResponse deleteVolume( RpcController controller, DeleteVolumeRequest request) throws ServiceException { - return null; + DeleteVolumeResponse.Builder resp = DeleteVolumeResponse.newBuilder(); + resp.setStatus(Status.OK); + try { + impl.deleteVolume(request.getVolumeName()); + } catch (IOException e) { + resp.setStatus(exceptionToResponseStatus(e)); + } + return resp.build(); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/storage/DistributedStorageHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/storage/DistributedStorageHandler.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/storage/DistributedStorageHandler.java index 9870d81..14d8203 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/storage/DistributedStorageHandler.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/web/storage/DistributedStorageHandler.java @@ -162,7 +162,7 @@ public final class DistributedStorageHandler implements StorageHandler { @Override public void deleteVolume(VolumeArgs args) throws IOException, OzoneException { - throw new UnsupportedOperationException("deleteVolume not implemented"); + keySpaceManagerClient.deleteVolume(args.getVolumeName()); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cb63fdb/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java index 22d972f..90dbc25 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/ksm/TestKeySpaceManager.java @@ -181,6 +181,68 @@ public class TestKeySpaceManager { Assert.assertEquals(0, ksmMetrics.getNumVolumeInfoFails()); } + // Create a volume and then delete it and then check for deletion + @Test(timeout = 60000) + public void testDeleteVolume() throws IOException, OzoneException { + String userName = "user" + RandomStringUtils.randomNumeric(5); + String adminName = "admin" + RandomStringUtils.randomNumeric(5); + String volumeName = "volume" + RandomStringUtils.randomNumeric(5); + + VolumeArgs createVolumeArgs = new VolumeArgs(volumeName, userArgs); + createVolumeArgs.setUserName(userName); + createVolumeArgs.setAdminName(adminName); + storageHandler.createVolume(createVolumeArgs); + + VolumeArgs getVolumeArgs = new VolumeArgs(volumeName, userArgs); + VolumeInfo retVolumeInfo = storageHandler.getVolumeInfo(getVolumeArgs); + Assert.assertTrue(retVolumeInfo.getVolumeName().equals(volumeName)); + Assert.assertTrue(retVolumeInfo.getOwner().getName().equals(userName)); + Assert.assertEquals(0, ksmMetrics.getNumVolumeCreateFails()); + + storageHandler.deleteVolume(createVolumeArgs); + + try { + retVolumeInfo = storageHandler.getVolumeInfo(getVolumeArgs); + } catch (IOException ex) { + Assert.assertEquals(ex.getMessage(), + "Info Volume failed, error:VOLUME_NOT_FOUND"); + } + } + + // Create a volume and a bucket inside the volume, + // then delete it and then check for deletion failure + @Test(timeout = 60000) + public void testFailedDeleteVolume() throws IOException, OzoneException { + String userName = "user" + RandomStringUtils.randomNumeric(5); + String adminName = "admin" + RandomStringUtils.randomNumeric(5); + String volumeName = "volume" + RandomStringUtils.randomNumeric(5); + String bucketName = "bucket" + RandomStringUtils.randomNumeric(5); + + VolumeArgs createVolumeArgs = new VolumeArgs(volumeName, userArgs); + createVolumeArgs.setUserName(userName); + createVolumeArgs.setAdminName(adminName); + storageHandler.createVolume(createVolumeArgs); + + VolumeArgs getVolumeArgs = new VolumeArgs(volumeName, userArgs); + VolumeInfo retVolumeInfo = storageHandler.getVolumeInfo(getVolumeArgs); + Assert.assertTrue(retVolumeInfo.getVolumeName().equals(volumeName)); + Assert.assertTrue(retVolumeInfo.getOwner().getName().equals(userName)); + Assert.assertEquals(0, ksmMetrics.getNumVolumeCreateFails()); + + BucketArgs bucketArgs = new BucketArgs(volumeName, bucketName, userArgs); + storageHandler.createBucket(bucketArgs); + + try { + storageHandler.deleteVolume(createVolumeArgs); + } catch (IOException ex) { + Assert.assertEquals(ex.getMessage(), + "Delete Volume failed, error:VOLUME_NOT_EMPTY"); + } + retVolumeInfo = storageHandler.getVolumeInfo(getVolumeArgs); + Assert.assertTrue(retVolumeInfo.getVolumeName().equals(volumeName)); + Assert.assertTrue(retVolumeInfo.getOwner().getName().equals(userName)); + } + @Test(timeout = 60000) public void testCreateBucket() throws IOException, OzoneException { String userName = "user" + RandomStringUtils.randomNumeric(5); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
