HADOOP-19161. S3A: option "fs.s3a.performance.flags" to take list of performance flags

* naming
* filesystem.toString() prints the values

Change-Id: I54c5fec1d0cc19513e75a25ec9ef4482614b473c

Author: steveloughran

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java

@@ -724,16 +724,16 @@ public void initialize(URI name, Configuration originalConf)
       checkNoS3Guard(this.getUri(), getConf());
 
       // read in performance options and parse them to a list of flags.
-      performanceFlags = S3APerformanceFlags.create(
+      performanceFlags = S3APerformanceFlags.build(
           getConf().getTrimmedStrings(FS_S3A_PERFORMANCE_FLAGS));
       // performance creation flag for code which wants performance
       // at the risk of overwrites.
       // this uses the performance flags as the default and then
       // updates the performance flags to match.
       // a bit convoluted.
       boolean performanceCreation = conf.getBoolean(FS_S3A_CREATE_PERFORMANCE,
-          performanceFlags.isCreatePerformance());
-      performanceFlags.setCreatePerformance(performanceCreation);
+          performanceFlags.isCreate());
+      performanceFlags.setCreate(performanceCreation);
 
       LOG.debug("{} = {}", FS_S3A_CREATE_PERFORMANCE, performanceCreation);
       allowAuthoritativePaths = S3Guard.getAuthoritativePaths(this);
@@ -1977,7 +1977,7 @@ public FSDataOutputStream create(Path f, FsPermission permission,
 
     // work out the options to pass down
     CreateFileBuilder.CreateFileOptions options;
-    if (getPerformanceFlags().isCreatePerformance()) {
+    if (getPerformanceFlags().isCreate()) {
       options = OPTIONS_CREATE_FILE_PERFORMANCE;
     } else {
       options = overwrite
@@ -2150,7 +2150,7 @@ public FSDataOutputStreamBuilder createFile(final Path path) {
       builder
           .create()
           .overwrite(true)
-          .must(FS_S3A_CREATE_PERFORMANCE, getPerformanceFlags().isCreatePerformance());
+          .must(FS_S3A_CREATE_PERFORMANCE, getPerformanceFlags().isCreate());
       return builder;
     } catch (IOException e) {
       // catch any IOEs raised in span creation and convert to
@@ -2215,7 +2215,7 @@ public FSDataOutputStream createNonRecursive(Path p,
         .withFlags(flags)
         .blockSize(blockSize)
         .bufferSize(bufferSize)
-        .must(FS_S3A_CREATE_PERFORMANCE, performanceFlags.isCreatePerformance());
+        .must(FS_S3A_CREATE_PERFORMANCE, performanceFlags.isCreate());
     if (progress != null) {
       builder.progress(progress);
     }
@@ -4838,6 +4838,7 @@ public String toString() {
     sb.append(", partSize=").append(partSize);
     sb.append(", enableMultiObjectsDelete=").append(enableMultiObjectsDelete);
     sb.append(", maxKeys=").append(maxKeys);
+    sb.append(", ").append(performanceFlags);
     if (cannedACL != null) {
       sb.append(", cannedACL=").append(cannedACL);
     }

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/S3APerformanceFlags.java

@@ -54,45 +54,45 @@ public final class S3APerformanceFlags implements StreamCapabilities {
   /**
    * Higher performance create operations.
    */
-  private boolean createPerformance;
+  private boolean create;
 
   /**
    * Delete operation to skip parent probe.
    */
-  private boolean deletePerformance;
+  private boolean delete;
 
   /**
    * Mkdir to skip checking for type of parent paths.
    */
-  private boolean mkdirPerformance;
+  private boolean mkdir;
 
   public S3APerformanceFlags() {
   }
 
-  public boolean isCreatePerformance() {
-    return createPerformance;
+  public boolean isCreate() {
+    return create;
   }
 
-  public boolean isDeletePerformance() {
-    return deletePerformance;
+  public boolean isDelete() {
+    return delete;
   }
 
-  public boolean isMkdirPerformance() {
-    return mkdirPerformance;
+  public boolean isMkdir() {
+    return mkdir;
   }
 
-  public S3APerformanceFlags setCreatePerformance(final boolean createPerformance) {
-    this.createPerformance = createPerformance;
+  public S3APerformanceFlags setCreate(final boolean create) {
+    this.create = create;
     return this;
   }
 
-  public S3APerformanceFlags setDeletePerformance(final boolean deletePerformance) {
-    this.deletePerformance = deletePerformance;
+  public S3APerformanceFlags setDelete(final boolean delete) {
+    this.delete = delete;
     return this;
   }
 
-  public S3APerformanceFlags setMkdirPerformance(final boolean mkdirPerformance) {
-    this.mkdirPerformance = mkdirPerformance;
+  public S3APerformanceFlags setMkdir(final boolean mkdir) {
+    this.mkdir = mkdir;
     return this;
   }
 
@@ -102,13 +102,13 @@ public boolean hasCapability(final String capability) {
     switch (capability.toLowerCase(Locale.ROOT)) {
     case FS_S3A_PERFORMANCE_FLAGS + CREATE:
     case FS_S3A_CREATE_PERFORMANCE_ENABLED:
-      return isCreatePerformance();
+      return isCreate();
 
     case FS_S3A_PERFORMANCE_FLAGS + MKDIR:
-      return isMkdirPerformance();
+      return isMkdir();
 
     case FS_S3A_PERFORMANCE_FLAGS + DELETE:
-      return isDeletePerformance();
+      return isDelete();
 
     default:
     }
@@ -118,9 +118,9 @@ public boolean hasCapability(final String capability) {
   @Override
   public String toString() {
     return "S3APerformanceFlags{" +
-        "createPerformance=" + createPerformance +
-        ", deletePerformance=" + deletePerformance +
-        ", mkdirPerformance=" + mkdirPerformance +
+        "create=" + create +
+        ", delete=" + delete +
+        ", mkdir=" + mkdir +
         '}';
   }
 
@@ -129,23 +129,23 @@ public String toString() {
    * @param options options from a configuration string.
    * @return a set of options
    */
-  public static S3APerformanceFlags create(String... options) {
+  public static S3APerformanceFlags build(String... options) {
     S3APerformanceFlags flags = new S3APerformanceFlags();
     for (String option : options) {
       switch (option.trim().toLowerCase(Locale.ROOT)) {
       case CREATE:
-        flags.createPerformance = true;
+        flags.create = true;
         break;
       case DELETE:
-        flags.deletePerformance = true;
+        flags.delete = true;
         break;
       case MKDIR:
-        flags.mkdirPerformance = true;
+        flags.mkdir = true;
         break;
       case ALL:
-        flags.createPerformance = true;
-        flags.mkdirPerformance = true;
-        flags.deletePerformance = true;
+        flags.create = true;
+        flags.mkdir = true;
+        flags.delete = true;
         break;
 
 /*      case "hive":