Skip to content

Commit bbe45bd

Browse files
steveloughranYanivKunda
authored andcommitted
HADOOP-18940. [ABFS] Remove commons IOUtils.close() from AbfsOutputStream (apache#7506)
Contributed by Mehakmeet Singh
1 parent 17c895c commit bbe45bd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.slf4j.Logger;
4141
import org.slf4j.LoggerFactory;
4242

43-
import org.apache.commons.io.IOUtils;
4443
import org.apache.commons.lang3.StringUtils;
4544
import org.apache.hadoop.fs.PathIOException;
4645
import org.apache.hadoop.fs.azurebfs.constants.FSOperationType;
@@ -62,6 +61,7 @@
6261
import static org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.STREAM_ID_LEN;
6362
import static org.apache.hadoop.fs.azurebfs.services.AbfsErrors.ERR_WRITE_WITHOUT_LEASE;
6463
import static org.apache.hadoop.fs.impl.StoreImplementationUtils.isProbeForSyncable;
64+
import static org.apache.hadoop.io.IOUtils.cleanupWithLogger;
6565
import static org.apache.hadoop.io.IOUtils.wrapException;
6666
import static org.apache.hadoop.fs.azurebfs.contracts.services.AppendRequestParameters.Mode.APPEND_MODE;
6767
import static org.apache.hadoop.fs.azurebfs.contracts.services.AppendRequestParameters.Mode.FLUSH_CLOSE_MODE;
@@ -551,7 +551,7 @@ private void uploadBlockAsync(AbfsBlock blockToUpload,
551551
outputStreamStatistics.uploadSuccessful(bytesLength);
552552
return null;
553553
} finally {
554-
IOUtils.close(blockUploadData, blockToUpload);
554+
cleanupWithLogger(LOG, blockUploadData, blockToUpload);
555555
}
556556
});
557557
writeOperations.add(new WriteOperation(job, offset, bytesLength));

0 commit comments

Comments
 (0)