From 5658d73901d21697bacb69918d476a80696bc331 Mon Sep 17 00:00:00 2001 From: Jiajun Mao Date: Mon, 2 Sep 2024 14:42:53 -0500 Subject: [PATCH] misc --- .../server/datanode/erasurecode/ErasureCodingWorker.java | 5 +++-- .../server/protocol/BlockECReconstructionCommand.java | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java index 9636fd6de6afc..f1d6c216892a6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java @@ -137,13 +137,14 @@ public void processErasureCodingTasks( + "poolId {}, blockId {}\n" + "target data nodes {}\n" + "target storage type {}, id {}\n" - + "zfs failure indices {}, {}", + + "zfs failure indices {}, {}, {}", reconInfo.getExtendedBlock().getBlockPoolId(), reconInfo.getExtendedBlock().getBlockId(), targetDataNodesStr, reconInfo.getTargetStorageTypes(), reconInfo.getTargetStorageIDs(), reconInfo.getZfsFailureIndices(), - reconInfo.getLiveBlockIndices()); + reconInfo.getLiveBlockIndices(), + reconInfo.getLocalBlockId()); // MLEC - register ongoing repairs LOG.info("Adding block {} to ongoing reconstruction map", reconInfo.getExtendedBlock().getLocalBlock().getBlockId()); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/BlockECReconstructionCommand.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/BlockECReconstructionCommand.java index 03a5619c3a0f0..bfd20d701e6cd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/BlockECReconstructionCommand.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/BlockECReconstructionCommand.java @@ -152,6 +152,14 @@ public List getZfsFailureIndices() { return zfsFailureIndices; } + public long getLocalBlockId() { + return this.localBlockId; + } + + public void setLocalBlockId(long localBlockId) { + this.localBlockId = localBlockId; + } + @Override public String toString() { return new StringBuilder().append("BlockECReconstructionInfo(\n ") @@ -160,6 +168,7 @@ public String toString() { .append(Arrays.asList(targets)).append(")\n") .append(" Block Indices: ").append(Arrays.toString(liveBlockIndices)) .append(" Zfs Failure Indices: ").append(zfsFailureIndices) + .append(" Local Block Id: ").append(localBlockId) .toString(); } }