Skip to content

Commit c02d320

Browse files
committed
HADOOP-19278. yetus feedback
Change-Id: I9f41965bad7d5b9189f67593b067b42cdec5f605
1 parent 508d239 commit c02d320

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4261,9 +4261,8 @@ PutObjectResponse executePut(
42614261
final File file)
42624262
throws IOException {
42634263
String key = putObjectRequest.key();
4264-
long len = getPutRequestLength(putObjectRequest);
42654264
ProgressableProgressListener listener =
4266-
new ProgressableProgressListener(store, putObjectRequest.key(), progress);
4265+
new ProgressableProgressListener(store, key, progress);
42674266
UploadInfo info = putObject(putObjectRequest, file, listener);
42684267
PutObjectResponse result = store.waitForUploadCompletion(key, info).response();
42694268
listener.uploadCompleted(info.getFileUpload());

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/performance/ITestS3ARenameCost.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void testCostOfRootFileRename() throws Throwable {
126126
verifyMetrics(() -> {
127127
fs.rename(src, dest);
128128
return "after fs.rename(/src,/dest) " + getMetricSummary();
129-
},
129+
},
130130
always(FILE_STATUS_FILE_PROBE
131131
.plus(GET_FILE_STATUS_FNFE)
132132
.plus(COPY_OP)),
@@ -160,7 +160,7 @@ public void testCostOfRootFileDelete() throws Throwable {
160160
verifyMetrics(() -> {
161161
fs.delete(src, false);
162162
return "after fs.delete(/dest) " + getMetricSummary();
163-
},
163+
},
164164
with(DIRECTORIES_CREATED, 0),
165165
with(DIRECTORIES_DELETED, 0),
166166
with(FAKE_DIRECTORIES_DELETED, 0),

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/tools/ITestMarkerTool.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ public void testCleanMarkersFileLimit() throws Throwable {
8787
markerTool(EXIT_INTERRUPTED, getFileSystem(),
8888
createdPaths.base, false, 0, 1, false);
8989
}
90-
9190

9291
@Test
9392
public void testRenameKeepingFS() throws Throwable {
@@ -112,7 +111,7 @@ public void testRenameKeepingFS() throws Throwable {
112111
LOG.info("Auditing destination paths");
113112
verifyRenamed(dest, createdPaths);
114113
}
115-
114+
116115
/**
117116
* Assert that an expected number of markers were deleted.
118117
* @param expected expected count.

0 commit comments

Comments
 (0)