Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-7023. Incorrect ReservationId.compareTo() implementation. 

This closes #262

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit c5281a85e1)
(cherry picked from commit b616462eef)
This commit is contained in:
Oleg Danilov 2017-08-16 15:19:26 +03:00 committed by Akira Ajisaka
parent 798ff2f52b
commit 867a4b7d78
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationId.java
View File

@ -94,10 +94,9 @@ public abstract class ReservationId implements Comparable<ReservationId> {
@Override
public int compareTo(ReservationId other) {
if (this.getClusterTimestamp() - other.getClusterTimestamp() == 0) {
return getId() > getId() ? 1 : getId() < getId() ? -1 : 0;
return Long.compare(getId(), other.getId());
} else {
return this.getClusterTimestamp() > other.getClusterTimestamp() ? 1
: this.getClusterTimestamp() < other.getClusterTimestamp() ? -1 : 0;
return Long.compare(getClusterTimestamp(), other.getClusterTimestamp());
}
}