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

HADOOP-2362 Leaking hdfs file handle on region split 

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@601961 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2007-12-07 02:34:08 +00:00
parent 6fb4643705
commit 11df017a67
13 changed files with 119 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -59,6 +59,7 @@ Trunk (unreleased changes)
HADOOP-2347 REST servlet not thread safe but run in a threaded manner
(Bryan Duxbury via Stack)
HADOOP-2365 Result of HashFunction.hash() contains all identical values
HADOOP-2362 Leaking hdfs file handle on region split
IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable

5
src/java/org/apache/hadoop/hbase/HAbstractScanner.java
View File

@ -29,8 +29,6 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.Text;
/**
@ -125,9 +123,6 @@ public abstract class HAbstractScanner implements HInternalScannerInterface {
private boolean wildcardMatch;
private boolean multipleMatchers;
protected DataOutputBuffer outbuf = new DataOutputBuffer();
protected DataInputBuffer inbuf = new DataInputBuffer();
/** Constructor for abstract base class */
HAbstractScanner(long timestamp, Text[] targetCols) throws IOException {
this.timestamp = timestamp;

6
src/java/org/apache/hadoop/hbase/HMaster.java
View File

@ -908,9 +908,9 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
LOG.info("bootstrap: creating ROOT and first META regions");
try {
HRegion root = HRegion.createHRegion(HRegionInfo.rootRegionInfo,
this.dir, this.conf, null);
this.dir, this.conf);
HRegion meta = HRegion.createHRegion(HRegionInfo.firstMetaRegionInfo,
this.dir, this.conf, null);
this.dir, this.conf);
// Add first region from the META table to the ROOT region.
HRegion.addRegionToMETA(root, meta);
@ -2545,7 +2545,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
// 2. Create the HRegion
HRegion region =
HRegion.createHRegion(newRegion, this.dir, this.conf, null);
HRegion.createHRegion(newRegion, this.dir, this.conf);
// 3. Insert into meta

7
src/java/org/apache/hadoop/hbase/HMsg.java
View File

