Skip to content

HDFS-16866. Fix a typo in Dispatcher #5202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 16, 2022
Merged

HDFS-16866. Fix a typo in Dispatcher #5202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93a7a09
HDFS-16866. Fix a typo in Dispatcher
Happy-shi Dec 9, 2022
f8069dd
HDFS-16866. update the method name getBblocksMoved to getBlocksMoved …
Happy-shi Dec 11, 2022
1e7414a
HDFS-16866. fix checkstyle warn
Happy-shi Dec 15, 2022
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
4 changes: 2 additions & 2 deletions ...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,12 +708,12 @@ public String toString() {

Result newResult(ExitStatus exitStatus, long bytesLeftToMove, long bytesBeingMoved) {
return new Result(exitStatus, bytesLeftToMove, bytesBeingMoved,
dispatcher.getBytesMoved(), dispatcher.getBblocksMoved());
dispatcher.getBytesMoved(), dispatcher.getBlocksMoved());
}

Result newResult(ExitStatus exitStatus) {
return new Result(exitStatus, -1, -1, dispatcher.getBytesMoved(),
dispatcher.getBblocksMoved());
dispatcher.getBlocksMoved());
}

/** Run an iteration for all datanodes. */
Expand Down
8 changes: 4 additions & 4 deletions ...-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ synchronized int allocate(int n) {
}
}

/** Aloocate a single lot of items */
/** Allocate a single lot of items. */
int allocate() {
return allocate(lotSize);
}
Expand Down Expand Up @@ -1125,7 +1125,7 @@ long getBytesMoved() {
return nnc.getBytesMoved().get();
}

long getBblocksMoved() {
long getBlocksMoved() {
return nnc.getBlocksMoved().get();
}

Expand Down Expand Up @@ -1232,7 +1232,7 @@ public boolean dispatchAndCheckContinue() throws InterruptedException {
*/
private long dispatchBlockMoves() throws InterruptedException {
final long bytesLastMoved = getBytesMoved();
final long blocksLastMoved = getBblocksMoved();
final long blocksLastMoved = getBlocksMoved();
final Future<?>[] futures = new Future<?>[sources.size()];

int concurrentThreads = Math.min(sources.size(),
Expand Down Expand Up @@ -1282,7 +1282,7 @@ public void run() {
waitForMoveCompletion(targets);
LOG.info("Total bytes (blocks) moved in this iteration {} ({})",
StringUtils.byteDesc(getBytesMoved() - bytesLastMoved),
(getBblocksMoved() - blocksLastMoved));
(getBlocksMoved() - blocksLastMoved));

return getBytesMoved() - bytesLastMoved;
}
Expand Down