From 75cf43a071c65210c74cd77b2675840419c2ff41 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sat, 4 Jun 2022 21:14:42 -0700 Subject: [PATCH 1/2] HDFS-16618. sync_file_range error should include more volume and file info --- .../impl/FsDatasetAsyncDiskService.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java index 25760bb5ac015..c44c4fd274ce9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java @@ -216,16 +216,20 @@ synchronized void shutdown() { } } - public void submitSyncFileRangeRequest(FsVolumeImpl volume, - final ReplicaOutputStreams streams, final long offset, final long nbytes, - final int flags) { - execute(volume, new Runnable() { - @Override - public void run() { + public void submitSyncFileRangeRequest(FsVolumeImpl volume, final ReplicaOutputStreams streams, + final long offset, final long nbytes, final int flags) { + execute(volume, () -> { + try { + streams.syncFileRangeIfPossible(offset, nbytes, flags); + } catch (NativeIOException e) { try { - streams.syncFileRangeIfPossible(offset, nbytes, flags); - } catch (NativeIOException e) { - LOG.warn("sync_file_range error", e); + LOG.warn("sync_file_range error. Volume: {} , Capacity: {}, Available space: {}, " + + "File range offset: {}, length: {}, flags: {}", volume, volume.getCapacity(), + volume.getAvailable(), offset, nbytes, flags, e); + } catch (IOException ioe) { + LOG.warn("sync_file_range error. Volume: {} , Capacity: {}, " + + "File range offset: {}, length: {}, flags: {}", volume, volume.getCapacity(), + offset, nbytes, flags, e); } } }); From ed59324d8a2bb7388546c781931c32a346d00d7a Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Sun, 5 Jun 2022 19:41:05 -0700 Subject: [PATCH 2/2] removing extra space - addressing review --- .../datanode/fsdataset/impl/FsDatasetAsyncDiskService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java index c44c4fd274ce9..7bfc24197a740 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetAsyncDiskService.java @@ -223,11 +223,11 @@ public void submitSyncFileRangeRequest(FsVolumeImpl volume, final ReplicaOutputS streams.syncFileRangeIfPossible(offset, nbytes, flags); } catch (NativeIOException e) { try { - LOG.warn("sync_file_range error. Volume: {} , Capacity: {}, Available space: {}, " + LOG.warn("sync_file_range error. Volume: {}, Capacity: {}, Available space: {}, " + "File range offset: {}, length: {}, flags: {}", volume, volume.getCapacity(), volume.getAvailable(), offset, nbytes, flags, e); } catch (IOException ioe) { - LOG.warn("sync_file_range error. Volume: {} , Capacity: {}, " + LOG.warn("sync_file_range error. Volume: {}, Capacity: {}, " + "File range offset: {}, length: {}, flags: {}", volume, volume.getCapacity(), offset, nbytes, flags, e); }