HDDS-2180. Add Object ID and update ID on VolumeList Object. (#1526)

Author: anuengineer

hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto

@@ -354,6 +354,8 @@ message CreateVolumeResponse {
 
 message VolumeList {
     repeated string volumeNames = 1;
+    optional uint64 objectID = 2;
+    optional uint64 updateID = 3;
 }
 
 /**

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/bucket/S3BucketCreateRequest.java

@@ -179,7 +179,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
           VolumeList volumeList = omMetadataManager.getUserTable().get(
               omMetadataManager.getUserKey(userName));
           volumeList = addVolumeToOwnerList(volumeList,
-              volumeName, userName, ozoneManager.getMaxUserVolumeCount());
+              volumeName, userName, ozoneManager.getMaxUserVolumeCount(),
+              transactionLogIndex);
           createVolume(omMetadataManager, omVolumeArgs, volumeList, volumeKey,
               omMetadataManager.getUserKey(userName), transactionLogIndex);
           volumeCreated = true;

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeCreateRequest.java

@@ -151,7 +151,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
         String dbUserKey = omMetadataManager.getUserKey(owner);
         volumeList = omMetadataManager.getUserTable().get(dbUserKey);
         volumeList = addVolumeToOwnerList(volumeList, volume, owner,
-            ozoneManager.getMaxUserVolumeCount());
+            ozoneManager.getMaxUserVolumeCount(), transactionLogIndex);
         createVolume(omMetadataManager, omVolumeArgs, volumeList, dbVolumeKey,
             dbUserKey, transactionLogIndex);
 

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java

@@ -115,7 +115,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
 
       // delete the volume from the owner list
       // as well as delete the volume entry
-      newVolumeList = delVolumeFromOwnerList(newVolumeList, volume, owner);
+      newVolumeList = delVolumeFromOwnerList(newVolumeList, volume, owner,
+          transactionLogIndex);
 
       omMetadataManager.getUserTable().addCacheEntry(new CacheKey<>(dbUserKey),
           new CacheValue<>(Optional.of(newVolumeList), transactionLogIndex));

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java

@@ -48,12 +48,13 @@ public OMVolumeRequest(OMRequest omRequest) {
    * acquiring user lock.
    * @param volumeList - current volume list owned by user.
    * @param volume - volume which needs to deleted from the volume list.
-   * @param owner
+   * @param owner - Name of the Owner.
+   * @param txID - The transaction ID that is updating this value.
    * @return VolumeList - updated volume list for the user.
    * @throws IOException
    */
   protected VolumeList delVolumeFromOwnerList(VolumeList volumeList,
-      String volume, String owner) throws IOException {
+      String volume, String owner, long txID) throws IOException {
 
     List<String> prevVolList = new ArrayList<>();
 
@@ -68,7 +69,10 @@ protected VolumeList delVolumeFromOwnerList(VolumeList volumeList,
     // Remove the volume from the list
     prevVolList.remove(volume);
     VolumeList newVolList = VolumeList.newBuilder()
-        .addAllVolumeNames(prevVolList).build();
+        .addAllVolumeNames(prevVolList)
+            .setObjectID(volumeList.getObjectID())
+            .setUpdateID(txID)
+         .build();
     return newVolList;
   }
 
@@ -85,7 +89,8 @@ protected VolumeList delVolumeFromOwnerList(VolumeList volumeList,
    * maxUserVolumeCount, an exception is thrown.
    */
   protected VolumeList addVolumeToOwnerList(VolumeList volumeList,
-      String volume, String owner, long maxUserVolumeCount) throws IOException {
+      String volume, String owner, long maxUserVolumeCount, long txID)
+      throws IOException {
 
     // Check the volume count
     if (volumeList != null &&
@@ -95,13 +100,18 @@ protected VolumeList addVolumeToOwnerList(VolumeList volumeList,
     }
 
     List<String> prevVolList = new ArrayList<>();
+    long objectID = txID;
     if (volumeList != null) {
       prevVolList.addAll(volumeList.getVolumeNamesList());
+      objectID = volumeList.getObjectID();
     }
 
+
     // Add the new volume to the list
     prevVolList.add(volume);
     VolumeList newVolList = VolumeList.newBuilder()
+        .setObjectID(objectID)
+        .setUpdateID(txID)
         .addAllVolumeNames(prevVolList).build();
 
     return newVolList;

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java

@@ -144,14 +144,16 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
           omMetadataManager.getUserTable().get(oldOwner);
 
       oldOwnerVolumeList = delVolumeFromOwnerList(
-          oldOwnerVolumeList, volume, oldOwner);
+          oldOwnerVolumeList, volume, oldOwner, transactionLogIndex);
 
       newOwnerVolumeList = omMetadataManager.getUserTable().get(newOwner);
       newOwnerVolumeList = addVolumeToOwnerList(
-          newOwnerVolumeList, volume, newOwner, maxUserVolumeCount);
+          newOwnerVolumeList, volume, newOwner,
+          maxUserVolumeCount, transactionLogIndex);
 
       // Set owner with new owner name.
       omVolumeArgs.setOwnerName(newOwner);
+      omVolumeArgs.setUpdateID(transactionLogIndex);
 
       // Update cache.
       omMetadataManager.getUserTable().addCacheEntry(

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java

@@ -266,8 +266,12 @@ public static List< HddsProtos.KeyValue> getMetadataList() {
   public static void addUserToDB(String volumeName, String ownerName,
       OMMetadataManager omMetadataManager) throws Exception {
     OzoneManagerProtocolProtos.VolumeList volumeList =
-        OzoneManagerProtocolProtos.VolumeList.newBuilder()
-            .addVolumeNames(volumeName).build();
+        OzoneManagerProtocolProtos.VolumeList
+            .newBuilder()
+            .addVolumeNames(volumeName)
+            .setObjectID(1)
+            .setUpdateID(1)
+            .build();
     omMetadataManager.getUserTable().put(
         omMetadataManager.getUserKey(ownerName), volumeList);
   }

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestOMResponseUtils.java

@@ -58,6 +58,8 @@ public static S3BucketCreateResponse createS3BucketResponse(String userName,
 
     OzoneManagerProtocolProtos.VolumeList volumeList =
         OzoneManagerProtocolProtos.VolumeList.newBuilder()
+            .setObjectID(1)
+            .setUpdateID(1)
             .addVolumeNames(volumeName).build();
 
     OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder()

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeCreateResponse.java

@@ -69,6 +69,7 @@ public void testAddToDBBatch() throws Exception {
     String volumeName = UUID.randomUUID().toString();
     String userName = "user1";
     VolumeList volumeList = VolumeList.newBuilder()
+        .setObjectID(1).setUpdateID(1)
         .addVolumeNames(volumeName).build();
 
     OMResponse omResponse = OMResponse.newBuilder()

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/volume/TestOMVolumeDeleteResponse.java

@@ -69,6 +69,8 @@ public void testAddToDBBatch() throws Exception {
     String volumeName = UUID.randomUUID().toString();
     String userName = "user1";
     VolumeList volumeList = VolumeList.newBuilder()
+        .setObjectID(1)
+        .setUpdateID(1)
         .addVolumeNames(volumeName).build();
 
     OMResponse omResponse = OMResponse.newBuilder()
@@ -85,7 +87,8 @@ public void testAddToDBBatch() throws Exception {
         new OMVolumeCreateResponse(omVolumeArgs, volumeList, omResponse);
 
     // As we are deleting updated volume list should be empty.
-    VolumeList updatedVolumeList = VolumeList.newBuilder().build();
+    VolumeList updatedVolumeList = VolumeList.newBuilder()
+        .setObjectID(1).setUpdateID(1).build();
     OMVolumeDeleteResponse omVolumeDeleteResponse =
         new OMVolumeDeleteResponse(volumeName, userName, updatedVolumeList,
             omResponse);