Revert "HADOOP-17873. ABFS: Fix transient failures in ITestAbfsStreamStatistics and ITestAbfsRestOperationException (#3341)"

This reverts commit 82658a22d6.

hadoop-tools/hadoop-azure/pom.xml

@@ -555,7 +555,6 @@
                     <exclude>**/azurebfs/ITestAzureBlobFileSystemListStatus.java</exclude>
                     <exclude>**/azurebfs/extensions/ITestAbfsDelegationTokens.java</exclude>
                     <exclude>**/azurebfs/ITestSmallWriteOptimization.java</exclude>
-                    <exclude>**/azurebfs/ITestAbfsStreamStatistics*.java</exclude>
                     <exclude>**/azurebfs/services/ITestReadBufferManager.java</exclude>
                   </excludes>
 
@@ -598,7 +597,6 @@
                     <include>**/azurebfs/extensions/ITestAbfsDelegationTokens.java</include>
                     <include>**/azurebfs/ITestSmallWriteOptimization.java</include>
                     <include>**/azurebfs/services/ITestReadBufferManager.java</include>
-                    <include>**/azurebfs/ITestAbfsStreamStatistics*.java</include>
                   </includes>
                 </configuration>
               </execution>

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/oauth2/CustomTokenProviderAdapter.java

@@ -22,7 +22,6 @@ package org.apache.hadoop.fs.azurebfs.oauth2;
 import java.io.IOException;
 import java.net.URI;
 
-import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -139,9 +138,4 @@ public final class CustomTokenProviderAdapter extends AccessTokenProvider
     String suffix = ExtensionHelper.getUserAgentSuffix(adaptee, "");
     return suffix != null ? suffix : "";
   }
-
-  @VisibleForTesting
-  protected CustomTokenProviderAdaptee getCustomTokenProviderAdaptee() {
-    return adaptee;
-  }
 }

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java

@@ -1223,9 +1223,4 @@ public class AbfsClient implements Closeable {
   public <V> void addCallback(ListenableFuture<V> future, FutureCallback<V> callback) {
     Futures.addCallback(future, callback, executorService);
   }
-
-  @VisibleForTesting
-  protected AccessTokenProvider getTokenProvider() {
-    return tokenProvider;
-  }
 }

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java

@@ -37,12 +37,10 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.azurebfs.constants.FSOperationType;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AzureBlobFileSystemException;
-import org.apache.hadoop.fs.azurebfs.oauth2.AccessTokenProvider;
 import org.apache.hadoop.fs.azurebfs.security.AbfsDelegationTokenManager;
 import org.apache.hadoop.fs.azurebfs.services.AbfsClient;
 import org.apache.hadoop.fs.azurebfs.services.AbfsOutputStream;
 import org.apache.hadoop.fs.azurebfs.services.AuthType;
-import org.apache.hadoop.fs.azurebfs.services.TestAbfsClient;
 import org.apache.hadoop.fs.azure.AzureNativeFileSystemStore;
 import org.apache.hadoop.fs.azure.NativeAzureFileSystem;
 import org.apache.hadoop.fs.azure.metrics.AzureFileSystemInstrumentation;
@@ -243,9 +241,6 @@ public abstract class AbstractAbfsIntegrationTest extends
     }
   }
 
-  public AccessTokenProvider getAccessTokenProvider(final AzureBlobFileSystem fs) {
-    return TestAbfsClient.getAccessTokenProvider(fs.getAbfsStore().getClient());
-  }
 
   public void loadConfiguredFileSystem() throws Exception {
       // disable auto-creation of filesystem

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsRestOperationException.java

@@ -111,10 +111,7 @@ public class ITestAbfsRestOperationException extends AbstractAbfsIntegrationTest
     final AzureBlobFileSystem fs1 =
         (AzureBlobFileSystem) FileSystem.newInstance(fs.getUri(),
         config);
-    RetryTestTokenProvider retryTestTokenProvider
+    RetryTestTokenProvider.ResetStatusToFirstTokenFetch();
-        = RetryTestTokenProvider.getCurrentRetryTestProviderInstance(
-        getAccessTokenProvider(fs1));
-    retryTestTokenProvider.resetStatusToFirstTokenFetch();
 
     intercept(Exception.class,
         ()-> {
@@ -122,10 +119,10 @@ public class ITestAbfsRestOperationException extends AbstractAbfsIntegrationTest
         });
 
     // Number of retries done should be as configured
-    Assert.assertEquals(
+    Assert.assertTrue(
-        "Number of token fetch retries done does not match with fs.azure"
+        "Number of token fetch retries (" + RetryTestTokenProvider.reTryCount
-            + ".custom.token.fetch.retry.count configured", numOfRetries,
+            + ") done, does not match with fs.azure.custom.token.fetch.retry.count configured (" + numOfRetries
-        retryTestTokenProvider.getRetryCount());
+            + ")", RetryTestTokenProvider.reTryCount == numOfRetries);
   }
 
   @Test

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/oauth2/RetryTestTokenProvider.java

@@ -30,12 +30,12 @@ import org.slf4j.LoggerFactory;
  */
 public class RetryTestTokenProvider implements CustomTokenProviderAdaptee {
 
-  private static final Logger LOG = LoggerFactory.getLogger(
-      RetryTestTokenProvider.class);
-
   // Need to track first token fetch otherwise will get counted as a retry too.
-  private boolean isThisFirstTokenFetch = true;
+  private static boolean isThisFirstTokenFetch = true;
-  private int retryCount = 0;
+  public static int reTryCount = 0;
+
+  private static final Logger LOG = LoggerFactory
+      .getLogger(RetryTestTokenProvider.class);
 
   @Override
   public void initialize(Configuration configuration, String accountName)
@@ -43,13 +43,9 @@ public class RetryTestTokenProvider implements CustomTokenProviderAdaptee {
 
   }
 
-  /**
+  public static void ResetStatusToFirstTokenFetch() {
-   * Clear earlier retry details and reset RetryTestTokenProvider instance to
-   * state of first access token fetch call.
-   */
-  public void resetStatusToFirstTokenFetch() {
     isThisFirstTokenFetch = true;
-    retryCount = 0;
+    reTryCount = 0;
   }
 
   @Override
@@ -57,7 +53,7 @@ public class RetryTestTokenProvider implements CustomTokenProviderAdaptee {
     if (isThisFirstTokenFetch) {
       isThisFirstTokenFetch = false;
     } else {
-      retryCount++;
+      reTryCount++;
     }
 
     LOG.debug("RetryTestTokenProvider: Throw an exception in fetching tokens");
@@ -68,13 +64,4 @@ public class RetryTestTokenProvider implements CustomTokenProviderAdaptee {
   public Date getExpiryTime() {
     return new Date();
   }
-
-  public static RetryTestTokenProvider getCurrentRetryTestProviderInstance(
-      AccessTokenProvider customTokenProvider) {
-    return (RetryTestTokenProvider) ((CustomTokenProviderAdapter) customTokenProvider).getCustomTokenProviderAdaptee();
-  }
-
-  public int getRetryCount() {
-    return retryCount;
-  }
 }

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClient.java

@@ -395,8 +395,4 @@ public final class TestAbfsClient {
         url,
         requestHeaders);
   }
-
-  public static AccessTokenProvider getAccessTokenProvider(AbfsClient client) {
-    return client.getTokenProvider();
-  }
 }