big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-17310. DiskBalancer: Enhance the log message for submitPlan (#6391) Contributed by Haiyang Hu.

Browse Source 
Reviewed-by: Ashutosh Gupta <ashugpt@amazon.com>
Reviewed-by: Takanobu Asanuma <tasanuma@apache.org>
Signed-off-by: Shilun Fan <slfan1989@apache.org>
This commit is contained in:
huhaiyang 2024-01-04 00:07:51 +08:00 committed by GitHub
parent 335587df9e
commit 7a7db7f0dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
View File

@ -184,7 +184,8 @@ public void submitPlan(String planId, long planVersion, String planFileName,
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 @@ private void createWorkPlan(NodePlan plan) throws DiskBalancerException {
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 @@ private void createWorkPlan(NodePlan plan) throws DiskBalancerException {
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 void copyBlocks(VolumePair pair, DiskBalancerWorkItem item) {
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;