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

HBASE-5878 Use getVisibleLength public api from HdfsDataInputStream from Hadoop-2. 

Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
Ashish Singhi 2015-08-10 16:20:07 -07:00 committed by Andrew Purtell
parent e4106b4c4a
commit 6e8cdec242
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SequenceFileLogReader.java
View File

@ -19,21 +19,20 @@
package org.apache.hadoop.hbase.regionserver.wal; package org.apache.hadoop.hbase.regionserver.wal;
import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.NavigableMap; import java.util.NavigableMap;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.wal.WAL.Entry; import org.apache.hadoop.hbase.wal.WAL.Entry;
import org.apache.hadoop.hdfs.client.HdfsDataInputStream;
import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.SequenceFile.Metadata; import org.apache.hadoop.io.SequenceFile.Metadata;
import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Text;
@ -111,31 +110,24 @@ public class SequenceFileLogReader extends ReaderBase {
if (this.firstGetPosInvocation) { if (this.firstGetPosInvocation) {
this.firstGetPosInvocation = false; this.firstGetPosInvocation = false;
long adjust = 0; long adjust = 0;
HdfsDataInputStream hdfsDataInputStream = null;
try { try {
Field fIn = FilterInputStream.class.getDeclaredField("in"); if (this.in.getClass().getName().endsWith("HdfsDataInputStream")
fIn.setAccessible(true); || this.in.getClass().getName().endsWith("DFSInputStream")) {
Object realIn = fIn.get(this.in); hdfsDataInputStream = (HdfsDataInputStream) this.getWrappedStream();
// In hadoop 0.22, DFSInputStream is a standalone class. Before this, long realLength = hdfsDataInputStream.getVisibleLength();
// it was an inner class of DFSClient.
if (realIn.getClass().getName().endsWith("DFSInputStream")) {
Method getFileLength = realIn.getClass().
getDeclaredMethod("getFileLength", new Class<?> []{});
getFileLength.setAccessible(true);
long realLength = ((Long)getFileLength.
invoke(realIn, new Object []{})).longValue();
assert(realLength >= this.length); assert(realLength >= this.length);
adjust = realLength - this.length; adjust = realLength - this.length;
} else { } else {
LOG.info("Input stream class: " + realIn.getClass().getName() + LOG.info(
", not adjusting length"); "Input stream class: " + this.in.getClass().getName() + ", not adjusting length");
} }
} catch (Exception e) { } catch (Exception e) {
SequenceFileLogReader.LOG.warn( LOG.warn("Error while trying to get accurate file length. "
"Error while trying to get accurate file length. " + + "Truncation / data loss may occur if RegionServers die.",
"Truncation / data loss may occur if RegionServers die.", e); e);
throw new IOException(e);
} }
return adjust + super.getPos(); return adjust + super.getPos();
} }
return super.getPos(); return super.getPos();