@ -19,9 +19,12 @@
*/
package org.apache.hadoop.hbase;
import org.apache.hadoop.io.*;
import java.io.*;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import org.apache.hadoop.io.Writable;
/*******************************************************************************
* HMsg is for communicating instructions between the HMaster and the

7
src/java/org/apache/hadoop/hbase/HRegion.java
View File

@ -608,8 +608,10 @@ public class HRegion implements HConstants {
// under each region.
HRegion regionA =
new HRegion(rootDir, log, fs, conf, regionAInfo, dirA, null);
regionA.close();
HRegion regionB =
new HRegion(rootDir, log, fs, conf, regionBInfo, dirB, null);
regionB.close();
// Cleanup
boolean deleted = fs.delete(splits); // Get rid of splits directory
@ -1581,13 +1583,12 @@ public class HRegion implements HConstants {
* @param info Info for region to create.
* @param rootDir Root directory for HBase instance
* @param conf
* @param initialFiles InitialFiles to pass new HRegion. Pass null if none.
* @return new HRegion
*
* @throws IOException
*/
static HRegion createHRegion(final HRegionInfo info, final Path rootDir,
final HBaseConfiguration conf, final Path initialFiles)
final HBaseConfiguration conf)
throws IOException {
Path regionDir = HRegion.getRegionDir(rootDir,
HRegionInfo.encodeRegionName(info.getRegionName()));
@ -1595,7 +1596,7 @@ public class HRegion implements HConstants {
fs.mkdirs(regionDir);
return new HRegion(rootDir,
new HLog(fs, new Path(regionDir, HREGION_LOGDIR_NAME), conf, null),
fs, conf, info, initialFiles, null);
fs, conf, info, null, null);
}
/**

3
src/java/org/apache/hadoop/hbase/HRegionServer.java
View File

@ -445,9 +445,6 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
synchronized(cacheFlusherLock) { // Don't interrupt while we're working
if (e != null) {
try {
if (LOG.isDebugEnabled()) {
LOG.debug("flushing region " + e.getRegion().getRegionName());
}
if (e.getRegion().flushcache()) {
compactor.compactionRequested(e);
}

4
src/java/org/apache/hadoop/hbase/HServerAddress.java
View File

@ -21,7 +21,9 @@ package org.apache.hadoop.hbase;
import org.apache.hadoop.io.*;
import java.io.*;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.net.InetSocketAddress;
/**

9
src/java/org/apache/hadoop/hbase/HServerInfo.java
View File

@ -19,9 +19,12 @@
*/
package org.apache.hadoop.hbase;
import org.apache.hadoop.io.*;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import org.apache.hadoop.io.Writable;
import java.io.*;
/**
* HServerInfo contains metainfo about an HRegionServer, Currently it only
@ -139,7 +142,6 @@ public class HServerInfo implements Writable {
// Writable
/** {@inheritDoc} */
public void readFields(DataInput in) throws IOException {
this.serverAddress.readFields(in);
this.startCode = in.readLong();
@ -147,7 +149,6 @@ public class HServerInfo implements Writable {
this.infoPort = in.readInt();
}
/** {@inheritDoc} */
public void write(DataOutput out) throws IOException {
this.serverAddress.write(out);
out.writeLong(this.startCode);

11
src/java/org/apache/hadoop/hbase/HStore.java
View File

@ -20,7 +20,6 @@
package org.apache.hadoop.hbase;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@ -760,9 +759,11 @@ class HStore implements HConstants {
bloomFilter = new RetouchedBloomFilter();
}
FSDataInputStream in = fs.open(filterFile);
try {
bloomFilter.readFields(in);
} finally {
fs.close();
}
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("creating bloom filter for " + this.storeName);
@ -913,7 +914,6 @@ class HStore implements HConstants {
HStoreKey curkey = es.getKey();
if (this.familyName.equals(HStoreKey.extractFamily(
curkey.getColumn()))) {
out.append(curkey, new ImmutableBytesWritable(es.getValue()));
}
}
@ -1040,7 +1040,7 @@ class HStore implements HConstants {
// Write out a list of data files that we're replacing
Path filesToReplace = new Path(curCompactStore, COMPACTION_TO_REPLACE);
DataOutputStream out = new DataOutputStream(fs.create(filesToReplace));
FSDataOutputStream out = fs.create(filesToReplace);
try {
out.writeInt(filesToCompact.size());
for (HStoreFile hsf : filesToCompact) {
@ -1052,7 +1052,7 @@ class HStore implements HConstants {
// Indicate that we're done.
Path doneFile = new Path(curCompactStore, COMPACTION_DONE);
(new DataOutputStream(fs.create(doneFile))).close();
fs.create(doneFile).close();
// Move the compaction into place.
completeCompaction(curCompactStore);
@ -2151,5 +2151,4 @@ class HStore implements HConstants {
"next(HStoreKey, StortedMap(...) is more efficient");
}
}
}

15
src/java/org/apache/hadoop/hbase/HStoreFile.java
View File

@ -22,7 +22,6 @@ package org.apache.hadoop.hbase;
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@ -351,17 +350,15 @@ public class HStoreFile implements HConstants, WritableComparable {
static HStoreFile obtainNewHStoreFile(HBaseConfiguration conf, Path dir,
String encodedRegionName, Text colFamily, FileSystem fs)
throws IOException {
Path mapdir = HStoreFile.getMapDir(dir, encodedRegionName, colFamily);
long fileId = Math.abs(rand.nextLong());
Path testpath1 = new Path(mapdir, createHStoreFilename(fileId));
Path testpath2 = new Path(mapdir, createHStoreInfoFilename(fileId));
while(fs.exists(testpath1) || fs.exists(testpath2)) {
Path testpath1 = null;
Path testpath2 = null;
long fileId = -1;
do {
fileId = Math.abs(rand.nextLong());
testpath1 = new Path(mapdir, createHStoreFilename(fileId));
testpath2 = new Path(mapdir, createHStoreInfoFilename(fileId));
}
} while(fs.exists(testpath1) || fs.exists(testpath2));
return new HStoreFile(conf, dir, encodedRegionName, colFamily, fileId);
}
@ -606,7 +603,7 @@ public class HStoreFile implements HConstants, WritableComparable {
*/
void writeInfo(FileSystem fs, long infonum) throws IOException {
Path p = getInfoFilePath();
DataOutputStream out = new DataOutputStream(fs.create(p));
FSDataOutputStream out = fs.create(p);
try {
out.writeByte(INFO_SEQ_NUM);
out.writeLong(infonum);

1
src/java/org/apache/hadoop/hbase/HStoreKey.java
View File

@ -331,4 +331,3 @@ public class HStoreKey implements WritableComparable {
timestamp = in.readLong();
}
}

4
src/test/org/apache/hadoop/hbase/TestScanner2.java
View File

@ -305,10 +305,10 @@ public class TestScanner2 extends HBaseClusterTestCase {
List<HRegion> newRegions = new ArrayList<HRegion>(2);
newRegions.add(HRegion.createHRegion(
new HRegionInfo(desc, null, new Text("midway")),
homedir, this.conf, null));
homedir, this.conf));
newRegions.add(HRegion.createHRegion(
new HRegionInfo(desc, new Text("midway"), null),
homedir, this.conf, null));
homedir, this.conf));
try {
for (HRegion r : newRegions) {
addRegionToMETA(metaTable, r, this.cluster.getHMasterAddress(),

33
src/test/org/apache/hadoop/hbase/TestSplit.java
View File

@ -85,6 +85,13 @@ public class TestSplit extends MultiRegionTable {
Text midkey = new Text();
assertTrue(region.needsSplit(midkey));
HRegion [] regions = split(region);
try {
// Need to open the regions.
// TODO: Add an 'open' to HRegion... don't do open by constructing
// instance.
for (int i = 0; i < regions.length; i++) {
regions[i] = openClosedRegion(regions[i]);
}
// Assert can get rows out of new regions. Should be able to get first
// row from first region and the midkey from second region.
assertGet(regions[0], COLFAMILY_NAME3, new Text(START_KEY));
@ -100,7 +107,8 @@ public class TestSplit extends MultiRegionTable {
// unsplitable because biggest store file is reference. References
// make the store unsplittable, until something bigger comes along.
assertFalse(regions[i].needsSplit(midkeys[i]));
// Add so much data to this region, we create a store file that is > than
// Add so much data to this region, we create a store file that is >
// than
// one of our unsplitable references.
// it will.
for (int j = 0; j < 2; j++) {
@ -133,7 +141,8 @@ public class TestSplit extends MultiRegionTable {
for (int i = 0; i < regions.length; i++) {
HRegion[] rs = split(regions[i]);
for (int j = 0; j < rs.length; j++) {
sortedMap.put(rs[j].getRegionName().toString(), rs[j]);
sortedMap.put(rs[j].getRegionName().toString(),
openClosedRegion(rs[j]));
}
}
LOG.info("Made 4 regions");
@ -142,10 +151,26 @@ public class TestSplit extends MultiRegionTable {
int interval = (LAST_CHAR - FIRST_CHAR) / 3;
byte[] b = START_KEY.getBytes(HConstants.UTF8_ENCODING);
for (HRegion r : sortedMap.values()) {
assertGet(r, COLFAMILY_NAME3,
new Text(new String(b, HConstants.UTF8_ENCODING)));
assertGet(r, COLFAMILY_NAME3, new Text(new String(b,
HConstants.UTF8_ENCODING)));
b[0] += interval;
}
} finally {
for (int i = 0; i < regions.length; i++) {
try {
regions[i].close();
} catch (IOException e) {
// Ignore.
}
}
}
}
private HRegion openClosedRegion(final HRegion closedRegion)
throws IOException {
return new HRegion(closedRegion.getRootDir(), closedRegion.getLog(),
closedRegion.getFilesystem(), closedRegion.getConf(),
closedRegion.getRegionInfo(), null, null);
}
/**