You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2012/09/01 10:11:37 UTC
svn commit: r1379715 - in /hbase/trunk/hbase-server/src/test:
java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java
resources/hbase-site.xml
Author: nkeywal
Date: Sat Sep 1 08:11:36 2012
New Revision: 1379715
URL: http://svn.apache.org/viewvc?rev=1379715&view=rev
Log:
HBASE-6697 regionserver.TestPriorityRpc uses a fixed port (60020)
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java
hbase/trunk/hbase-server/src/test/resources/hbase-site.xml
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java?rev=1379715&r1=1379714&r2=1379715&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java Sat Sep 1 08:11:36 2012
@@ -25,9 +25,10 @@ import static org.junit.Assert.*;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest;
@@ -45,14 +46,15 @@ import com.google.protobuf.ByteString;
/**
* Tests that verify certain RPCs get a higher QoS.
*/
-@Category(SmallTests.class)
+@Category(MediumTests.class)
public class TestPriorityRpc {
static HRegionServer regionServer = null;
static QosFunction qosFunction = null;
@BeforeClass
public static void onetimeSetup() {
+ Configuration conf = HBaseConfiguration.create();
regionServer =
- HRegionServer.constructRegionServer(HRegionServer.class, new Configuration());
+ HRegionServer.constructRegionServer(HRegionServer.class, conf);
qosFunction = regionServer.getQosFunction();
}
@Test
Modified: hbase/trunk/hbase-server/src/test/resources/hbase-site.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/resources/hbase-site.xml?rev=1379715&r1=1379714&r2=1379715&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/resources/hbase-site.xml (original)
+++ hbase/trunk/hbase-server/src/test/resources/hbase-site.xml Sat Sep 1 08:11:36 2012
@@ -78,6 +78,21 @@
</description>
</property>
<property>
+ <name>hbase.master.port</name>
+ <value>0</value>
+ <description>Always have masters and regionservers come up on port '0' so we don't clash over
+ default ports.
+ </description>
+ </property>
+ <property>
+ <name>hbase.regionserver.port</name>
+ <value>0</value>
+ <description>Always have masters and regionservers come up on port '0' so we don't clash over
+ default ports.
+ </description>
+ </property>
+
+ <property>
<name>hbase.regionserver.info.port</name>
<value>-1</value>
<description>The port for the hbase regionserver web UI