HDFS-7495. Remove updatePosition argument from DFSInputStream#getBlockAt() (cmccabe)
This commit is contained in:
parent
5731c0e0d0
commit
caa42adf20
|
@ -668,6 +668,9 @@ Release 2.7.0 - UNRELEASED
|
||||||
|
|
||||||
HDFS-7740. Test truncate with DataNodes restarting. (yliu)
|
HDFS-7740. Test truncate with DataNodes restarting. (yliu)
|
||||||
|
|
||||||
|
HDFS-7495. Remove updatePosition argument from DFSInputStream#getBlockAt()
|
||||||
|
(cmccabe)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
|
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
|
||||||
|
|
|
@ -434,12 +434,10 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
* Fetch it from the namenode if not cached.
|
* Fetch it from the namenode if not cached.
|
||||||
*
|
*
|
||||||
* @param offset block corresponding to this offset in file is returned
|
* @param offset block corresponding to this offset in file is returned
|
||||||
* @param updatePosition whether to update current position
|
|
||||||
* @return located block
|
* @return located block
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
private LocatedBlock getBlockAt(long offset,
|
private LocatedBlock getBlockAt(long offset) throws IOException {
|
||||||
boolean updatePosition) throws IOException {
|
|
||||||
synchronized(infoLock) {
|
synchronized(infoLock) {
|
||||||
assert (locatedBlocks != null) : "locatedBlocks is null";
|
assert (locatedBlocks != null) : "locatedBlocks is null";
|
||||||
|
|
||||||
|
@ -449,7 +447,6 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
if (offset < 0 || offset >= getFileLength()) {
|
if (offset < 0 || offset >= getFileLength()) {
|
||||||
throw new IOException("offset < 0 || offset >= getFileLength(), offset="
|
throw new IOException("offset < 0 || offset >= getFileLength(), offset="
|
||||||
+ offset
|
+ offset
|
||||||
+ ", updatePosition=" + updatePosition
|
|
||||||
+ ", locatedBlocks=" + locatedBlocks);
|
+ ", locatedBlocks=" + locatedBlocks);
|
||||||
}
|
}
|
||||||
else if (offset >= locatedBlocks.getFileLength()) {
|
else if (offset >= locatedBlocks.getFileLength()) {
|
||||||
|
@ -470,17 +467,6 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
}
|
}
|
||||||
blk = locatedBlocks.get(targetBlockIdx);
|
blk = locatedBlocks.get(targetBlockIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
// update current position
|
|
||||||
if (updatePosition) {
|
|
||||||
// synchronized not strictly needed, since we only get here
|
|
||||||
// from synchronized caller methods
|
|
||||||
synchronized(this) {
|
|
||||||
pos = offset;
|
|
||||||
blockEnd = blk.getStartOffset() + blk.getBlockSize() - 1;
|
|
||||||
currentLocatedBlock = blk;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return blk;
|
return blk;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -604,7 +590,14 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
//
|
//
|
||||||
// Compute desired block
|
// Compute desired block
|
||||||
//
|
//
|
||||||
LocatedBlock targetBlock = getBlockAt(target, true);
|
LocatedBlock targetBlock = getBlockAt(target);
|
||||||
|
|
||||||
|
// update current position
|
||||||
|
this.pos = target;
|
||||||
|
this.blockEnd = targetBlock.getStartOffset() +
|
||||||
|
targetBlock.getBlockSize() - 1;
|
||||||
|
this.currentLocatedBlock = targetBlock;
|
||||||
|
|
||||||
assert (target==pos) : "Wrong postion " + pos + " expect " + target;
|
assert (target==pos) : "Wrong postion " + pos + " expect " + target;
|
||||||
long offsetIntoBlock = target - targetBlock.getStartOffset();
|
long offsetIntoBlock = target - targetBlock.getStartOffset();
|
||||||
|
|
||||||
|
@ -979,7 +972,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
}
|
}
|
||||||
deadNodes.clear(); //2nd option is to remove only nodes[blockId]
|
deadNodes.clear(); //2nd option is to remove only nodes[blockId]
|
||||||
openInfo();
|
openInfo();
|
||||||
block = getBlockAt(block.getStartOffset(), false);
|
block = getBlockAt(block.getStartOffset());
|
||||||
failures++;
|
failures++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -1056,7 +1049,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
byte[] buf, int offset,
|
byte[] buf, int offset,
|
||||||
Map<ExtendedBlock, Set<DatanodeInfo>> corruptedBlockMap)
|
Map<ExtendedBlock, Set<DatanodeInfo>> corruptedBlockMap)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
block = getBlockAt(block.getStartOffset(), false);
|
block = getBlockAt(block.getStartOffset());
|
||||||
while (true) {
|
while (true) {
|
||||||
DNAddrPair addressPair = chooseDataNode(block, null);
|
DNAddrPair addressPair = chooseDataNode(block, null);
|
||||||
try {
|
try {
|
||||||
|
@ -1108,7 +1101,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
// start of the loop.
|
// start of the loop.
|
||||||
CachingStrategy curCachingStrategy;
|
CachingStrategy curCachingStrategy;
|
||||||
boolean allowShortCircuitLocalReads;
|
boolean allowShortCircuitLocalReads;
|
||||||
block = getBlockAt(block.getStartOffset(), false);
|
block = getBlockAt(block.getStartOffset());
|
||||||
synchronized(infoLock) {
|
synchronized(infoLock) {
|
||||||
curCachingStrategy = cachingStrategy;
|
curCachingStrategy = cachingStrategy;
|
||||||
allowShortCircuitLocalReads = !shortCircuitForbidden();
|
allowShortCircuitLocalReads = !shortCircuitForbidden();
|
||||||
|
@ -1208,7 +1201,7 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
|
||||||
ByteBuffer bb = null;
|
ByteBuffer bb = null;
|
||||||
int len = (int) (end - start + 1);
|
int len = (int) (end - start + 1);
|
||||||
int hedgedReadId = 0;
|
int hedgedReadId = 0;
|
||||||
block = getBlockAt(block.getStartOffset(), false);
|
block = getBlockAt(block.getStartOffset());
|
||||||
while (true) {
|
while (true) {
|
||||||
// see HDFS-6591, this metric is used to verify/catch unnecessary loops
|
// see HDFS-6591, this metric is used to verify/catch unnecessary loops
|
||||||
hedgedReadOpsLoopNumForTesting++;
|
hedgedReadOpsLoopNumForTesting++;
|
||||||
|
|
Loading…
Reference in New Issue