You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by pr...@apache.org on 2022/06/23 16:28:50 UTC
[hadoop] branch trunk updated: YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggregation (#4486)
This is an automated email from the ASF dual-hosted git repository.
prabhujoseph pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4abb2ba58c3 YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggregation (#4486)
4abb2ba58c3 is described below
commit 4abb2ba58c3ad059c00a46b7bc567f0fb192608c
Author: Ashutosh Gupta <as...@st.niituniversity.in>
AuthorDate: Thu Jun 23 17:28:32 2022 +0100
YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggregation (#4486)
* YARN-10320.Replace FSDataInputStream#read with readFully in Log Aggregation
Co-authored-by: Ashutosh Gupta <as...@amazon.com>
---
.../ifile/LogAggregationIndexedFileController.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java
index 6cd1f53d4ac..d4431d56b39 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java
@@ -282,7 +282,8 @@ public class LogAggregationIndexedFileController
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"));
@@ -765,7 +766,8 @@ public class LogAggregationIndexedFileController
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();
@@ -799,7 +801,8 @@ public class LogAggregationIndexedFileController
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();
@@ -938,7 +941,8 @@ public class LogAggregationIndexedFileController
// 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);
}
@@ -1322,7 +1326,8 @@ public class LogAggregationIndexedFileController
.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){
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org