Resolve cherry-pick conflict

GoogleCloudDataproc · Nov 6, 2020 · 6bb3617 · 6bb3617
1 parent 6e81dfa
commit 6bb3617
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/gcs/CHANGES.md b/gcs/CHANGES.md
@@ -3,6 +3,8 @@
 1.  Increment Hadoop `FileSystem.Statistics` counters for read and write
     operations.
 
+1.  Add `FsBenchmark` tool for benchmarking HCFS.
+
 1.  Update all dependencies to latest versions.
 
 ### 2.1.5 - 2020-09-11
@@ -106,8 +108,6 @@
 
 1.  Update all dependencies to latest versions.
 
-1.  Add `FsBenchmark` tool for benchmarking HCFS.
-
 ### 2.1.1 - 2020-03-11
 
 1.  Add upload cache to support high-level retries of failed uploads. Cache size

diff --git a/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageImpl.java b/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageImpl.java
@@ -279,8 +279,6 @@ public GoogleCloudStorageImpl(GoogleCloudStorageOptions options, Storage gcs) {
       this.storageStubProvider =
           new StorageStubProvider(options.getReadChannelOptions(), backgroundTasksThreadPool);
     }
-
-    this.storageRequestAuthorizer = initializeStorageRequestAuthorizer(storageOptions);
   }
 
   @VisibleForTesting

diff --git a/...o/src/test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageGrpcWriteChannelTest.java b/...o/src/test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageGrpcWriteChannelTest.java
@@ -185,7 +185,7 @@ public void writeSendsMultipleInsertObjectRequestsWithChecksums() throws Excepti
         AsyncWriteChannelOptions.builder().setGrpcChecksumsEnabled(true).build();
     ObjectWriteConditions writeConditions = new ObjectWriteConditions();
     GoogleCloudStorageGrpcWriteChannel writeChannel =
-        newWriteChannel(options, writeConditions, /* requesterPaysProject= */ null);
+        newWriteChannel(options, writeConditions, /* requesterPaysProject= */ Optional.absent());
     fakeService.setQueryWriteStatusResponses(
         ImmutableList.of(
                 QueryWriteStatusResponse.newBuilder()
@@ -425,7 +425,7 @@ public void retryInsertOnIOException() throws Exception {
         AsyncWriteChannelOptions.builder().setUploadChunkSize(GCS_MINIMUM_CHUNK_SIZE).build();
     ObjectWriteConditions writeConditions = ObjectWriteConditions.NONE;
     GoogleCloudStorageGrpcWriteChannel writeChannel =
-        newWriteChannel(options, writeConditions, /* requesterPaysProject= */ null);
+        newWriteChannel(options, writeConditions, /* requesterPaysProject= */ Optional.absent());
     fakeService.setInsertObjectExceptions(
         ImmutableList.of(
             new StatusException(Status.DEADLINE_EXCEEDED),

diff --git a/pom.xml b/pom.xml
@@ -116,6 +116,7 @@
     <junit.version>4.13.1</junit.version>
     <junit.system-rules.version>1.19.0</junit.system-rules.version>
     <mockito.version>3.6.0</mockito.version>
+    <guava.retrying.version>2.0.0</guava.retrying.version>
   </properties>
 
   <modules>