You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2008/02/08 23:56:58 UTC
svn commit: r620024 - in /hadoop/hbase/trunk: bin/ conf/
src/java/org/apache/hadoop/hbase/
src/java/org/apache/hadoop/hbase/generated/master/ src/test/
src/test/org/apache/hadoop/hbase/ src/test/org/apache/hadoop/hbase/master/
src/webapps/master/
Author: stack
Date: Fri Feb 8 14:56:57 2008
New Revision: 620024
URL: http://svn.apache.org/viewvc?rev=620024&view=rev
Log:
HBASE-418 Move HMaster and related classes into master package
Part 3: Missed non-moved file edits.
Modified:
hadoop/hbase/trunk/bin/hbase
hadoop/hbase/trunk/conf/hbase-default.xml
hadoop/hbase/trunk/conf/hbase-site.xml
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HBaseAdmin.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnection.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnectionManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HLog.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegion.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreFile.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
hadoop/hbase/trunk/src/test/hbase-site.xml
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/master/OOMEHMaster.java
hadoop/hbase/trunk/src/webapps/master/master.jsp
Modified: hadoop/hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Fri Feb 8 14:56:57 2008
@@ -160,7 +160,7 @@
if [ "$COMMAND" = "shell" ] ; then
CLASS='org.apache.hadoop.hbase.Shell'
elif [ "$COMMAND" = "master" ] ; then
- CLASS='org.apache.hadoop.hbase.HMaster'
+ CLASS='org.apache.hadoop.hbase.master.HMaster'
elif [ "$COMMAND" = "regionserver" ] ; then
CLASS='org.apache.hadoop.hbase.HRegionServer'
elif [ "$COMMAND" = "rest" ] ; then
Modified: hadoop/hbase/trunk/conf/hbase-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/conf/hbase-default.xml?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/conf/hbase-default.xml (original)
+++ hadoop/hbase/trunk/conf/hbase-default.xml Fri Feb 8 14:56:57 2008
@@ -31,6 +31,13 @@
</description>
</property>
<property>
+ <name>hbase.rootdir</name>
+ <value>file:///${hadoop.tmp.dir}/hbase</value>
+ <description>The directory shared by region servers.
+ Should be fully-qualified to include the filesystem.
+ </description>
+ </property>
+ <property>
<name>hbase.master.info.port</name>
<value>60010</value>
<description>The port for the hbase master web UI
@@ -67,12 +74,6 @@
<value>org.apache.hadoop.hbase.HRegionInterface</value>
<description>An interface that is assignable to HRegionInterface. Used in HClient for
opening proxy to remote region server.
- </description>
- </property>
- <property>
- <name>hbase.rootdir</name>
- <value>${hadoop.tmp.dir}/hbase</value>
- <description>The directory shared by region servers.
</description>
</property>
<property>
Modified: hadoop/hbase/trunk/conf/hbase-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/conf/hbase-site.xml?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/conf/hbase-site.xml (original)
+++ hadoop/hbase/trunk/conf/hbase-site.xml Fri Feb 8 14:56:57 2008
@@ -22,4 +22,10 @@
*/
-->
<configuration>
+ <property>
+ <name>hbase.rootdir</name>
+ <value>${hadoop.tmp.dir}/hbase</value>
+ <description>The directory shared by region servers.
+ </description>
+ </property>
</configuration>
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HBaseAdmin.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HBaseAdmin.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HBaseAdmin.java Fri Feb 8 14:56:57 2008
@@ -31,6 +31,7 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.hbase.master.HMasterInterface;
/**
* Provides administrative functions for HBase
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnection.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnection.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnection.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnection.java Fri Feb 8 14:56:57 2008
@@ -23,6 +23,7 @@
import java.util.SortedMap;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.hbase.master.HMasterInterface;
/**
*
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnectionManager.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnectionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HConnectionManager.java Fri Feb 8 14:56:57 2008
@@ -40,6 +40,7 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.ipc.RemoteException;
+import org.apache.hadoop.hbase.master.HMasterInterface;
/**
* A non-instantiable class that manages connections to multiple tables in
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HLog.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HLog.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HLog.java Fri Feb 8 14:56:57 2008
@@ -494,7 +494,7 @@
* @param conf HBaseConfiguration
* @throws IOException
*/
- static void splitLog(Path rootDir, Path srcDir, FileSystem fs,
+ public static void splitLog(Path rootDir, Path srcDir, FileSystem fs,
Configuration conf) throws IOException {
Path logfiles[] = fs.listPaths(new Path[] { srcDir });
LOG.info("splitting " + logfiles.length + " log(s) in " +
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegion.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegion.java Fri Feb 8 14:56:57 2008
@@ -1788,7 +1788,7 @@
*
* @throws IOException
*/
- static HRegion createHRegion(final HRegionInfo info, final Path rootDir,
+ public static HRegion createHRegion(final HRegionInfo info, final Path rootDir,
final HBaseConfiguration conf) throws IOException {
Path tableDir =
HTableDescriptor.getTableDir(rootDir, info.getTableDesc().getName());
@@ -1811,7 +1811,8 @@
* @throws IOException
* @see {@link #removeRegionFromMETA(HRegion, HRegion)}
*/
- static void addRegionToMETA(HRegion meta, HRegion r) throws IOException {
+ public static void addRegionToMETA(HRegion meta, HRegion r)
+ throws IOException {
meta.checkResources();
// The row key is the region name
Text row = r.getRegionName();
@@ -1839,7 +1840,7 @@
* @throws IOException
* @see {@link #addRegionToMETA(HRegion, HRegion)}
*/
- static void removeRegionFromMETA(final HRegionInterface srvr,
+ public static void removeRegionFromMETA(final HRegionInterface srvr,
final Text metaRegionName, final Text regionName)
throws IOException {
srvr.deleteAll(metaRegionName, regionName, HConstants.LATEST_TIMESTAMP);
@@ -1854,7 +1855,7 @@
* @throws IOException
* @see {@link #addRegionToMETA(HRegion, HRegion)}
*/
- static void offlineRegionInMETA(final HRegionInterface srvr,
+ public static void offlineRegionInMETA(final HRegionInterface srvr,
final Text metaRegionName, final HRegionInfo info)
throws IOException {
BatchUpdate b = new BatchUpdate(info.getRegionName());
@@ -1876,7 +1877,8 @@
* @throws IOException
* @return True if deleted.
*/
- static boolean deleteRegion(FileSystem fs, Path rootdir, HRegionInfo info)
+ public static boolean deleteRegion(FileSystem fs, Path rootdir,
+ HRegionInfo info)
throws IOException {
Path p = HRegion.getRegionDir(rootdir, info);
if (LOG.isDebugEnabled()) {
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HRegionServer.java Fri Feb 8 14:56:57 2008
@@ -66,6 +66,7 @@
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.net.DNS;
import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.hbase.master.HMasterRegionInterface;
/**
* HRegionServer makes a set of HRegions available to clients. It checks in with
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreFile.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreFile.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreFile.java Fri Feb 8 14:56:57 2008
@@ -521,19 +521,19 @@
((encodedRegionName != null) ? "." + encodedRegionName : "");
}
- static Path getMapDir(Path dir, String encodedRegionName, Text colFamily) {
+ public static Path getMapDir(Path dir, String encodedRegionName, Text colFamily) {
return new Path(dir, new Path(encodedRegionName,
new Path(colFamily.toString(), HSTORE_DATFILE_DIR)));
}
/** @return the info directory path */
- static Path getInfoDir(Path dir, String encodedRegionName, Text colFamily) {
+ public static Path getInfoDir(Path dir, String encodedRegionName, Text colFamily) {
return new Path(dir, new Path(encodedRegionName,
new Path(colFamily.toString(), HSTORE_INFO_DIR)));
}
/** @return the bloom filter directory path */
- static Path getFilterDir(Path dir, String encodedRegionName, Text colFamily) {
+ public static Path getFilterDir(Path dir, String encodedRegionName, Text colFamily) {
return new Path(dir, new Path(encodedRegionName,
new Path(colFamily.toString(), HSTORE_FILTER_DIR)));
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java Fri Feb 8 14:56:57 2008
@@ -29,6 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.hbase.master.HMaster;
/**
* This class creates a single process HBase cluster. One thread is created for
@@ -268,7 +269,7 @@
* @return The passed <code>c</code> configuration modified if hbase.master
* value was 'local' otherwise, unaltered.
*/
- static HBaseConfiguration doLocal(final HBaseConfiguration c) {
+ public static HBaseConfiguration doLocal(final HBaseConfiguration c) {
if (!isLocal(c)) {
return c;
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java Fri Feb 8 14:56:57 2008
@@ -6,9 +6,9 @@
import java.util.*;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.util.VersionInfo;
-import org.apache.hadoop.hbase.HMaster;
+import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HMaster.MetaRegion;
+import org.apache.hadoop.hbase.master.HMaster.MetaRegion;
import org.apache.hadoop.hbase.HBaseAdmin;
import org.apache.hadoop.hbase.HServerInfo;
import org.apache.hadoop.hbase.HServerAddress;
Modified: hadoop/hbase/trunk/src/test/hbase-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/hbase-site.xml?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/hbase-site.xml (original)
+++ hadoop/hbase/trunk/src/test/hbase-site.xml Fri Feb 8 14:56:57 2008
@@ -23,13 +23,6 @@
-->
<configuration>
<property>
- <name>fs.default.name</name>
- <value></value>
- <description>Use hdfs as file system by default. Modify this to run on
- local file system.
- </description>
- </property>
- <property>
<name>hbase.regionserver.msginterval</name>
<value>1000</value>
<description>Interval between messages from the RegionServer to HMaster
@@ -106,8 +99,9 @@
</property>
<property>
<name>hbase.rootdir</name>
- <value>/hbase</value>
- <description>location of HBase instance in dfs</description>
+ <value>hdfs://localhost:42273/hbase</value>
+ <description>Location of HBase test hbase instance (42273 is hbase
+ on a telephone pad)</description>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java Fri Feb 8 14:56:57 2008
@@ -29,6 +29,7 @@
import org.apache.log4j.Logger;
import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.hbase.master.HMaster;
/**
* This class creates a single process HBase cluster. One thread is created for
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestInfoServers.java Fri Feb 8 14:56:57 2008
@@ -58,7 +58,7 @@
a.createTable(new HTableDescriptor(getName()));
assertTrue(a.tableExists(new Text(getName())));
try {
- int port = miniHbase.getMaster().infoServer.getPort();
+ int port = miniHbase.getMaster().getInfoServer().getPort();
assertHasExpectedContent(new URL("http://localhost:" + port +
"/index.html"), "Master");
port = miniHbase.getRegionThreads().get(0).getRegionServer().
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/master/OOMEHMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/master/OOMEHMaster.java?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/master/OOMEHMaster.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/master/OOMEHMaster.java Fri Feb 8 14:56:57 2008
@@ -17,13 +17,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hbase;
+package org.apache.hadoop.hbase.master;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.HServerAddress;
+import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.HMsg;
/**
* An HMaster that runs out of memory.
Modified: hadoop/hbase/trunk/src/webapps/master/master.jsp
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/webapps/master/master.jsp?rev=620024&r1=620023&r2=620024&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/webapps/master/master.jsp (original)
+++ hadoop/hbase/trunk/src/webapps/master/master.jsp Fri Feb 8 14:56:57 2008
@@ -2,9 +2,9 @@
import="java.util.*"
import="org.apache.hadoop.io.Text"
import="org.apache.hadoop.util.VersionInfo"
- import="org.apache.hadoop.hbase.HMaster"
- import="org.apache.hadoop.hbase.HConstants"
- import="org.apache.hadoop.hbase.HMaster.MetaRegion"
+ import="org.apache.hadoop.hbase.master.HMaster"
+ import="org.apache.hadoop.hbase.HConstants"
+ import="org.apache.hadoop.hbase.master.HMaster.MetaRegion"
import="org.apache.hadoop.hbase.HBaseAdmin"
import="org.apache.hadoop.hbase.HServerInfo"
import="org.apache.hadoop.hbase.HServerAddress"
@@ -12,7 +12,7 @@
import="org.apache.hadoop.hbase.HBaseConfiguration"
import="org.apache.hadoop.hbase.hql.ShowCommand"
import="org.apache.hadoop.hbase.hql.TableFormatter"
- import="org.apache.hadoop.hbase.hql.ReturnMsg"
+ import="org.apache.hadoop.hbase.hql.ReturnMsg"
import="org.apache.hadoop.hbase.hql.formatter.HtmlTableFormatter"
import="org.apache.hadoop.hbase.HTableDescriptor" %><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);