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:50:37 UTC
svn commit: r620022 - in
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master: HMaster.java
HMasterInterface.java HMasterRegionInterface.java
Author: stack
Date: Fri Feb 8 14:50:35 2008
New Revision: 620022
URL: http://svn.apache.org/viewvc?rev=620022&view=rev
Log:
HBASE-418 Move HMaster and related classes into master package
Part 2 (Previous patch moved these classes but turns out new version
also had changes in them -- adding these now).
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterInterface.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterRegionInterface.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=620022&r1=620021&r2=620022&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Fri Feb 8 14:50:35 2008
@@ -17,7 +17,7 @@
* 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.io.UnsupportedEncodingException;
@@ -64,6 +64,33 @@
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.ipc.Server;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.Leases;
+import org.apache.hadoop.hbase.HServerAddress;
+import org.apache.hadoop.hbase.HConnection;
+import org.apache.hadoop.hbase.HConnectionManager;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.Chore;
+import org.apache.hadoop.hbase.HRegionInterface;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HServerLoad;
+import org.apache.hadoop.hbase.HRegion;
+import org.apache.hadoop.hbase.RemoteExceptionHandler;
+import org.apache.hadoop.hbase.HMsg;
+import org.apache.hadoop.hbase.HBaseAdmin;
+import org.apache.hadoop.hbase.LocalHBaseCluster;
+import org.apache.hadoop.hbase.HStoreKey;
+import org.apache.hadoop.hbase.HStoreFile;
+import org.apache.hadoop.hbase.HStore;
+import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.TableExistsException;
+import org.apache.hadoop.hbase.TableNotDisabledException;
+import org.apache.hadoop.hbase.MasterNotRunningException;
+import org.apache.hadoop.hbase.UnknownScannerException;
+import org.apache.hadoop.hbase.LeaseListener;
+import org.apache.hadoop.hbase.HLog;
/**
* HMaster is the "master server" for a HBase.
@@ -133,6 +160,10 @@
/** Name of master server */
public static final String MASTER = "master";
+ public InfoServer getInfoServer() {
+ return infoServer;
+ }
+
/**
* Base HRegion scanner class. Holds utilty common to <code>ROOT</code> and
* <code>META</code> HRegion scanners.
@@ -2574,7 +2605,7 @@
BatchUpdate b = new BatchUpdate(regionName);
b.put(COL_REGIONINFO, Writables.getBytes(info));
server.batchUpdate(metaRegionName, b);
-
+
// 4. Close the new region to flush it to disk. Close its log file too.
region.close();
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterInterface.java?rev=620022&r1=620021&r2=620022&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterInterface.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterInterface.java Fri Feb 8 14:50:35 2008
@@ -17,10 +17,13 @@
* 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 org.apache.hadoop.io.Text;
import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HServerAddress;
import java.io.IOException;
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterRegionInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterRegionInterface.java?rev=620022&r1=620021&r2=620022&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterRegionInterface.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMasterRegionInterface.java Fri Feb 8 14:50:35 2008
@@ -17,12 +17,14 @@
* 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 org.apache.hadoop.hbase.io.HbaseMapWritable;
import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.HMsg;
/**
* HRegionServers interact with the HMasterRegionInterface to report on local