fix failed unit tests

apache · Nov 25, 2024 · a3036f1 · a3036f1
1 parent b336b05
commit a3036f1
Show file tree

Hide file tree

Showing 21 changed files with 141 additions and 67 deletions.
diff --git a/...ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java b/...ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
@@ -381,7 +381,6 @@ vol, bucket, key, volOwner, bucketOwner, createUGIForApi(),
    */
   @VisibleForTesting
   public UserGroupInformation createUGI() throws AuthenticationException {
-
     if (userGroupInformation != null) {
       return userGroupInformation;
     }
@@ -413,6 +412,11 @@ public UserGroupInformation createUGIForApi() throws OMException {
     return ugi;
   }
 
+  @VisibleForTesting
+  public void setUGI(UserGroupInformation ugi) {
+    this.userGroupInformation = ugi;
+  }
+
   /**
    * Return InetAddress created from OMRequest userInfo. If userInfo is not
    * set, returns null.

diff --git a/...anager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java b/...anager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
@@ -325,14 +325,14 @@ private boolean isECBucket(BucketInfo bucketInfo) {
    */
   private void addDefaultAcls(OmBucketInfo omBucketInfo,
       OmVolumeArgs omVolumeArgs, OzoneManager ozoneManager) throws OMException {
-    // Add acls for bucket creator.
     List<OzoneAcl> acls = new ArrayList<>();
+    // Add default acls
+    acls.addAll(getDefaultAclList(createUGIForApi(), ozoneManager.getConfiguration()));
     if (omBucketInfo.getAcls() != null) {
+      // Add acls for bucket creator.
       acls.addAll(omBucketInfo.getAcls());
     }
 
-    // Add default acls
-    acls.addAll(getDefaultAclList(createUGIForApi(), ozoneManager.getConfiguration()));
     // Link bucket default acl
     if (omBucketInfo.getSourceBucket() != null && omBucketInfo.getSourceVolume() != null) {
       acls.add(linkBucketDefaultAcl());

diff --git a/...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -416,12 +416,11 @@ protected List<OzoneAcl> getAclsForKey(KeyArgs keyArgs,
       PrefixManager prefixManager, OzoneConfiguration config) throws OMException {
 
     List<OzoneAcl> acls = new ArrayList<>();
+    acls.addAll(getDefaultAclList(createUGIForApi(), config));
     if (keyArgs.getAclsList() != null) {
       acls.addAll(OzoneAclUtil.fromProtobuf(keyArgs.getAclsList()));
     }
 
-    acls.addAll(getDefaultAclList(createUGIForApi(), config));
-
     // Inherit DEFAULT acls from prefix.
     if (prefixManager != null) {
       List< OmPrefixInfo > prefixList = prefixManager.getLongestPrefixPath(
@@ -477,6 +476,8 @@ protected List<OzoneAcl> getAclsForDir(KeyArgs keyArgs, OmBucketInfo bucketInfo,
       OMFileRequest.OMPathInfo omPathInfo, OzoneConfiguration config) throws OMException {
     // Acls inherited from parent or bucket will convert to DEFAULT scope
     List<OzoneAcl> acls = new ArrayList<>();
+    // add default ACLs
+    acls.addAll(getDefaultAclList(createUGIForApi(), config));
 
     // Inherit DEFAULT acls from parent-dir
     if (omPathInfo != null) {
@@ -491,7 +492,6 @@ protected List<OzoneAcl> getAclsForDir(KeyArgs keyArgs, OmBucketInfo bucketInfo,
 
     // add acls from clients
     acls.addAll(OzoneAclUtil.fromProtobuf(keyArgs.getAclsList()));
-    acls.addAll(getDefaultAclList(createUGIForApi(), config));
     acls = acls.stream().distinct().collect(Collectors.toList());
     return acls;
   }

diff --git a/...est/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java b/...est/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
@@ -40,6 +40,7 @@
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketInfo;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.ratis.server.protocol.TermIndex;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -107,6 +108,7 @@ public void setup() throws IOException {
     when(ozoneManager.getMaxUserVolumeCount()).thenReturn(10L);
     auditLogger = mock(AuditLogger.class);
     when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
+    when(ozoneManager.getConfiguration()).thenReturn(ozoneConfiguration);
     doNothing().when(auditLogger).logWrite(any(AuditMessage.class));
     doubleBuffer = OzoneManagerDoubleBuffer.newBuilder()
         .setOmMetadataManager(omMetadataManager)
@@ -450,6 +452,11 @@ private OMClientResponse createVolume(String volumeName,
 
     OMVolumeCreateRequest omVolumeCreateRequest =
         new OMVolumeCreateRequest(omRequest);
+    try {
+      omVolumeCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
 
     final TermIndex termIndex = TransactionInfo.getTermIndex(transactionId);
     OMClientResponse omClientResponse = omVolumeCreateRequest.validateAndUpdateCache(ozoneManager, termIndex);
@@ -462,7 +469,7 @@ private OMClientResponse createVolume(String volumeName,
    * @return OMBucketCreateResponse
    */
   private OMBucketCreateResponse createBucket(String volumeName,
-      String bucketName, long transactionID)  {
+      String bucketName, long transactionID) {
 
     BucketInfo.Builder bucketInfo =
         newBucketInfoBuilder(bucketName, volumeName)
@@ -472,6 +479,10 @@ private OMBucketCreateResponse createBucket(String volumeName,
 
     OMBucketCreateRequest omBucketCreateRequest =
         new OMBucketCreateRequest(omRequest);
+    try {
+      omBucketCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
+    } catch (IOException e) {
+    }
 
     final TermIndex termIndex = TermIndex.valueOf(term, transactionID);
     OMClientResponse omClientResponse = omBucketCreateRequest.validateAndUpdateCache(ozoneManager, termIndex);

diff --git a/...er/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java b/...er/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java
@@ -26,6 +26,7 @@
 import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.ozone.om.OMMetadataManager;
@@ -41,6 +42,7 @@
 
 import static org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newBucketInfoBuilder;
 import static org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newCreateBucketRequest;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -336,7 +338,7 @@ protected void doValidateAndUpdateCache(String volumeName, String bucketName,
     assertNull(omMetadataManager.getBucketTable().get(bucketKey));
     OMBucketCreateRequest omBucketCreateRequest =
         new OMBucketCreateRequest(modifiedRequest);
-
+    omBucketCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
 
     OMClientResponse omClientResponse =
         omBucketCreateRequest.validateAndUpdateCache(ozoneManager, 1);
@@ -355,8 +357,7 @@ protected void doValidateAndUpdateCache(String volumeName, String bucketName,
         dbBucketInfo.getCreationTime());
     assertEquals(bucketInfoFromProto.getModificationTime(),
         dbBucketInfo.getModificationTime());
-    assertEquals(bucketInfoFromProto.getAcls(),
-        dbBucketInfo.getAcls());
+    assertTrue(dbBucketInfo.getAcls().containsAll(bucketInfoFromProto.getAcls()));
     assertEquals(bucketInfoFromProto.getIsVersionEnabled(),
         dbBucketInfo.getIsVersionEnabled());
     assertEquals(bucketInfoFromProto.getStorageType(),

diff --git a/...test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java b/...test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithFSO.java
@@ -26,6 +26,7 @@
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -34,6 +35,7 @@
 import static org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newBucketInfoBuilder;
 import static org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newCreateBucketRequest;
 import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketLayoutProto.FILE_SYSTEM_OPTIMIZED;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -143,7 +145,7 @@ protected void doValidateAndUpdateCache(String volumeName, String bucketName,
     assertNull(omMetadataManager.getBucketTable().get(bucketKey));
     OMBucketCreateRequest omBucketCreateRequest =
         new OMBucketCreateRequest(modifiedRequest);
-
+    omBucketCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
 
     OMClientResponse omClientResponse =
         omBucketCreateRequest.validateAndUpdateCache(ozoneManager, 1);
@@ -166,8 +168,7 @@ protected void doValidateAndUpdateCache(String volumeName, String bucketName,
         dbBucketInfo.getCreationTime());
     assertEquals(bucketInfoFromProto.getModificationTime(),
         dbBucketInfo.getModificationTime());
-    assertEquals(bucketInfoFromProto.getAcls(),
-        dbBucketInfo.getAcls());
+    assertTrue(dbBucketInfo.getAcls().containsAll(bucketInfoFromProto.getAcls()));
     assertEquals(bucketInfoFromProto.getIsVersionEnabled(),
         dbBucketInfo.getIsVersionEnabled());
     assertEquals(bucketInfoFromProto.getStorageType(),

diff --git a/...r/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequest.java b/...r/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequest.java
@@ -38,6 +38,7 @@
 import org.apache.hadoop.ozone.om.response.OMClientResponse;
 import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
 import org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -68,6 +69,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doNothing;
@@ -183,7 +185,7 @@ public void testValidateAndUpdateCache() throws Exception {
 
     omDirectoryCreateRequest =
         new OMDirectoryCreateRequest(modifiedOmRequest, getBucketLayout());
-
+    omDirectoryCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirectoryCreateRequest.validateAndUpdateCache(ozoneManager, 100L);
 
@@ -222,6 +224,7 @@ public void testValidateAndUpdateCacheWithNamespaceQuotaExceed()
 
     omDirectoryCreateRequest =
         new OMDirectoryCreateRequest(modifiedOmRequest, getBucketLayout());
+    omDirectoryCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirectoryCreateRequest.validateAndUpdateCache(ozoneManager, 100L);
 
@@ -310,7 +313,7 @@ public void testValidateAndUpdateCacheWithSubDirectoryInPath()
 
     omDirectoryCreateRequest =
         new OMDirectoryCreateRequest(modifiedOmRequest, getBucketLayout());
-
+    omDirectoryCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirectoryCreateRequest.validateAndUpdateCache(ozoneManager, 100L);
 
@@ -430,6 +433,7 @@ public void testCreateDirectoryOMMetric()
 
     omDirectoryCreateRequest =
         new OMDirectoryCreateRequest(modifiedOmRequest, getBucketLayout());
+    omDirectoryCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
 
     assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
@@ -480,7 +484,7 @@ public void testCreateDirectoryInheritParentDefaultAcls() throws Exception {
 
     omDirectoryCreateRequest =
         new OMDirectoryCreateRequest(modifiedOmRequest, getBucketLayout());
-
+    omDirectoryCreateRequest.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirectoryCreateRequest.validateAndUpdateCache(ozoneManager, 100L);
 
@@ -510,7 +514,7 @@ private void verifyDirectoriesInheritAcls(String volumeName,
 
       List<OzoneAcl> omKeyAcls = omKeyInfo.getAcls();
 
-      assertEquals(expectedInheritAcls, omKeyAcls, "Failed to inherit parent acls!,");
+      assertTrue(omKeyAcls.containsAll(expectedInheritAcls), "Failed to inherit parent acls!,");
 
       prefix = dirName + OZONE_URI_DELIMITER;
       expectedInheritAcls = omKeyAcls;

diff --git a/...est/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java b/...est/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
@@ -47,6 +47,7 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import jakarta.annotation.Nonnull;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -169,7 +170,7 @@ public void testValidateAndUpdateCache() throws Exception {
     omDirCreateRequestFSO =
         new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
             BucketLayout.FILE_SYSTEM_OPTIMIZED);
-
+    omDirCreateRequestFSO.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirCreateRequestFSO.validateAndUpdateCache(ozoneManager, 100L);
 
@@ -209,6 +210,7 @@ public void testValidateAndUpdateCacheWithNamespaceQuotaExceeded()
     omDirCreateRequestFSO =
         new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
             BucketLayout.FILE_SYSTEM_OPTIMIZED);
+    omDirCreateRequestFSO.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirCreateRequestFSO.validateAndUpdateCache(ozoneManager, 100L);
     assertSame(omClientResponse.getOMResponse().getStatus(),
@@ -317,7 +319,7 @@ public void testValidateAndUpdateCacheWithSubDirectoryInPath()
 
     omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
         BucketLayout.FILE_SYSTEM_OPTIMIZED);
-
+    omDirCreateReqFSO.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L);
 
@@ -570,6 +572,7 @@ public void testCreateDirectoryUptoLimitOfMaxLevels255() throws Exception {
 
     omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
         BucketLayout.FILE_SYSTEM_OPTIMIZED);
+    omDirCreateReqFSO.setUGI(UserGroupInformation.getCurrentUser());
 
     assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
@@ -604,7 +607,7 @@ public void testCreateDirectoryExceedLimitOfMaxLevels255() throws Exception {
 
     omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
         BucketLayout.FILE_SYSTEM_OPTIMIZED);
-
+    omDirCreateReqFSO.setUGI(UserGroupInformation.getCurrentUser());
     assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
         omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L);
@@ -643,6 +646,7 @@ public void testCreateDirectoryOMMetric() throws Exception {
 
     omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
         BucketLayout.FILE_SYSTEM_OPTIMIZED);
+    omDirCreateReqFSO.setUGI(UserGroupInformation.getCurrentUser());
 
     assertEquals(0L, omMetrics.getNumKeys());
     OMClientResponse omClientResponse =
@@ -695,7 +699,7 @@ public void testCreateDirectoryInheritParentDefaultAcls() throws Exception {
 
     omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
         BucketLayout.FILE_SYSTEM_OPTIMIZED);
-
+    omDirCreateReqFSO.setUGI(UserGroupInformation.getCurrentUser());
     OMClientResponse omClientResponse =
         omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L);
     assertSame(omClientResponse.getOMResponse().getStatus(),
@@ -730,7 +734,7 @@ private void verifyDirectoriesInheritAcls(List<String> dirs,
       System.out.println(
           "  subdir acls : " + omDirInfo + " ==> " + omDirAcls);
 
-      assertEquals(expectedInheritAcls, omDirAcls,
+      assertTrue(omDirAcls.containsAll(expectedInheritAcls),
           "Failed to inherit parent DEFAULT acls!");
 
       parentID = omDirInfo.getObjectID();

diff --git a/...anager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java b/...anager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
@@ -35,6 +35,7 @@
 import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
 import jakarta.annotation.Nonnull;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -481,7 +482,7 @@ protected void verifyInheritAcls(List<String> dirs, OmKeyInfo omKeyInfo,
 
         System.out.println(
             "  subdir acls : " + omDirInfo + " ==> " + omDirAcls);
-        assertEquals(expectedInheritAcls, omDirAcls,
+        assertTrue(omDirAcls.containsAll(expectedInheritAcls),
             "Failed to inherit parent DEFAULT acls!");
 
         parentID = omDirInfo.getObjectID();
@@ -513,9 +514,9 @@ protected void verifyInheritAcls(List<String> dirs, OmKeyInfo omKeyInfo,
 
       // Should inherit parent DEFAULT acls
       // [user:newUser:rw[ACCESS], group:newGroup:rwl[ACCESS]]
-      assertEquals(parentDefaultAcl.stream()
+      assertTrue(keyAcls.containsAll(parentDefaultAcl.stream()
               .map(acl -> acl.withScope(OzoneAcl.AclScope.ACCESS))
-              .collect(Collectors.toList()), keyAcls,
+              .collect(Collectors.toList())),
           "Failed to inherit bucket DEFAULT acls!");
       // Should not inherit parent ACCESS acls
       assertThat(keyAcls).doesNotContain(parentAccessAcl);
@@ -529,7 +530,7 @@ protected void verifyInheritAcls(List<String> dirs, OmKeyInfo omKeyInfo,
       ".snapshot/a/b/keyName,Cannot create key under path reserved for snapshot: .snapshot/",
       ".snapshot,Cannot create key with reserved name: .snapshot"})
   public void testPreExecuteWithInvalidKeyPrefix(String invalidKeyName,
-                                                 String expectedErrorMessage) {
+                                                 String expectedErrorMessage) throws IOException {
 
     OMRequest omRequest = createFileRequest(volumeName, bucketName,
         invalidKeyName, HddsProtos.ReplicationFactor.ONE,
@@ -644,8 +645,10 @@ protected OMRequest createFileRequest(
    * @return OMFileCreateRequest reference
    */
   @Nonnull
-  protected OMFileCreateRequest getOMFileCreateRequest(OMRequest omRequest) {
-    return new OMFileCreateRequest(omRequest, getBucketLayout());
+  protected OMFileCreateRequest getOMFileCreateRequest(OMRequest omRequest) throws IOException {
+    OMFileCreateRequest request = new OMFileCreateRequest(omRequest, getBucketLayout());
+    request.setUGI(UserGroupInformation.getCurrentUser());
+    return request;
   }
 
 }