hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r991365 - in /hbase/branches/0.90_master_rewrite: bin/ src/main/java/org/apache/hadoop/hbase/regionserver/ src/main/java/org/apache/hadoop/hbase/regionserver/handler/ src/main/java/org/apache/hadoop/hbase/regionserver/wal/ src/main/java/org...
Date Tue, 31 Aug 2010 22:16:35 GMT
Author: stack
Date: Tue Aug 31 22:16:34 2010
New Revision: 991365

URL: http://svn.apache.org/viewvc?rev=991365&view=rev
Log:
Fix up thrift, wal replay, some rest and bulk load tests.
Mostly it was not passing the unit test Configuration; w/o it tests were
not finding cluster.  But also bugs found by unit tests.

M src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
M src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
M src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
M src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
M src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
  Fix these tests.
M src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
  Handle NPE if cluster has been shutdown under us.
M src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
M src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
  Forgot to change reigon name to encoded name in a few places.
M src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
  -1 sequence number is possible in bulk loaded files.
M bin/start-hbase.sh
M bin/rolling-restart.sh
M bin/stop-hbase.sh
  HBaseConfTool moved under util.

Modified:
    hbase/branches/0.90_master_rewrite/bin/rolling-restart.sh
    hbase/branches/0.90_master_rewrite/bin/start-hbase.sh
    hbase/branches/0.90_master_rewrite/bin/stop-hbase.sh
    hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
    hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
    hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
    hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
    hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
    hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
    hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
    hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
    hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java

Modified: hbase/branches/0.90_master_rewrite/bin/rolling-restart.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/bin/rolling-restart.sh?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/bin/rolling-restart.sh (original)
+++ hbase/branches/0.90_master_rewrite/bin/rolling-restart.sh Tue Aug 31 22:16:34 2010
@@ -49,7 +49,7 @@ then
 fi
 
 # quick function to get a value from the HBase config file
-distMode=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool hbase.cluster.distributed`
+distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
 if [ "$distMode" == 'false' ]; then
   "$bin"/hbase-daemon.sh restart master
 else 
@@ -59,9 +59,9 @@ else 
     --hosts "${HBASE_BACKUP_MASTERS}" stop master-backup
 
   # make sure the master znode has been deleted before continuing
-  zparent=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool zookeeper.znode.parent`
+  zparent=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.parent`
   if [ "$zparent" == "null" ]; then zparent="/hbase"; fi
-  zmaster=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool zookeeper.znode.master`
+  zmaster=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.master`
   if [ "$zmaster" == "null" ]; then zmaster="master"; fi
   zmaster=$zparent/$zmaster
   echo -n "Waiting for Master ZNode to expire"
@@ -134,7 +134,7 @@ then
 fi
 
 # quick function to get a value from the HBase config file
-distMode=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool hbase.cluster.distributed`
+distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
 if [ "$distMode" == 'false' ]; then
   "$bin"/hbase-daemon.sh restart master
 else 
@@ -144,9 +144,9 @@ else 
     --hosts "${HBASE_BACKUP_MASTERS}" stop master-backup
 
   # make sure the master znode has been deleted before continuing
-  zparent=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool zookeeper.znode.parent`
+  zparent=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.parent`
   if [ "$zparent" == "null" ]; then zparent="/hbase"; fi
-  zmaster=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool zookeeper.znode.master`
+  zmaster=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool zookeeper.znode.master`
   if [ "$zmaster" == "null" ]; then zmaster="master"; fi
   zmaster=$zparent/$zmaster
   echo -n "Waiting for Master ZNode to expire"

Modified: hbase/branches/0.90_master_rewrite/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/bin/start-hbase.sh?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/bin/start-hbase.sh (original)
+++ hbase/branches/0.90_master_rewrite/bin/start-hbase.sh Tue Aug 31 22:16:34 2010
@@ -38,7 +38,7 @@ then
   exit $errCode
 fi
 
