From 16fa07c6a617298395e54132439b530058d433b4 Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Mon, 30 Sep 2019 18:31:44 -0700 Subject: [PATCH 1/2] HDDS-2201. Rename VolumeList to UserVolumeInfo. --- .../hadoop/ozone/om/OMMetadataManager.java | 4 +-- ...istCodec.java => UserVolumeInfoCodec.java} | 11 +++--- .../src/main/proto/OzoneManagerProtocol.proto | 2 +- .../ozone/om/OmMetadataManagerImpl.java | 25 ++++++------- .../hadoop/ozone/om/VolumeManagerImpl.java | 35 ++++++++++--------- .../s3/bucket/S3BucketCreateRequest.java | 5 ++- .../request/volume/OMVolumeCreateRequest.java | 5 ++- .../request/volume/OMVolumeDeleteRequest.java | 2 +- .../om/request/volume/OMVolumeRequest.java | 12 +++---- .../volume/OMVolumeSetOwnerRequest.java | 4 +-- .../volume/OMVolumeCreateResponse.java | 11 +++--- .../volume/OMVolumeDeleteResponse.java | 8 ++--- .../volume/OMVolumeSetOwnerResponse.java | 8 ++--- .../ozone/om/request/TestOMRequestUtils.java | 6 ++-- .../hadoop/ozone/om/request/package-info.java | 22 ++++++++++++ .../volume/TestOMVolumeCreateRequest.java | 6 ++-- .../volume/TestOMVolumeSetOwnerRequest.java | 4 +-- .../om/response/TestOMResponseUtils.java | 6 ++-- .../ozone/om/response/package-info.java | 22 ++++++++++++ .../volume/TestOMVolumeCreateResponse.java | 6 ++-- .../volume/TestOMVolumeDeleteResponse.java | 8 ++--- .../volume/TestOMVolumeSetOwnerResponse.java | 10 +++--- .../om/response/volume/package-info.java | 18 ++++++++++ .../apache/hadoop/ozone/scm/cli/SQLCLI.java | 4 +-- 24 files changed, 154 insertions(+), 90 deletions(-) rename hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/{VolumeListCodec.java => UserVolumeInfoCodec.java} (80%) create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/package-info.java create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java create mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java index 1d80f97a9b6a0..673d26ade6688 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java @@ -30,7 +30,7 @@ import org.apache.hadoop.ozone.om.helpers.S3SecretValue; import org.apache.hadoop.ozone.om.lock.OzoneManagerLock; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; + .UserVolumeInfo; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; import org.apache.hadoop.hdds.utils.db.DBStore; import org.apache.hadoop.hdds.utils.db.Table; @@ -225,7 +225,7 @@ List listVolumes(String userName, String prefix, * * @return UserTable. */ - Table getUserTable(); + Table getUserTable(); /** * Returns the Volume Table. diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/VolumeListCodec.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java similarity index 80% rename from hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/VolumeListCodec.java rename to hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java index c8190837cb398..8aa9e3f04d91c 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/VolumeListCodec.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java @@ -18,7 +18,8 @@ package org.apache.hadoop.ozone.om.codec; import java.io.IOException; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeList; +import org.apache.hadoop.ozone.protocol.proto + .OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.hdds.utils.db.Codec; import com.google.common.base.Preconditions; @@ -27,22 +28,22 @@ /** * Codec to encode VolumeList as byte array. */ -public class VolumeListCodec implements Codec { +public class UserVolumeInfoCodec implements Codec { @Override - public byte[] toPersistedFormat(VolumeList object) throws IOException { + public byte[] toPersistedFormat(UserVolumeInfo object) throws IOException { Preconditions .checkNotNull(object, "Null object can't be converted to byte array."); return object.toByteArray(); } @Override - public VolumeList fromPersistedFormat(byte[] rawData) throws IOException { + public UserVolumeInfo fromPersistedFormat(byte[] rawData) throws IOException { Preconditions .checkNotNull(rawData, "Null byte array can't converted to real object."); try { - return VolumeList.parseFrom(rawData); + return UserVolumeInfo.parseFrom(rawData); } catch (InvalidProtocolBufferException e) { throw new IllegalArgumentException( "Can't encode the the raw data from the byte array", e); diff --git a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto b/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto index 2b119a68da0ef..d82fdf2a8e263 100644 --- a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto +++ b/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto @@ -352,7 +352,7 @@ message CreateVolumeResponse { } -message VolumeList { +message UserVolumeInfo { repeated string volumeNames = 1; optional uint64 objectID = 2; optional uint64 updateID = 3; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java index 59158e23a491d..6c085911e11b3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java @@ -47,7 +47,7 @@ import org.apache.hadoop.ozone.om.codec.RepeatedOmKeyInfoCodec; import org.apache.hadoop.ozone.om.codec.S3SecretValueCodec; import org.apache.hadoop.ozone.om.codec.TokenIdentifierCodec; -import org.apache.hadoop.ozone.om.codec.VolumeListCodec; +import org.apache.hadoop.ozone.om.codec.UserVolumeInfoCodec; import org.apache.hadoop.ozone.om.exceptions.OMException; import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; @@ -61,7 +61,8 @@ import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.om.helpers.S3SecretValue; import org.apache.hadoop.ozone.om.lock.OzoneManagerLock; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeList; +import org.apache.hadoop.ozone.protocol.proto + .OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; import com.google.common.annotations.VisibleForTesting; @@ -92,7 +93,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager { * |----------------------------------------------------------------------| * | Column Family | VALUE | * |----------------------------------------------------------------------| - * | userTable | user->VolumeList | + * | userTable | /user->UserVolumeInfo | * |----------------------------------------------------------------------| * | volumeTable | /volume->VolumeInfo | * |----------------------------------------------------------------------| @@ -170,7 +171,7 @@ protected OmMetadataManagerImpl() { } @Override - public Table getUserTable() { + public Table getUserTable() { return userTable; } @@ -266,7 +267,7 @@ protected DBStoreBuilder addOMTablesAndCodecs(DBStoreBuilder builder) { .addCodec(RepeatedOmKeyInfo.class, new RepeatedOmKeyInfoCodec()) .addCodec(OmBucketInfo.class, new OmBucketInfoCodec()) .addCodec(OmVolumeArgs.class, new OmVolumeArgsCodec()) - .addCodec(VolumeList.class, new VolumeListCodec()) + .addCodec(UserVolumeInfo.class, new UserVolumeInfoCodec()) .addCodec(OmMultipartKeyInfo.class, new OmMultipartKeyInfoCodec()) .addCodec(S3SecretValue.class, new S3SecretValueCodec()) .addCodec(OmPrefixInfo.class, new OmPrefixInfoCodec()); @@ -279,7 +280,7 @@ protected DBStoreBuilder addOMTablesAndCodecs(DBStoreBuilder builder) { */ protected void initializeOmTables() throws IOException { userTable = - this.store.getTable(USER_TABLE, String.class, VolumeList.class); + this.store.getTable(USER_TABLE, String.class, UserVolumeInfo.class); checkTableStatus(userTable, USER_TABLE); TableCacheImpl.CacheCleanupPolicy cleanupPolicy = @@ -706,7 +707,7 @@ public List listKeys(String volumeName, String bucketName, public List listVolumes(String userName, String prefix, String startKey, int maxKeys) throws IOException { List result = Lists.newArrayList(); - VolumeList volumes; + UserVolumeInfo volumes; if (StringUtil.isBlank(userName)) { throw new OMException("User name is required to list Volumes.", ResultCodes.USER_NOT_FOUND); @@ -747,15 +748,15 @@ public List listVolumes(String userName, return result; } - private VolumeList getVolumesByUser(String userNameKey) + private UserVolumeInfo getVolumesByUser(String userNameKey) throws OMException { try { - VolumeList volumeList = getUserTable().get(userNameKey); - if (volumeList == null) { + UserVolumeInfo userVolInfo = getUserTable().get(userNameKey); + if (userVolInfo == null) { // No volume found for this user, return an empty list - return VolumeList.newBuilder().build(); + return UserVolumeInfo.newBuilder().build(); } else { - return volumeList; + return userVolInfo; } } catch (IOException e) { throw new OMException("Unable to get volumes info by the given user, " diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java index 675895dacff35..4ea8529e2d319 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/VolumeManagerImpl.java @@ -28,8 +28,10 @@ import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.ozone.om.exceptions.OMException; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OzoneAclInfo; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeList; +import org.apache.hadoop.ozone.protocol.proto + .OzoneManagerProtocolProtos.OzoneAclInfo; +import org.apache.hadoop.ozone.protocol.proto + .OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer; import org.apache.hadoop.ozone.security.acl.OzoneObj; import org.apache.hadoop.ozone.security.acl.RequestContext; @@ -73,11 +75,11 @@ public VolumeManagerImpl(OMMetadataManager metadataManager, } // Helpers to add and delete volume from user list - private VolumeList addVolumeToOwnerList(String volume, String owner) + private UserVolumeInfo addVolumeToOwnerList(String volume, String owner) throws IOException { // Get the volume list String dbUserKey = metadataManager.getUserKey(owner); - VolumeList volumeList = metadataManager.getUserTable().get(dbUserKey); + UserVolumeInfo volumeList = metadataManager.getUserTable().get(dbUserKey); List prevVolList = new ArrayList<>(); if (volumeList != null) { prevVolList.addAll(volumeList.getVolumeNamesList()); @@ -92,16 +94,16 @@ private VolumeList addVolumeToOwnerList(String volume, String owner) // Add the new volume to the list prevVolList.add(volume); - VolumeList newVolList = VolumeList.newBuilder() + UserVolumeInfo newVolList = UserVolumeInfo.newBuilder() .addAllVolumeNames(prevVolList).build(); return newVolList; } - private VolumeList delVolumeFromOwnerList(String volume, String owner) + private UserVolumeInfo delVolumeFromOwnerList(String volume, String owner) throws IOException { // Get the volume list - VolumeList volumeList = metadataManager.getUserTable().get(owner); + UserVolumeInfo volumeList = metadataManager.getUserTable().get(owner); List prevVolList = new ArrayList<>(); if (volumeList != null) { prevVolList.addAll(volumeList.getVolumeNamesList()); @@ -112,7 +114,7 @@ private VolumeList delVolumeFromOwnerList(String volume, String owner) // Remove the volume from the list prevVolList.remove(volume); - VolumeList newVolList = VolumeList.newBuilder() + UserVolumeInfo newVolList = UserVolumeInfo.newBuilder() .addAllVolumeNames(prevVolList).build(); return newVolList; } @@ -144,7 +146,7 @@ public void createVolume(OmVolumeArgs omVolumeArgs) throws IOException { throw new OMException(ResultCodes.VOLUME_ALREADY_EXISTS); } - VolumeList volumeList = addVolumeToOwnerList(omVolumeArgs.getVolume(), + UserVolumeInfo volumeList = addVolumeToOwnerList(omVolumeArgs.getVolume(), omVolumeArgs.getOwnerName()); // Set creation time @@ -173,7 +175,7 @@ public void createVolume(OmVolumeArgs omVolumeArgs) throws IOException { } private void createVolumeCommitToDB(OmVolumeArgs omVolumeArgs, - VolumeList volumeList, String dbVolumeKey, String dbUserKey) + UserVolumeInfo volumeList, String dbVolumeKey, String dbUserKey) throws IOException { try (BatchOperation batch = metadataManager.getStore() .initBatchOperation()) { @@ -222,11 +224,12 @@ public void setOwner(String volume, String owner) acquiredUsersLock = metadataManager.getLock().acquireMultiUserLock(owner, originalOwner); - VolumeList oldOwnerVolumeList = delVolumeFromOwnerList(volume, + UserVolumeInfo oldOwnerVolumeList = delVolumeFromOwnerList(volume, originalOwner); String newOwner = metadataManager.getUserKey(owner); - VolumeList newOwnerVolumeList = addVolumeToOwnerList(volume, newOwner); + UserVolumeInfo newOwnerVolumeList = addVolumeToOwnerList(volume, + newOwner); volumeArgs.setOwnerName(owner); setOwnerCommitToDB(oldOwnerVolumeList, newOwnerVolumeList, @@ -246,8 +249,8 @@ public void setOwner(String volume, String owner) } - private void setOwnerCommitToDB(VolumeList oldOwnerVolumeList, - VolumeList newOwnerVolumeList, OmVolumeArgs newOwnerVolumeArgs, + private void setOwnerCommitToDB(UserVolumeInfo oldOwnerVolumeList, + UserVolumeInfo newOwnerVolumeList, OmVolumeArgs newOwnerVolumeArgs, String oldOwner) throws IOException { try (BatchOperation batch = metadataManager.getStore() .initBatchOperation()) { @@ -370,7 +373,7 @@ public void deleteVolume(String volume) throws IOException { Preconditions.checkState(volume.equals(volumeArgs.getVolume())); // delete the volume from the owner list // as well as delete the volume entry - VolumeList newVolumeList = delVolumeFromOwnerList(volume, + UserVolumeInfo newVolumeList = delVolumeFromOwnerList(volume, volumeArgs.getOwnerName()); @@ -390,7 +393,7 @@ public void deleteVolume(String volume) throws IOException { } - private void deleteVolumeCommitToDB(VolumeList newVolumeList, + private void deleteVolumeCommitToDB(UserVolumeInfo newVolumeList, String volume, String owner) throws IOException { try (BatchOperation batch = metadataManager.getStore() .initBatchOperation()) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/bucket/S3BucketCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/bucket/S3BucketCreateRequest.java index 73772982a73f2..7a7091d1a141e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/bucket/S3BucketCreateRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/bucket/S3BucketCreateRequest.java @@ -57,8 +57,7 @@ .S3CreateBucketResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .S3CreateVolumeInfo; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.util.Time; import org.apache.hadoop.hdds.utils.db.cache.CacheKey; import org.apache.hadoop.hdds.utils.db.cache.CacheValue; @@ -176,7 +175,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, OmVolumeArgs omVolumeArgs = createOmVolumeArgs(volumeName, userName, s3CreateBucketRequest.getS3CreateVolumeInfo() .getCreationTime()); - VolumeList volumeList = omMetadataManager.getUserTable().get( + UserVolumeInfo volumeList = omMetadataManager.getUserTable().get( omMetadataManager.getUserKey(userName)); volumeList = addVolumeToOwnerList(volumeList, volumeName, userName, ozoneManager.getMaxUserVolumeCount(), diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java index 3568b3ba23a4a..c06069c2567ac 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java @@ -47,8 +47,7 @@ .OMResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .VolumeInfo; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.util.Time; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD; @@ -133,7 +132,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, } } - VolumeList volumeList = null; + UserVolumeInfo volumeList = null; // acquire lock. acquiredVolumeLock = omMetadataManager.getLock().acquireLock(VOLUME_LOCK, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java index 9bd9a1d5aed42..485536fc32870 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java @@ -95,7 +95,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, } OmVolumeArgs omVolumeArgs = null; - OzoneManagerProtocolProtos.VolumeList newVolumeList = null; + OzoneManagerProtocolProtos.UserVolumeInfo newVolumeList = null; acquiredVolumeLock = omMetadataManager.getLock().acquireLock(VOLUME_LOCK, volume); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java index a5e7645b45574..91c3a3b9a1ef1 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java @@ -26,7 +26,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMRequest; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; + .UserVolumeInfo; import org.apache.hadoop.hdds.utils.db.cache.CacheKey; import org.apache.hadoop.hdds.utils.db.cache.CacheValue; @@ -53,7 +53,7 @@ public OMVolumeRequest(OMRequest omRequest) { * @return VolumeList - updated volume list for the user. * @throws IOException */ - protected VolumeList delVolumeFromOwnerList(VolumeList volumeList, + protected UserVolumeInfo delVolumeFromOwnerList(UserVolumeInfo volumeList, String volume, String owner, long txID) throws IOException { List prevVolList = new ArrayList<>(); @@ -68,7 +68,7 @@ protected VolumeList delVolumeFromOwnerList(VolumeList volumeList, // Remove the volume from the list prevVolList.remove(volume); - VolumeList newVolList = VolumeList.newBuilder() + UserVolumeInfo newVolList = UserVolumeInfo.newBuilder() .addAllVolumeNames(prevVolList) .setObjectID(volumeList.getObjectID()) .setUpdateID(txID) @@ -88,7 +88,7 @@ protected VolumeList delVolumeFromOwnerList(VolumeList volumeList, * @throws OMException - if user has volumes greater than * maxUserVolumeCount, an exception is thrown. */ - protected VolumeList addVolumeToOwnerList(VolumeList volumeList, + protected UserVolumeInfo addVolumeToOwnerList(UserVolumeInfo volumeList, String volume, String owner, long maxUserVolumeCount, long txID) throws IOException { @@ -109,7 +109,7 @@ protected VolumeList addVolumeToOwnerList(VolumeList volumeList, // Add the new volume to the list prevVolList.add(volume); - VolumeList newVolList = VolumeList.newBuilder() + UserVolumeInfo newVolList = UserVolumeInfo.newBuilder() .setObjectID(objectID) .setUpdateID(txID) .addAllVolumeNames(prevVolList).build(); @@ -129,7 +129,7 @@ protected VolumeList addVolumeToOwnerList(VolumeList volumeList, * @throws IOException */ protected void createVolume(final OMMetadataManager omMetadataManager, - OmVolumeArgs omVolumeArgs, VolumeList volumeList, String dbVolumeKey, + OmVolumeArgs omVolumeArgs, UserVolumeInfo volumeList, String dbVolumeKey, String dbUserKey, long transactionLogIndex) { // Update cache: Update user and volume cache. omMetadataManager.getUserTable().addCacheEntry(new CacheKey<>(dbUserKey), diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java index 0dd0ff7bf5780..129b2f9fdd8e6 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java @@ -117,8 +117,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, String dbVolumeKey = omMetadataManager.getVolumeKey(volume); - OzoneManagerProtocolProtos.VolumeList oldOwnerVolumeList = null; - OzoneManagerProtocolProtos.VolumeList newOwnerVolumeList = null; + OzoneManagerProtocolProtos.UserVolumeInfo oldOwnerVolumeList = null; + OzoneManagerProtocolProtos.UserVolumeInfo newOwnerVolumeList = null; OmVolumeArgs omVolumeArgs = null; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java index db2ded4874e06..1bd3e4fd8c701 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeCreateResponse.java @@ -27,8 +27,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -39,14 +38,14 @@ */ public class OMVolumeCreateResponse extends OMClientResponse { - private VolumeList volumeList; + private UserVolumeInfo userVolumeInfo; private OmVolumeArgs omVolumeArgs; public OMVolumeCreateResponse(OmVolumeArgs omVolumeArgs, - VolumeList volumeList, @Nonnull OMResponse omResponse) { + UserVolumeInfo userVolumeInfo, @Nonnull OMResponse omResponse) { super(omResponse); this.omVolumeArgs = omVolumeArgs; - this.volumeList = volumeList; + this.userVolumeInfo = userVolumeInfo; } @Override public void addToDBBatch(OMMetadataManager omMetadataManager, @@ -63,7 +62,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, omMetadataManager.getVolumeTable().putWithBatch(batchOperation, dbVolumeKey, omVolumeArgs); omMetadataManager.getUserTable().putWithBatch(batchOperation, dbUserKey, - volumeList); + userVolumeInfo); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java index 873747ed7c800..6718ce5be6c8c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeDeleteResponse.java @@ -26,7 +26,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; + .UserVolumeInfo; import org.apache.hadoop.hdds.utils.db.BatchOperation; import javax.annotation.Nonnull; @@ -37,10 +37,10 @@ public class OMVolumeDeleteResponse extends OMClientResponse { private String volume; private String owner; - private VolumeList updatedVolumeList; + private UserVolumeInfo updatedVolumeList; public OMVolumeDeleteResponse(String volume, String owner, - VolumeList updatedVolumeList, @Nonnull OMResponse omResponse) { + UserVolumeInfo updatedVolumeList, @Nonnull OMResponse omResponse) { super(omResponse); this.volume = volume; this.owner = owner; @@ -55,7 +55,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // not called in failure scenario in OM code. if (getOMResponse().getStatus() == OzoneManagerProtocolProtos.Status.OK) { String dbUserKey = omMetadataManager.getUserKey(owner); - VolumeList volumeList = updatedVolumeList; + UserVolumeInfo volumeList = updatedVolumeList; if (updatedVolumeList.getVolumeNamesList().size() == 0) { omMetadataManager.getUserTable().deleteWithBatch(batchOperation, dbUserKey); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java index ddf1512d94222..8e0270215f264 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/volume/OMVolumeSetOwnerResponse.java @@ -26,7 +26,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; + .UserVolumeInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; import org.apache.hadoop.hdds.utils.db.BatchOperation; @@ -39,12 +39,12 @@ public class OMVolumeSetOwnerResponse extends OMClientResponse { private String oldOwner; - private VolumeList oldOwnerVolumeList; - private VolumeList newOwnerVolumeList; + private UserVolumeInfo oldOwnerVolumeList; + private UserVolumeInfo newOwnerVolumeList; private OmVolumeArgs newOwnerVolumeArgs; public OMVolumeSetOwnerResponse(String oldOwner, - VolumeList oldOwnerVolumeList, VolumeList newOwnerVolumeList, + UserVolumeInfo oldOwnerVolumeList, UserVolumeInfo newOwnerVolumeList, OmVolumeArgs newOwnerVolumeArgs, @Nonnull OMResponse omResponse) { super(omResponse); this.oldOwner = oldOwner; diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java index 2a0e835691f4f..88848f8b2a8fc 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java @@ -266,15 +266,15 @@ public static List< HddsProtos.KeyValue> getMetadataList() { */ public static void addUserToDB(String volumeName, String ownerName, OMMetadataManager omMetadataManager) throws Exception { - OzoneManagerProtocolProtos.VolumeList volumeList = - OzoneManagerProtocolProtos.VolumeList + OzoneManagerProtocolProtos.UserVolumeInfo userVolumeInfo = + OzoneManagerProtocolProtos.UserVolumeInfo .newBuilder() .addVolumeNames(volumeName) .setObjectID(1) .setUpdateID(1) .build(); omMetadataManager.getUserTable().put( - omMetadataManager.getUserKey(ownerName), volumeList); + omMetadataManager.getUserKey(ownerName), userVolumeInfo); } /** diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/package-info.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/package-info.java new file mode 100644 index 0000000000000..0bdab7d655aec --- /dev/null +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/** + * Tests for OM request. + */ +package org.apache.hadoop.ozone.om.request; diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java index 57f721ab51050..b685711416a3f 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java @@ -140,10 +140,10 @@ public void testValidateAndUpdateCacheSuccess() throws Exception { Assert.assertEquals(volumeInfo.getCreationTime(), omVolumeArgs.getCreationTime()); - OzoneManagerProtocolProtos.VolumeList volumeList = omMetadataManager + OzoneManagerProtocolProtos.UserVolumeInfo userVolumeInfo = omMetadataManager .getUserTable().get(ownerKey); - Assert.assertNotNull(volumeList); - Assert.assertEquals(volumeName, volumeList.getVolumeNames(0)); + Assert.assertNotNull(userVolumeInfo); + Assert.assertEquals(volumeName, userVolumeInfo.getVolumeNames(0)); // Create another volume for the user. originalRequest = createVolumeRequest("vol1", adminName, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java index d67ac08c78f43..af38ba03875a2 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java @@ -90,14 +90,14 @@ public void testValidateAndUpdateCacheSuccess() throws Exception { Assert.assertEquals(newOwner, fromDBOwner); - OzoneManagerProtocolProtos.VolumeList newOwnerVolumeList = + OzoneManagerProtocolProtos.UserVolumeInfo newOwnerVolumeList = omMetadataManager.getUserTable().get(newOwnerKey); Assert.assertNotNull(newOwnerVolumeList); Assert.assertEquals(volumeName, newOwnerVolumeList.getVolumeNamesList().get(0)); - OzoneManagerProtocolProtos.VolumeList oldOwnerVolumeList = + OzoneManagerProtocolProtos.UserVolumeInfo oldOwnerVolumeList = omMetadataManager.getUserTable().get( omMetadataManager.getUserKey(ownerKey)); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java index 2f4dbb94a9801..5e41d2d513467 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java @@ -56,8 +56,8 @@ public static S3BucketCreateResponse createS3BucketResponse(String userName, .getDefaultInstance()) .build(); - OzoneManagerProtocolProtos.VolumeList volumeList = - OzoneManagerProtocolProtos.VolumeList.newBuilder() + OzoneManagerProtocolProtos.UserVolumeInfo userVolumeInfo = + OzoneManagerProtocolProtos.UserVolumeInfo.newBuilder() .setObjectID(1) .setUpdateID(1) .addVolumeNames(volumeName).build(); @@ -67,7 +67,7 @@ public static S3BucketCreateResponse createS3BucketResponse(String userName, .setVolume(volumeName).setCreationTime(Time.now()).build(); OMVolumeCreateResponse omVolumeCreateResponse = - new OMVolumeCreateResponse(omVolumeArgs, volumeList, omResponse); + new OMVolumeCreateResponse(omVolumeArgs, userVolumeInfo, omResponse); OmBucketInfo omBucketInfo = TestOMResponseUtils.createBucket( diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java new file mode 100644 index 0000000000000..52b3c1a42166c --- /dev/null +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +/** + * Tests for OM Response. + */ +package org.apache.hadoop.ozone.om.response; \ No newline at end of file diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java index f6d18883bcabe..b69d8b7b07ef7 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java @@ -26,10 +26,10 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .CreateVolumeResponse; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos + .UserVolumeInfo; import org.apache.hadoop.util.Time; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.junit.Assert; @@ -68,7 +68,7 @@ public void testAddToDBBatch() throws Exception { String volumeName = UUID.randomUUID().toString(); String userName = "user1"; - VolumeList volumeList = VolumeList.newBuilder() + UserVolumeInfo volumeList = UserVolumeInfo.newBuilder() .setObjectID(1).setUpdateID(1) .addVolumeNames(volumeName).build(); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java index 12e7388f83023..5d6b48127ee27 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java @@ -26,10 +26,10 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .CreateVolumeResponse; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos + .UserVolumeInfo; import org.apache.hadoop.util.Time; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.junit.Assert; @@ -68,7 +68,7 @@ public void testAddToDBBatch() throws Exception { String volumeName = UUID.randomUUID().toString(); String userName = "user1"; - VolumeList volumeList = VolumeList.newBuilder() + UserVolumeInfo volumeList = UserVolumeInfo.newBuilder() .setObjectID(1) .setUpdateID(1) .addVolumeNames(volumeName).build(); @@ -87,7 +87,7 @@ public void testAddToDBBatch() throws Exception { new OMVolumeCreateResponse(omVolumeArgs, volumeList, omResponse); // As we are deleting updated volume list should be empty. - VolumeList updatedVolumeList = VolumeList.newBuilder() + UserVolumeInfo updatedVolumeList = UserVolumeInfo.newBuilder() .setObjectID(1).setUpdateID(1).build(); OMVolumeDeleteResponse omVolumeDeleteResponse = new OMVolumeDeleteResponse(volumeName, userName, updatedVolumeList, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java index 38255bac357f5..0951c062994b9 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeSetOwnerResponse.java @@ -26,10 +26,10 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .CreateVolumeResponse; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos - .VolumeList; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos + .UserVolumeInfo; import org.apache.hadoop.util.Time; import org.apache.hadoop.hdds.utils.db.BatchOperation; import org.apache.hadoop.hdds.utils.db.Table; @@ -69,7 +69,7 @@ public void testAddToDBBatch() throws Exception { String volumeName = UUID.randomUUID().toString(); String oldOwner = "user1"; - VolumeList volumeList = VolumeList.newBuilder() + UserVolumeInfo volumeList = UserVolumeInfo.newBuilder() .setObjectID(1) .setUpdateID(1) .addVolumeNames(volumeName).build(); @@ -90,11 +90,11 @@ public void testAddToDBBatch() throws Exception { String newOwner = "user2"; - VolumeList newOwnerVolumeList = VolumeList.newBuilder() + UserVolumeInfo newOwnerVolumeList = UserVolumeInfo.newBuilder() .setObjectID(1) .setUpdateID(1) .addVolumeNames(volumeName).build(); - VolumeList oldOwnerVolumeList = VolumeList.newBuilder() + UserVolumeInfo oldOwnerVolumeList = UserVolumeInfo.newBuilder() .setObjectID(2) .setUpdateID(2) .build(); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java new file mode 100644 index 0000000000000..e51663fcccdc9 --- /dev/null +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.ozone.om.response.volume; \ No newline at end of file diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java index 7407f8b5b1372..cc316199afd00 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/scm/cli/SQLCLI.java @@ -34,7 +34,7 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeInfo; -import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeList; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.UserVolumeInfo; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.container.ContainerInfo; import org.apache.hadoop.util.Tool; @@ -360,7 +360,7 @@ private void insertOMDB(Connection conn, KeyType type, String keyName, byte[] value) throws IOException, SQLException { switch (type) { case USER: - VolumeList volumeList = VolumeList.parseFrom(value); + UserVolumeInfo volumeList = UserVolumeInfo.parseFrom(value); for (String volumeName : volumeList.getVolumeNamesList()) { String insertVolumeList = String.format(INSERT_VOLUME_LIST, keyName, volumeName); From dcfa1fd666d8a53a3d5d697754f68cd89ccd2266 Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Tue, 1 Oct 2019 15:47:50 -0700 Subject: [PATCH 2/2] Fix JavaDoc and other code review comments. --- .../apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java | 2 +- .../hadoop/ozone/om/request/volume/OMVolumeRequest.java | 2 +- .../org/apache/hadoop/ozone/om/response/package-info.java | 2 +- .../apache/hadoop/ozone/om/response/volume/package-info.java | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java index 8aa9e3f04d91c..2545454a16fd5 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/codec/UserVolumeInfoCodec.java @@ -26,7 +26,7 @@ import com.google.protobuf.InvalidProtocolBufferException; /** - * Codec to encode VolumeList as byte array. + * Codec to encode UserVolumeInfo as byte array. */ public class UserVolumeInfoCodec implements Codec { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java index 91c3a3b9a1ef1..7c38c41320d61 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java @@ -50,7 +50,7 @@ public OMVolumeRequest(OMRequest omRequest) { * @param volume - volume which needs to deleted from the volume list. * @param owner - Name of the Owner. * @param txID - The transaction ID that is updating this value. - * @return VolumeList - updated volume list for the user. + * @return UserVolumeInfo - updated UserVolumeInfo. * @throws IOException */ protected UserVolumeInfo delVolumeFromOwnerList(UserVolumeInfo volumeList, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java index 52b3c1a42166c..fd48e14db9780 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/package-info.java @@ -19,4 +19,4 @@ /** * Tests for OM Response. */ -package org.apache.hadoop.ozone.om.response; \ No newline at end of file +package org.apache.hadoop.ozone.om.response; diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java index e51663fcccdc9..98788cd722b3b 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/package-info.java @@ -15,4 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.om.response.volume; \ No newline at end of file +/** + * Test Volume functions. + */ +package org.apache.hadoop.ozone.om.response.volume;