HDDS-12476. Add TestDataUtil#createKey variant with small random content

Author: chiacyu

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java

@@ -352,13 +352,9 @@ public void testListKeysWithNotNormalizedPath() throws Exception {
     keys.add(OmUtils.normalizeKey(key2, false));
     keys.add(OmUtils.normalizeKey(key3, false));
 
-    int length = 10;
-    byte[] input = new byte[length];
-    Arrays.fill(input, (byte)96);
-
-    createAndAssertKey(ozoneBucket, key1, 10, input);
-    createAndAssertKey(ozoneBucket, key2, 10, input);
-    createAndAssertKey(ozoneBucket, key3, 10, input);
+    createAndAssertKey(ozoneBucket, key1, 10);
+    createAndAssertKey(ozoneBucket, key2, 10);
+    createAndAssertKey(ozoneBucket, key3, 10);
 
     // Iterator with key name as prefix.
 
@@ -403,10 +399,10 @@ private void checkKeyList(Iterator<? extends OzoneKey > ozoneKeyIterator,
     assertEquals(keys, outputKeys);
   }
 
-  private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length, byte[] input)
+  private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length)
       throws Exception {
 
-    createKey(ozoneBucket, key, input);
+    byte[] input = createKey(ozoneBucket, key, length);
     // Read the key with given key name.
     readKey(ozoneBucket, key, length, input);
 

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java

@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -104,6 +105,14 @@ public static OzoneVolume createVolume(OzoneClient client,
 
   }
 
+  public static byte[] createKey(OzoneBucket bucket,
+                                 String keyName, int length) throws IOException{
+    byte[] content = RandomStringUtils.random(length, 0, 0
+        , true, true, null, new SecureRandom()).getBytes(UTF_8);
+    createKey(bucket, keyName, content);
+    return content;
+  }
+
   public static void createKey(OzoneBucket bucket, String keyName,
                                byte[] content) throws IOException {
     createKey(bucket, keyName, null, content);

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java

@@ -371,13 +371,10 @@ private void checkKeyShallowList(String keyPrefix, String startKey,
 
   private static void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
-    int length = 10;
-    byte[] input = new byte[length];
-    Arrays.fill(input, (byte) 96);
     for (String key : keys) {
-      createKey(ozoneBucket, key, input);
+      byte[] input = createKey(ozoneBucket, key, 10);
       // Read the key with given key name.
-      readkey(ozoneBucket, key, length, input);
+      readkey(ozoneBucket, key, 10, input);
     }
   }
 

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java

@@ -24,7 +24,6 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -643,13 +642,10 @@ private void checkKeyShallowList(String keyPrefix, String startKey,
 
   private static void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
-    int length = 10;
-    byte[] input = new byte[length];
-    Arrays.fill(input, (byte) 96);
     for (String key : keys) {
-      createKey(ozoneBucket, key, input);
+      byte[] input = createKey(ozoneBucket, key, 10);
       // Read the key with given key name.
-      readkey(ozoneBucket, key, length, input);
+      readkey(ozoneBucket, key, 10, input);
     }
   }
 

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java

@@ -559,14 +559,10 @@ private void checkKeyList(Iterator<? extends OzoneKey > ozoneKeyIterator,
   private void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
 
-    int length = 10;
-    byte[] input = new byte[length];
-    Arrays.fill(input, (byte) 96);
-
     for (String key : keys) {
-      createKey(ozoneBucket, key, input);
+      byte[] input = createKey(ozoneBucket, key, 10);
       // Read the key with given key name.
-      readKey(ozoneBucket, key, length, input);
+      readKey(ozoneBucket, key, 10, input);
     }
   }
 

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java

@@ -329,12 +329,11 @@ private void setKeyAcl(ObjectStore objectStore, String volumeName,
 
   private void createKeys(ObjectStore objectStore, OzoneBucket ozoneBucket,
       List<String> keys) throws Exception {
-    int length = 10;
+
     String aclWorldAll = "world::a";
-    byte[] input = new byte[length];
-    Arrays.fill(input, (byte) 96);
+
     for (String key : keys) {
-      createKey(ozoneBucket, key, input);
+      createKey(ozoneBucket, key, 10);
       setKeyAcl(objectStore, ozoneBucket.getVolumeName(), ozoneBucket.getName(),
           key, aclWorldAll);
     }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java

@@ -349,18 +349,15 @@ private void checkKeyList(Iterator<? extends OzoneKey> ozoneKeyIterator,
 
   private void createKeys(OzoneBucket ozoneBucket, List<String> keys)
       throws Exception {
-    int length = 10;
-    byte[] input = new byte[length];
-    Arrays.fill(input, (byte) 96);
     for (String key : keys) {
-      createKey(ozoneBucket, key, 10, input);
+      createKey(ozoneBucket, key, 10);
     }
   }
 
-  private void createKey(OzoneBucket ozoneBucket, String key, int length,
-                         byte[] input) throws Exception {
+  private void createKey(OzoneBucket ozoneBucket, String key, int length)
+      throws Exception {
 
-    TestDataUtil.createKey(ozoneBucket, key, input);
+    byte[] input = TestDataUtil.createKey(ozoneBucket, key, length);
     // Read the key with given key name.
     readkey(ozoneBucket, key, length, input);
   }