minor s3a changes

Author: steveloughran

src/main/java/org/apache/hadoop/fs/store/diag/OptionSets.java

@@ -113,13 +113,15 @@ public class OptionSets {
       {"HDP_VERSION", false},
       {"JAVA_HOME", false},
       {"LD_LIBRARY_PATH", false},
+      {"LD_PRELOAD", false},
       {"LOCAL_DIRS", false},
       {"OPENSSL_ROOT_DIR", false},
       {"OPENSSL_CONF", false},
       {"OPENSSL_CONF_INCLUDE", false},
       {"OPENSSL_MODULES", false},
       {"OPENSSL_TRACE", false},
       {"PYSPARK_DRIVER_PYTHON", false},
+      {"SASL_MECHANISM", false},
       {"SPARK_HOME", false},
       {"SPARK_CONF_DIR", false},
       {"SPARK_SCALA_VERSION", false},

src/main/java/org/apache/hadoop/fs/store/diag/S3ADiagnosticsInfo.java

@@ -666,11 +666,9 @@ public class S3ADiagnosticsInfo extends StoreDiagnosticsInfo {
 
       // SSL stuff
       "org.wildfly.openssl.OpenSSLProvider",
+      " org.wildfly.openssl.OpenSSLContextSPI$OpenSSLTLSContextSpi",
       X509,
 
-      // prefetch
-      "org.apache.hadoop.fs.impl.prefetch.PrefetchingStatistics",
-      "org.apache.hadoop.fs.s3a.prefetch.S3ACachingBlockManager",
 
       // s3a store and bulk delete
       "org.apache.hadoop.fs.s3a.S3AStore",
@@ -1113,7 +1111,7 @@ protected void validateConfig(final Printout printout,
         printout.println("This attempts to use OpenSSL, falling back to the JVM");
         break;
       case DEFAULT_JSSE:
-        printout.println("This uses the JVM only, with GCM ciphers disabled");
+        printout.println("This uses the JVM only, with GCM ciphers disabled on Java 8; on Java 11+ GCM is re-enabled");
         break;
       case DEFAULT_JSSE_WITH_GCM:
         printout.println("This uses the JVM only, with GCM enabled");