Skip to content
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,14 @@ private void updateStatus(UUID dnId, long scmCmdId,
CommandStatus.Status newStatus) {
Map<Long, CmdStatusData> recordForDn = scmCmdStatusRecord.get(dnId);
if (recordForDn == null) {
LOG.warn("Unknown Datanode: {} scmCmdId {} newStatus {}",
LOG.warn("Unknown Datanode: {} scmCmdId {} report status {}",
dnId, scmCmdId, newStatus);
return;
}
if (recordForDn.get(scmCmdId) == null) {
LOG.warn("Unknown SCM Command: {} Datanode {} newStatus {}",
// Because of the delay in the DN report, the DN sometimes report obsolete
// Command status that are cleared by the SCM.
LOG.debug("Unknown SCM Command: {} Datanode {} report status {}",
scmCmdId, dnId, newStatus);
return;
}
Expand Down Expand Up @@ -300,15 +302,16 @@ private void updateStatus(UUID dnId, long scmCmdId,
}
break;
default:
LOG.error("Can not update to Unknown new Status: {}", newStatus);
LOG.error("Unexpected status from Datanode: {}. SCM Command ID: {} with status: {}.",
dnId, scmCmdId, newStatus);
break;
}
if (!changed) {
LOG.warn("Cannot update illegal status for DN: {} ScmCommandId {} " +
"Status From {} to {}", dnId, scmCmdId, oldStatus, newStatus);
"Status {} by DN report status {}", dnId, scmCmdId, oldStatus, newStatus);
} else {
LOG.debug("Successful update DN: {} ScmCommandId {} Status From {} to" +
" {}", dnId, scmCmdId, oldStatus, newStatus);
" {}, DN report status {}", dnId, scmCmdId, oldStatus, statusData.getStatus(), newStatus);
}
}

Expand All @@ -320,11 +323,8 @@ private void removeTimeoutScmCommand(UUID dnId,
if (updateTime != null &&
Duration.between(updateTime, now).toMillis() > timeoutMs) {
CmdStatusData state = removeScmCommand(dnId, scmCmdId);
LOG.warn("Remove Timeout SCM BlockDeletionCommand {} for DN {} " +
"after without update {}ms}", state, dnId, timeoutMs);
} else {
LOG.warn("Timeout SCM scmCmdIds {} for DN {} " +
"after without update {}ms}", scmCmdIds, dnId, timeoutMs);
LOG.warn("SCM BlockDeletionCommand {} for DN {} was removed after {}ms without update",
state, dnId, timeoutMs);
}
}
}
Expand Down