HDDS-13919. S3 Conditional Writes (PutObject) [3/3] - Remove expectedETag from OmKeyInfo

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java

@@ -110,7 +110,6 @@ public final class OmKeyInfo extends WithParentObjectId
   // This allows a key to be created an committed atomically if the original has not
   // been modified.
   private Long expectedDataGeneration = null;
-  private String expectedETag;
 
   private OmKeyInfo(Builder b) {
     super(b);
@@ -130,7 +129,6 @@ private OmKeyInfo(Builder b) {
     this.ownerName = b.ownerName;
     this.tags = b.tags.build();
     this.expectedDataGeneration = b.expectedDataGeneration;
-    this.expectedETag = b.expectedETag;
   }
 
   private static Codec<OmKeyInfo> newCodec(boolean ignorePipeline) {
@@ -191,14 +189,6 @@ public Long getExpectedDataGeneration() {
     return expectedDataGeneration;
   }
 
-  public void setExpectedETag(String eTag) {
-    this.expectedETag = eTag;
-  }
-
-  public String getExpectedETag() {
-    return expectedETag;
-  }
-
   public String getOwnerName() {
     return ownerName;
   }
@@ -502,7 +492,6 @@ public static class Builder extends WithParentObjectId.Builder<OmKeyInfo> {
     private boolean isFile;
     private final MapBuilder<String, String> tags;
     private Long expectedDataGeneration = null;
-    private String expectedETag;
 
     public Builder() {
       this.acls = AclListBuilder.empty();
@@ -525,7 +514,6 @@ public Builder(OmKeyInfo obj) {
       this.fileChecksum = obj.fileChecksum;
       this.isFile = obj.isFile;
       this.expectedDataGeneration = obj.expectedDataGeneration;
-      this.expectedETag = obj.expectedETag;
       this.tags = MapBuilder.of(obj.tags);
       obj.keyLocationVersions.forEach(keyLocationVersion ->
           this.omKeyLocationInfoGroups.add(
@@ -697,11 +685,6 @@ public Builder setExpectedDataGeneration(Long existingGeneration) {
       return this;
     }
 
-    public Builder setExpectedETag(String eTag) {
-      this.expectedETag = eTag;
-      return this;
-    }
-
     @Override
     protected void validate() {
       super.validate();
@@ -821,9 +804,6 @@ private KeyInfo getProtobuf(boolean ignorePipeline, String fullKeyName,
     if (expectedDataGeneration != null) {
       kb.setExpectedDataGeneration(expectedDataGeneration);
     }
-    if (expectedETag != null) {
-      kb.setExpectedETag(expectedETag);
-    }
     if (ownerName != null) {
       kb.setOwnerName(ownerName);
     }
@@ -877,9 +857,6 @@ public static Builder builderFromProtobuf(KeyInfo keyInfo) {
     if (keyInfo.hasExpectedDataGeneration()) {
       builder.setExpectedDataGeneration(keyInfo.getExpectedDataGeneration());
     }
-    if (keyInfo.hasExpectedETag()) {
-      builder.setExpectedETag(keyInfo.getExpectedETag());
-    }
 
     if (keyInfo.hasOwnerName()) {
       builder.setOwnerName(keyInfo.getOwnerName());

hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto

@@ -1192,11 +1192,6 @@ message KeyInfo {
   // This allows a key to be created an committed atomically if the original has not
   // been modified.
     optional uint64 expectedDataGeneration = 22;
-
-    // expectedETag, when set, indicates that the existing key must have
-    // the given ETag for the operation to succeed. This is used for
-    // S3 conditional writes with the If-Match header.
-    optional string expectedETag = 23;
 }
 
 // KeyInfoProtoLight is a lightweight subset of KeyInfo message containing

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java

@@ -309,7 +309,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
       // Set the UpdateID to current transactionLogIndex
       omKeyInfo = omKeyInfo.toBuilder()
           .setExpectedDataGeneration(null)
-          .setExpectedETag(null)
           .addAllMetadata(KeyValueUtil.getFromProtobuf(
                 commitKeyArgs.getMetadataList()))
           .setUpdateID(trxnLogIndex)

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java

@@ -246,7 +246,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, Execut
       // Optimistic locking validation has passed. Now set the rewrite fields to null so they are
       // not persisted in the key table.
       omKeyInfo.setExpectedDataGeneration(null);
-      omKeyInfo.setExpectedETag(null);
 
       long correctedSpace = omKeyInfo.getReplicatedSize();
       // if keyToDelete isn't null, usedNamespace shouldn't check and increase.

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java

@@ -993,9 +993,6 @@ protected OmKeyInfo prepareFileInfo(
       if (keyArgs.hasExpectedDataGeneration()) {
         builder.setExpectedDataGeneration(keyArgs.getExpectedDataGeneration());
       }
-      if (keyArgs.hasExpectedETag()) {
-        builder.setExpectedETag(keyArgs.getExpectedETag());
-      }
 
       return builder.build();
     }

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

@@ -172,7 +172,6 @@ public void testCreateKeyExpectedGenCreateIfNotExistsKeyMissing(
     assertNotNull(openKeyInfo);
     assertEquals(OzoneConsts.EXPECTED_GEN_CREATE_IF_NOT_EXISTS,
         openKeyInfo.getExpectedDataGeneration());
-    assertNull(openKeyInfo.getExpectedETag());
   }
 
   @ParameterizedTest
@@ -353,7 +352,6 @@ public void testCreateWithExpectedETagSuccess(
     assertNotNull(openKeyInfo);
     assertEquals(existingKeyInfo.getUpdateID(),
         openKeyInfo.getExpectedDataGeneration());
-    assertNull(openKeyInfo.getExpectedETag());
     // Creation time should remain the same on rewrite
     assertEquals(existingKeyInfo.getCreationTime(),
         openKeyInfo.getCreationTime());