Skip to content

YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggregation #4486

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
PrabhuJoseph merged 2 commits into from
Jun 23, 2022
Merged

YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggregation #4486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dbead0
YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggre…
Jun 22, 2022
8da8aed
Adding missing readfully
Jun 23, 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
15 changes: 10 additions & 5 deletions .../hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ private Pair<Path, Boolean> initializeWriterInRolling(
checksumFileInputStream = fc.open(remoteLogCheckSumFile);
int nameLength = checksumFileInputStream.readInt();
byte[] b = new byte[nameLength];
int actualLength = checksumFileInputStream.read(b);
checksumFileInputStream.readFully(b);
int actualLength = b.length;
if (actualLength == nameLength) {
String recoveredLogFile = new String(
b, Charset.forName("UTF-8"));
Expand Down Expand Up @@ -765,7 +766,8 @@ public Map<String, Long> parseCheckSumFiles(
checksumFileInputStream = fc.open(file.getPath());
int nameLength = checksumFileInputStream.readInt();
byte[] b = new byte[nameLength];
int actualLength = checksumFileInputStream.read(b);
checksumFileInputStream.readFully(b);
int actualLength = b.length;
if (actualLength == nameLength) {
nodeName = new String(b, Charset.forName("UTF-8"));
index = checksumFileInputStream.readLong();
Expand Down Expand Up @@ -799,7 +801,8 @@ private Long parseChecksum(FileStatus file) {
checksumFileInputStream = fileContext.open(file.getPath());
int nameLength = checksumFileInputStream.readInt();
byte[] b = new byte[nameLength];
int actualLength = checksumFileInputStream.read(b);
checksumFileInputStream.readFully(b);
int actualLength = b.length;
if (actualLength == nameLength) {
nodeName = new String(b, StandardCharsets.UTF_8);
index = checksumFileInputStream.readLong();
Expand Down Expand Up @@ -938,7 +941,8 @@ public IndexedLogsMeta loadIndexedLogsMeta(Path remoteLogPath, long end,

// Load UUID and make sure the UUID is correct.
byte[] uuidRead = new byte[UUID_LENGTH];
int uuidReadLen = fsDataIStream.read(uuidRead);
fsDataIStream.readFully(uuidRead);
int uuidReadLen = uuidRead.length;
if (this.uuid == null) {
this.uuid = createUUID(appId);
}
Expand Down Expand Up @@ -1322,7 +1326,8 @@ private byte[] loadUUIDFromLogFile(final FileContext fc,
.endsWith(CHECK_SUM_FILE_SUFFIX)) {
fsDataInputStream = fc.open(checkPath);
byte[] b = new byte[uuid.length];
int actual = fsDataInputStream.read(b);
fsDataInputStream.readFully(b);
int actual = b.length;
if (actual != uuid.length || Arrays.equals(b, uuid)) {
deleteFileWithRetries(fc, checkPath);
} else if (id == null){
Expand Down