This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7a7db7f0dc41 HDFS-17310. DiskBalancer: Enhance the log message for
submitPlan (#6391) Contributed by Haiyang Hu.
7a7db7f0dc41 is described below
commit 7a7db7f0dc4107f44b281eb834fdffc9fd9b08b3
Author: huhaiyang <huhaiyang...@126.com>
AuthorDate: Thu Jan 4 00:07:51 2024 +0800
HDFS-17310. DiskBalancer: Enhance the log message for submitPlan (#6391)
Contributed by Haiyang Hu.
Reviewed-by: Ashutosh Gupta <ashu...@amazon.com>
Reviewed-by: Takanobu Asanuma <tasan...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
index 2a1e43105600..2519f49e3974 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
@@ -184,7 +184,8 @@ public class DiskBalancer {
try {
checkDiskBalancerEnabled();
if ((this.future != null) && (!this.future.isDone())) {
- LOG.error("Disk Balancer - Executing another plan, submitPlan
failed.");
+ LOG.error("Disk Balancer - Executing another plan (Plan File: {}, Plan
ID: {}), " +
+ "submitPlan failed.", planFile, planID);
throw new DiskBalancerException("Executing another plan",
DiskBalancerException.Result.PLAN_ALREADY_IN_PROGRESS);
}
@@ -523,7 +524,7 @@ public class DiskBalancer {
String sourceVolBasePath = storageIDToVolBasePathMap.get(sourceVolUuid);
if (sourceVolBasePath == null) {
- final String errMsg = "Disk Balancer - Unable to find volume: "
+ final String errMsg = "Disk Balancer - Unable to find source volume: "
+ step.getSourceVolume().getPath() + ". SubmitPlan failed.";
LOG.error(errMsg);
throw new DiskBalancerException(errMsg,
@@ -532,7 +533,7 @@ public class DiskBalancer {
String destVolBasePath = storageIDToVolBasePathMap.get(destVolUuid);
if (destVolBasePath == null) {
- final String errMsg = "Disk Balancer - Unable to find volume: "
+ final String errMsg = "Disk Balancer - Unable to find dest volume: "
+ step.getDestinationVolume().getPath() + ". SubmitPlan failed.";
LOG.error(errMsg);
throw new DiskBalancerException(errMsg,
@@ -1058,7 +1059,7 @@ public class DiskBalancer {
FsVolumeSpi source = getFsVolume(this.dataset, sourceVolUuid);
if (source == null) {
final String errMsg = "Disk Balancer - Unable to find source volume: "
- + pair.getDestVolBasePath();
+ + pair.getSourceVolBasePath();
LOG.error(errMsg);
item.setErrMsg(errMsg);
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