-distMode=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool hbase.cluster.distributed`
+distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
 
 
 if [ "$distMode" == 'false' ] 

Modified: hbase/branches/0.90_master_rewrite/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/bin/stop-hbase.sh?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/bin/stop-hbase.sh (original)
+++ hbase/branches/0.90_master_rewrite/bin/stop-hbase.sh Tue Aug 31 22:16:34 2010
@@ -57,7 +57,7 @@ while kill -0 `cat $pid` > /dev/null 2>&
 done
 
 # distributed == false means that the HMaster will kill ZK when it exits
-distMode=`$bin/hbase org.apache.hadoop.hbase.HBaseConfTool hbase.cluster.distributed`
+distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed`
 if [ "$distMode" == 'true' ] 
 then
   # TODO: store backup masters in ZooKeeper and have the primary send them a shutdown message

Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Tue Aug 31 22:16:34 2010
@@ -1831,7 +1831,7 @@ public class HRegion implements HeapSize
         // Check this edit is for me. Also, guard against writing the special
         // METACOLUMN info such as HBASE::CACHEFLUSH entries
         if (kv.matchingFamily(HLog.METAFAMILY) ||
-            !Bytes.equals(key.getEncodedRegionName(), this.regionInfo.getRegionName())) {
+            !Bytes.equals(key.getEncodedRegionName(), this.regionInfo.getEncodedNameAsBytes()))
{
           skippedEdits++;
           continue;
         }

Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
Tue Aug 31 22:16:34 2010
@@ -291,9 +291,6 @@ public class StoreFile {
    * @return This files maximum edit sequence id.
    */
   public long getMaxSequenceId() {
-    if (this.sequenceid == -1) {
-      throw new IllegalAccessError(this + " has not been initialized");
-    }
     return this.sequenceid;
   }
 
@@ -370,11 +367,9 @@ public class StoreFile {
    * @see #closeReader()
    */
   private Reader open() throws IOException {
-
     if (this.reader != null) {
       throw new IllegalAccessError("Already open");
     }
-
     if (isReference()) {
       this.reader = new HalfStoreFileReader(this.fs, this.referencePath,
           getBlockCache(), this.reference);
@@ -382,7 +377,6 @@ public class StoreFile {
       this.reader = new Reader(this.fs, this.path, getBlockCache(),
           this.inMemory);
     }
-
     // Load up indices and fileinfo.
     metadataMap = Collections.unmodifiableMap(this.reader.loadFileInfo());
     // Read in our metadata.
@@ -409,6 +403,10 @@ public class StoreFile {
       } else {
         this.majorCompaction.set(mc);
       }
+    } else {
+      // Presume it is not major compacted if it doesn't explicity say so
+      // HFileOutputFormat explicitly sets the major compacted key.
+      this.majorCompaction = new AtomicBoolean(false);
     }
 
     if (this.bloomType != BloomType.NONE) {

Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
Tue Aug 31 22:16:34 2010
@@ -134,7 +134,7 @@ public class CloseRegionHandler extends 
    */
   private void setClosedState(final int expectedVersion, final HRegion region) {
     try {
-      if(ZKAssign.transitionNodeClosed(server.getZooKeeper(), regionInfo,
+      if (ZKAssign.transitionNodeClosed(server.getZooKeeper(), regionInfo,
           server.getServerName(), expectedVersion) == FAILED) {
         LOG.warn("Completed the CLOSE of a region but when transitioning from " +
             " CLOSING to CLOSED got a version mismatch, someone else clashed " +
@@ -142,6 +142,9 @@ public class CloseRegionHandler extends 
         region.close();
         return;
       }
+    } catch (NullPointerException e) {
+      // I've seen NPE when table was deleted while close was running in unit tests.
+      LOG.warn("NPE during close -- catching and continuing...", e);
     } catch (KeeperException e) {
       LOG.error("Failed transitioning node from CLOSING to CLOSED", e);
       return;

Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
Tue Aug 31 22:16:34 2010
@@ -47,6 +47,7 @@ import java.util.concurrent.CopyOnWriteA
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -80,7 +81,7 @@ import org.apache.hadoop.hbase.util.Thre
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.util.StringUtils;
 
-import com.google.common.util.concurrent.NamingThreadFactory;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 /**
  * HLog stores all the edits to the HStore.  Its the hbase write-ahead-log
@@ -443,7 +444,7 @@ public class HLog implements Syncable {
    *
    * @return If lots of logs, flush the returned regions so next time through
    * we can clean logs. Returns null if nothing to flush.  Names are actual
-   * region names as returned by {@link HRegionInfo#getRegionName()}
+   * region names as returned by {@link HRegionInfo#getEncodedName()}
    * @throws org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException
    * @throws IOException
    */
@@ -779,7 +780,7 @@ public class HLog implements Syncable {
     final long now,
     final boolean isMetaRegion)
   throws IOException {
-    byte [] regionName = regionInfo.getRegionName();
+    byte [] regionName = regionInfo.getEncodedNameAsBytes();
     byte [] tableName = regionInfo.getTableDesc().getName();
     this.append(regionInfo, makeKey(regionName, tableName, -1, now), logEdit);
   }
@@ -1498,9 +1499,10 @@ public class HLog implements Syncable {
       conf.getInt("hbase.regionserver.hlog.splitlog.writer.threads", 3);
     boolean skipErrors = conf.getBoolean("hbase.skip.errors", false);
     HashMap<byte[], Future> writeFutureResult = new HashMap<byte[], Future>();
-    NamingThreadFactory f  = new NamingThreadFactory(
-            "SplitWriter-%1$d", Executors.defaultThreadFactory());
-    ThreadPoolExecutor threadPool = (ThreadPoolExecutor)Executors.newFixedThreadPool(logWriterThreads,
f);
+    ThreadFactoryBuilder builder = new ThreadFactoryBuilder();
+    builder.setNameFormat("SplitWriter-%1$d");
+    ThreadFactory factory = builder.build();
+    ThreadPoolExecutor threadPool = (ThreadPoolExecutor)Executors.newFixedThreadPool(logWriterThreads,
factory);
     for (final byte [] region : splitLogsMap.keySet()) {
       Callable splitter = createNewSplitter(rootDir, logWriters, splitLogsMap, region, fs,
conf);
       writeFutureResult.put(region, threadPool.submit(splitter));
@@ -1705,7 +1707,7 @@ public class HLog implements Syncable {
     Path tableDir = HTableDescriptor.getTableDir(rootDir,
       logEntry.getKey().getTablename());
     Path regiondir = HRegion.getRegionDir(tableDir,
-      HRegionInfo.encodeRegionName(logEntry.getKey().getEncodedRegionName()));
+      Bytes.toString(logEntry.getKey().getEncodedRegionName()));
     Path dir = getRegionDirRecoveredEditsDir(regiondir);
     if (!fs.exists(dir)) {
       if (!fs.mkdirs(dir)) LOG.warn("mkdir failed on " + dir);

Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
Tue Aug 31 22:16:34 2010
@@ -107,7 +107,6 @@ public class ThriftServer {
       protected Map<String, HTable> initialValue() {
         return new TreeMap<String, HTable>();
       }
-
     };
 
     /**
@@ -186,7 +185,12 @@ public class ThriftServer {
      */
     HBaseHandler()
     throws IOException {
-      conf = HBaseConfiguration.create();
+      this(HBaseConfiguration.create());
+    }
+
+    HBaseHandler(final Configuration c)
+    throws IOException {
+      this.conf = c;
       admin = new HBaseAdmin(conf);
       scannerMap = new HashMap<Integer, ResultScanner>();
     }
@@ -209,7 +213,7 @@ public class ThriftServer {
 
     public boolean isTableEnabled(final byte[] tableName) throws IOError {
       try {
-        return HTable.isTableEnabled(tableName);
+        return HTable.isTableEnabled(this.conf, tableName);
       } catch (IOException e) {
         throw new IOError(e.getMessage());
       }

Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
Tue Aug 31 22:16:34 2010
@@ -112,7 +112,7 @@ public class TestLoadIncrementalHFiles {
       htd.addFamily(new HColumnDescriptor(FAMILY));
       admin.createTable(htd, SPLIT_KEYS);
 
-      HTable table = new HTable(TABLE);
+      HTable table = new HTable(util.getConfiguration(), TABLE);
       util.waitTableAvailable(TABLE, 30000);
       LoadIncrementalHFiles loader = new LoadIncrementalHFiles(
           util.getConfiguration());

Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
Tue Aug 31 22:16:34 2010
@@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.HTableDes
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.io.hfile.HFile;
 import org.apache.hadoop.hbase.io.hfile.HFileScanner;
 import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -161,8 +160,9 @@ public class TestFSErrorsExposed {
           fam, 1, HColumnDescriptor.DEFAULT_COMPRESSION,
           false, false, HConstants.FOREVER, "NONE"));
       admin.createTable(desc);
-
-      HTable table = new HTable(tableName);
+      // Make it fail faster.
+      util.getConfiguration().setInt("hbase.client.retries.number", 1);
+      HTable table = new HTable(util.getConfiguration(), tableName);
 
       // Load some data
       util.loadTable(table, fam);

Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
Tue Aug 31 22:16:34 2010
@@ -328,7 +328,7 @@ public class TestWALReplay {
     HLog wal = createWAL(this.conf);
     final byte[] tableName = Bytes.toBytes(tableNameStr);
     final byte[] rowName = tableName;
-    final byte[] regionName = hri.getRegionName();
+    final byte[] regionName = hri.getEncodedNameAsBytes();
 
     // Add 1k to each family.
     final int countPerFamily = 1000;
@@ -359,7 +359,6 @@ public class TestWALReplay {
     // Set down maximum recovery so we dfsclient doesn't linger retrying something
     // long gone.
     HBaseTestingUtility.setMaxRecoveryErrorCount(wal.getOutputStream(), 1);
-
     // Make a new conf and a new fs for the splitter to run on so we can take
     // over old wal.
     Configuration newConf = HBaseTestingUtility.setDifferentUser(this.conf,

Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java?rev=991365&r1=991364&r2=991365&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
(original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
Tue Aug 31 22:16:34 2010
@@ -72,7 +72,7 @@ public class TestThriftServer extends HB
    * @throws Exception
    */
   public void doTestTableCreateDrop() throws Exception {
-    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler();
+    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler(this.conf);
 
     // Create/enable/disable/delete tables, ensure methods act correctly
     assertEquals(handler.getTableNames().size(), 0);
@@ -103,7 +103,7 @@ public class TestThriftServer extends HB
    */
   public void doTestTableMutations() throws Exception {
     // Setup
-    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler();
+    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler(this.conf);
     handler.createTable(tableAname, getColumnDescriptors());
 
     // Apply a few Mutations to rowA
@@ -167,7 +167,7 @@ public class TestThriftServer extends HB
    */
   public void doTestTableTimestampsAndColumns() throws Exception {
     // Setup
-    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler();
+    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler(this.conf);
     handler.createTable(tableAname, getColumnDescriptors());
 
     // Apply timestamped Mutations to rowA
@@ -245,7 +245,7 @@ public class TestThriftServer extends HB
    */
   public void doTestTableScanners() throws Exception {
     // Setup
-    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler();
+    ThriftServer.HBaseHandler handler = new ThriftServer.HBaseHandler(this.conf);
     handler.createTable(tableAname, getColumnDescriptors());
 
     // Apply timestamped Mutations to rowA



Mime
View raw message