This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 7119af2 HDFS-15459. TestBlockTokenWithDFSStriped fails
intermittently. Contributed by Ahmed Hussein.
7119af2 is described below
commit 7119af2c6d0807431fd88fb90f8f7062eb3da7c9
Author: Inigo Goiri <inigo...@apache.org>
AuthorDate: Fri Oct 23 09:47:10 2020 -0700
HDFS-15459. TestBlockTokenWithDFSStriped fails intermittently. Contributed
by Ahmed Hussein.
(cherry picked from commit e7aa4da0a26988fcf5880311067e62a15e05fc1e)
---
.../hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java
index 0b39456..124db17 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java
@@ -136,7 +136,7 @@ public class TestBlockTokenWithDFSStriped extends
TestBlockTokenWithDFS {
LocatedBlock[] internalBlocks = StripedBlockUtil.parseStripedBlockGroup
(lsb, cellSize, dataBlocks, parityBlocks);
for (LocatedBlock internalBlock : internalBlocks) {
- if(super.isBlockTokenExpired(internalBlock)){
+ if(internalBlock != null && super.isBlockTokenExpired(internalBlock)) {
return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
