hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1520463 [2/4] - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apac...
Date Fri, 06 Sep 2013 00:29:50 GMT
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Fri Sep  6 00:29:48 2013
@@ -826,7 +826,7 @@ MasterServices, Server {
     }
 
     // get a list for previously failed RS which need log splitting work
-    // we recover .META. region servers inside master initialization and
+    // we recover hbase:meta region servers inside master initialization and
     // handle other failed servers in SSH in order to start up master node ASAP
     Set<ServerName> previouslyFailedServers = this.fileSystemManager
         .getFailedServersFromLogFolders();
@@ -834,7 +834,7 @@ MasterServices, Server {
     // remove stale recovering regions from previous run
     this.fileSystemManager.removeStaleRecoveringRegionsFromZK(previouslyFailedServers);
 
-    // log splitting for .META. server
+    // log splitting for hbase:meta server
     ServerName oldMetaServerLocation = this.catalogTracker.getMetaLocation();
     if (oldMetaServerLocation != null && previouslyFailedServers.contains(oldMetaServerLocation)) {
       splitMetaLogBeforeAssignment(oldMetaServerLocation);
@@ -853,20 +853,20 @@ MasterServices, Server {
     // Make sure meta assigned before proceeding.
     status.setStatus("Assigning Meta Region");
     assignMeta(status);
-    // check if master is shutting down because above assignMeta could return even META isn't
+    // check if master is shutting down because above assignMeta could return even hbase:meta isn't
     // assigned when master is shutting down
     if(this.stopped) return;
 
     if (this.distributedLogReplay && (!previouslyFailedMetaRSs.isEmpty())) {
-      // replay WAL edits mode need new .META. RS is assigned firstly
+      // replay WAL edits mode need new hbase:meta RS is assigned firstly
       status.setStatus("replaying log for Meta Region");
       // need to use union of previouslyFailedMetaRSs recorded in ZK and previouslyFailedServers
       // instead of oldMetaServerLocation to address the following two situations:
       // 1) the chained failure situation(recovery failed multiple times in a row).
-      // 2) master get killed right before it could delete the recovering META from ZK while the
+      // 2) master get killed right before it could delete the recovering hbase:meta from ZK while the
       // same server still has non-meta wals to be replayed so that
-      // removeStaleRecoveringRegionsFromZK can't delete the stale META region
-      // Passing more servers into splitMetaLog is all right. If a server doesn't have .META. wal,
+      // removeStaleRecoveringRegionsFromZK can't delete the stale hbase:meta region
+      // Passing more servers into splitMetaLog is all right. If a server doesn't have hbase:meta wal,
       // there is no op for the server.
       previouslyFailedMetaRSs.addAll(previouslyFailedServers);
       this.fileSystemManager.splitMetaLog(previouslyFailedMetaRSs);
@@ -879,7 +879,7 @@ MasterServices, Server {
     enableServerShutdownHandler();
 
     status.setStatus("Submitting log splitting work for previously failed region servers");
-    // Master has recovered META region server and we put
+    // Master has recovered hbase:meta region server and we put
     // other failed region servers in a queue to be handled later by SSH
     for (ServerName tmpServer : previouslyFailedServers) {
       this.serverManager.processDeadServer(tmpServer, true);
@@ -974,7 +974,7 @@ MasterServices, Server {
   }
 
   /**
-   * Check <code>.META.</code> is assigned. If not, assign it.
+   * Check <code>hbase:meta</code> is assigned. If not, assign it.
    * @param status MonitoredTask
    * @throws InterruptedException
    * @throws IOException
@@ -987,7 +987,7 @@ MasterServices, Server {
     long timeout = this.conf.getLong("hbase.catalog.verification.timeout", 1000);
     boolean beingExpired = false;
 
-    status.setStatus("Assigning META region");
+    status.setStatus("Assigning hbase:meta region");
 
     assignmentManager.getRegionStates().createRegionState(HRegionInfo.FIRST_META_REGIONINFO);
     boolean rit = this.assignmentManager
@@ -1002,15 +1002,15 @@ MasterServices, Server {
         splitMetaLogBeforeAssignment(currentMetaServer);
       }
       assignmentManager.assignMeta();
-      // Make sure a .META. location is set.
+      // Make sure a hbase:meta location is set.
       enableSSHandWaitForMeta();
       assigned++;
       if (beingExpired && this.distributedLogReplay) {
-        // In Replay WAL Mode, we need the new .META. server online
+        // In Replay WAL Mode, we need the new hbase:meta server online
         this.fileSystemManager.splitMetaLog(currentMetaServer);
       }
     } else if (rit && !metaRegionLocation) {
-      // Make sure a .META. location is set.
+      // Make sure a hbase:meta location is set.
       enableSSHandWaitForMeta();
       assigned++;
     } else {
@@ -1020,19 +1020,19 @@ MasterServices, Server {
     }
 
     enableMeta(TableName.META_TABLE_NAME);
-    LOG.info(".META. assigned=" + assigned + ", rit=" + rit +
+    LOG.info("hbase:meta assigned=" + assigned + ", rit=" + rit +
       ", location=" + catalogTracker.getMetaLocation());
     status.setStatus("META assigned.");
   }
 
   private void splitMetaLogBeforeAssignment(ServerName currentMetaServer) throws IOException {
     if (this.distributedLogReplay) {
-      // In log replay mode, we mark META region as recovering in ZK
+      // In log replay mode, we mark hbase:meta region as recovering in ZK
       Set<HRegionInfo> regions = new HashSet<HRegionInfo>();
       regions.add(HRegionInfo.FIRST_META_REGIONINFO);
       this.fileSystemManager.prepareLogReplay(currentMetaServer, regions);
     } else {
-      // In recovered.edits mode: create recovered edits file for .META. server
+      // In recovered.edits mode: create recovered edits file for hbase:meta server
       this.fileSystemManager.splitMetaLog(currentMetaServer);
     }
   }
@@ -1054,7 +1054,7 @@ MasterServices, Server {
     // See HBASE-6281.
     Set<TableName> disabledOrDisablingOrEnabling = ZKTable.getDisabledOrDisablingTables(zooKeeper);
     disabledOrDisablingOrEnabling.addAll(ZKTable.getEnablingTables(zooKeeper));
-    // Scan META for all system regions, skipping any disabled tables
+    // Scan hbase:meta for all system regions, skipping any disabled tables
     Map<HRegionInfo, ServerName> allRegions =
         MetaReader.fullScan(catalogTracker, disabledOrDisablingOrEnabling, true);
     for(Iterator<HRegionInfo> iter = allRegions.keySet().iterator();
@@ -1172,7 +1172,7 @@ MasterServices, Server {
   }
 
   /**
-   * This function returns a set of region server names under .META. recovering region ZK node
+   * This function returns a set of region server names under hbase:meta recovering region ZK node
    * @return Set of meta server names which were recorded in ZK
    * @throws KeeperException
    */
@@ -2454,7 +2454,7 @@ MasterServices, Server {
         this.activeMasterManager.clusterHasActiveMaster.notifyAll();
       }
     }
-    // If no region server is online then master may stuck waiting on .META. to come on line.
+    // If no region server is online then master may stuck waiting on hbase:meta to come on line.
     // See HBASE-8422.
     if (this.catalogTracker != null && this.serverManager.getOnlineServers().isEmpty()) {
       this.catalogTracker.stop();
@@ -2512,7 +2512,7 @@ MasterServices, Server {
 
   /**
    * Report whether this master has started initialization and is about to do meta region assignment
-   * @return true if master is in initialization & about to assign META regions
+   * @return true if master is in initialization & about to assign hbase:meta regions
    */
   public boolean isInitializationStartsMetaRegionAssignment() {
     return this.initializationBeforeMetaAssignment;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java Fri Sep  6 00:29:48 2013
@@ -135,7 +135,7 @@ public class MasterFileSystem {
    * Create initial layout in filesystem.
    * <ol>
    * <li>Check if the meta region exists and is readable, if not create it.
-   * Create hbase.version and the .META. directory if not one.
+   * Create hbase.version and the hbase:meta directory if not one.
    * </li>
    * <li>Create a log archive directory for RS to put archived logs</li>
    * </ol>
@@ -482,7 +482,7 @@ public class MasterFileSystem {
         .migrateFSTableDescriptorsIfNecessary(fs, rd);
     }
       
-    // Create tableinfo-s for META if not already there.
+    // Create tableinfo-s for hbase:meta if not already there.
     new FSTableDescriptors(fs, rd).createTableDescriptor(HTableDescriptor.META_TABLEDESC);
 
     return rd;
@@ -516,7 +516,7 @@ public class MasterFileSystem {
 
   private static void bootstrap(final Path rd, final Configuration c)
   throws IOException {
-    LOG.info("BOOTSTRAP: creating META region");
+    LOG.info("BOOTSTRAP: creating hbase:meta region");
     try {
       // Bootstrapping, make sure blockcache is off.  Else, one will be
       // created here in bootstrap and it'll need to be cleaned up.  Better to
@@ -536,7 +536,7 @@ public class MasterFileSystem {
   }
 
   /**
-   * Enable in memory caching for .META.
+   * Enable in memory caching for hbase:meta
    */
   public static void setInfoFamilyCachingForMeta(final boolean b) {
     for (HColumnDescriptor hcd:

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java Fri Sep  6 00:29:48 2013
@@ -631,20 +631,20 @@ public class RegionPlacementMaintainer {
   }
 
   /**
-   * Update the assignment plan into .META.
-   * @param plan the assignments plan to be updated into .META.
-   * @throws IOException if cannot update assignment plan in .META.
+   * Update the assignment plan into hbase:meta
+   * @param plan the assignments plan to be updated into hbase:meta
+   * @throws IOException if cannot update assignment plan in hbase:meta
    */
   public void updateAssignmentPlanToMeta(FavoredNodesPlan plan)
   throws IOException {
     try {
-      LOG.info("Start to update the META with the new assignment plan");
+      LOG.info("Start to update the hbase:meta with the new assignment plan");
       Map<HRegionInfo, List<ServerName>> assignmentMap =
         plan.getAssignmentMap();
       FavoredNodeAssignmentHelper.updateMetaWithFavoredNodesInfo(assignmentMap, conf);
-      LOG.info("Updated the META with the new assignment plan");
+      LOG.info("Updated the hbase:meta with the new assignment plan");
     } catch (Exception e) {
-      LOG.error("Failed to update META with the new assignment" +
+      LOG.error("Failed to update hbase:meta with the new assignment" +
           "plan because " + e.getMessage());
     }
   }
@@ -727,13 +727,13 @@ public class RegionPlacementMaintainer {
 
   public void updateAssignmentPlan(FavoredNodesPlan plan)
       throws IOException {
-    LOG.info("Start to update the new assignment plan for the META table and" +
+    LOG.info("Start to update the new assignment plan for the hbase:meta table and" +
         " the region servers");
     // Update the new assignment plan to META
     updateAssignmentPlanToMeta(plan);
     // Update the new assignment plan to Region Servers
     updateAssignmentPlanToRegionServers(plan);
-    LOG.info("Finish to update the new assignment plan for the META table and" +
+    LOG.info("Finish to update the new assignment plan for the hbase:meta table and" +
         " the region servers");
   }
 
@@ -950,9 +950,9 @@ public class RegionPlacementMaintainer {
 
   public static void main(String args[]) throws IOException {
     Options opt = new Options();
-    opt.addOption("w", "write", false, "write the assignments to META only");
+    opt.addOption("w", "write", false, "write the assignments to hbase:meta only");
     opt.addOption("u", "update", false,
-        "update the assignments to META and RegionServers together");
+        "update the assignments to hbase:meta and RegionServers together");
     opt.addOption("n", "dry-run", false, "do not write assignments to META");
     opt.addOption("v", "verify", false, "verify current assignments against META");
     opt.addOption("p", "print", false, "print the current assignment plan in META");
@@ -1047,7 +1047,7 @@ public class RegionPlacementMaintainer {
         // Verify the region placement.
         rp.verifyRegionPlacement(verificationDetails);
       } else if (cmd.hasOption("n") || cmd.hasOption("dry-run")) {
-        // Generate the assignment plan only without updating the META and RS
+        // Generate the assignment plan only without updating the hbase:meta and RS
         FavoredNodesPlan plan = rp.getNewAssignmentPlan();
         printAssignmentPlan(plan);
       } else if (cmd.hasOption("w") || cmd.hasOption("write")) {
@@ -1062,7 +1062,7 @@ public class RegionPlacementMaintainer {
         FavoredNodesPlan plan = rp.getNewAssignmentPlan();
         // Print the new assignment plan
         printAssignmentPlan(plan);
-        // Update the assignment to META and Region Servers
+        // Update the assignment to hbase:meta and Region Servers
         rp.updateAssignmentPlan(plan);
       } else if (cmd.hasOption("diff")) {
         FavoredNodesPlan newPlan = rp.getNewAssignmentPlan();

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java Fri Sep  6 00:29:48 2013
@@ -413,7 +413,7 @@ public class RegionStates {
 
   /**
    * Gets the online regions of the specified table.
-   * This method looks at the in-memory state.  It does not go to <code>.META.</code>.
+   * This method looks at the in-memory state.  It does not go to <code>hbase:meta</code>.
    * Only returns <em>online</em> regions.  If a region on this table has been
    * closed during a disable, etc., it will be included in the returned list.
    * So, the returned list may not necessarily be ALL regions in this table, its
@@ -562,7 +562,7 @@ public class RegionStates {
   }
 
   /**
-   * Get the HRegionInfo from cache, if not there, from the META table
+   * Get the HRegionInfo from cache, if not there, from the hbase:meta table
    * @param  regionName
    * @return HRegionInfo for the region
    */
@@ -583,7 +583,7 @@ public class RegionStates {
       return hri;
     } catch (IOException e) {
       server.abort("Aborting because error occoured while reading "
-        + Bytes.toStringBinary(regionName) + " from .META.", e);
+        + Bytes.toStringBinary(regionName) + " from hbase:meta", e);
       return null;
     }
   }

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java Fri Sep  6 00:29:48 2013
@@ -66,7 +66,7 @@ public class SnapshotOfRegionAssignmentF
 
   /** the regionServer to region map */
   private final Map<ServerName, List<HRegionInfo>> regionServerToRegionMap;
-  /** the existing assignment plan in the META region */
+  /** the existing assignment plan in the hbase:meta region */
   private final FavoredNodesPlan existingAssignmentPlan;
   private final Set<TableName> disabledTables;
   private final boolean excludeOfflinedSplitParents;
@@ -88,11 +88,11 @@ public class SnapshotOfRegionAssignmentF
   }
 
   /**
-   * Initialize the region assignment snapshot by scanning the META table
+   * Initialize the region assignment snapshot by scanning the hbase:meta table
    * @throws IOException
    */
   public void initialize() throws IOException {
-    LOG.info("Start to scan the META for the current region assignment " +
+    LOG.info("Start to scan the hbase:meta for the current region assignment " +
 		"snappshot");
     // TODO: at some point this code could live in the MetaReader
     Visitor v = new Visitor() {
@@ -132,10 +132,10 @@ public class SnapshotOfRegionAssignmentF
         }
       }
     };
-    // Scan .META. to pick up user regions
+    // Scan hbase:meta to pick up user regions
     MetaReader.fullScan(tracker, v);
     //regionToRegionServerMap = regions;
-    LOG.info("Finished to scan the META for the current region assignment" +
+    LOG.info("Finished to scan the hbase:meta for the current region assignment" +
       "snapshot");
   }
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java Fri Sep  6 00:29:48 2013
@@ -307,7 +307,7 @@ public class SplitLogManager extends Zoo
   }
 
   /**
-   * The caller will block until all the META log files of the given region server
+   * The caller will block until all the hbase:meta log files of the given region server
    * have been processed - successfully split or an error is encountered - by an
    * available worker region server. This method must only be called after the
    * region servers have been brought online.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java Fri Sep  6 00:29:48 2013
@@ -672,9 +672,9 @@ public class StochasticLoadBalancer exte
         return 1000000;   // return a number much greater than any of the other cost
       }
 
-      // META region is special
+      // hbase:meta region is special
       if (cluster.numMovedMetaRegions > 0) {
-        // assume each META region move costs 10 times
+        // assume each hbase:meta region move costs 10 times
         moveCost += META_MOVE_COST_MULT * cluster.numMovedMetaRegions;
       }
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java Fri Sep  6 00:29:48 2013
@@ -86,7 +86,7 @@ public class ClosedRegionHandler extends
     }
     return getClass().getSimpleName() + "-" + name + "-" + getSeqid();
   }
-  
+
   @Override
   public void process() {
     LOG.debug("Handling CLOSED event for " + regionInfo.getEncodedName());

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java Fri Sep  6 00:29:48 2013
@@ -86,7 +86,7 @@ public class CreateTableHandler extends 
   public CreateTableHandler prepare()
       throws NotAllMetaRegionsOnlineException, TableExistsException, IOException {
     int timeout = conf.getInt("hbase.client.catalog.timeout", 10000);
-    // Need META availability to create a table
+    // Need hbase:meta availability to create a table
     try {
       if(catalogTracker.waitForMeta(timeout) == null) {
         throw new NotAllMetaRegionsOnlineException();
@@ -109,7 +109,7 @@ public class CreateTableHandler extends 
 
       // If we have multiple client threads trying to create the table at the
       // same time, given the async nature of the operation, the table
-      // could be in a state where .META. table hasn't been updated yet in
+      // could be in a state where hbase:meta table hasn't been updated yet in
       // the process() function.
       // Use enabling state to tell if there is already a request for the same
       // table in progress. This will introduce a new zookeeper call. Given
@@ -267,7 +267,7 @@ public class CreateTableHandler extends 
   }
 
   /**
-   * Add the specified set of regions to the META table.
+   * Add the specified set of regions to the hbase:meta table.
    */
   protected void addRegionsToMeta(final CatalogTracker ct, final List<HRegionInfo> regionInfos)
       throws IOException {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java Fri Sep  6 00:29:48 2013
@@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.master.Ma
 import org.apache.zookeeper.KeeperException;
 
 /**
- * Shutdown handler for the server hosting <code>.META.</code>
+ * Shutdown handler for the server hosting <code>hbase:meta</code>
  */
 @InterfaceAudience.Private
 public class MetaServerShutdownHandler extends ServerShutdownHandler {
@@ -56,7 +56,7 @@ public class MetaServerShutdownHandler e
       AssignmentManager am = this.services.getAssignmentManager();
       try {
         if (this.shouldSplitHlog) {
-          LOG.info("Splitting META logs for " + serverName);
+          LOG.info("Splitting hbase:meta logs for " + serverName);
           if (this.distributedLogReplay) {
             Set<HRegionInfo> regions = new HashSet<HRegionInfo>();
             regions.add(HRegionInfo.FIRST_META_REGIONINFO);
@@ -125,12 +125,12 @@ public class MetaServerShutdownHandler e
   }
 
   /**
-   * Before assign the META region, ensure it haven't
+   * Before assign the hbase:meta region, ensure it haven't
    *  been assigned by other place
    * <p>
-   * Under some scenarios, the META region can be opened twice, so it seemed online
+   * Under some scenarios, the hbase:meta region can be opened twice, so it seemed online
    * in two regionserver at the same time.
-   * If the META region has been assigned, so the operation can be canceled.
+   * If the hbase:meta region has been assigned, so the operation can be canceled.
    * @throws InterruptedException
    * @throws IOException
    * @throws KeeperException
@@ -142,10 +142,10 @@ public class MetaServerShutdownHandler e
     if (!this.server.getCatalogTracker().verifyMetaRegionLocation(timeout)) {
       this.services.getAssignmentManager().assignMeta();
     } else if (serverName.equals(server.getCatalogTracker().getMetaLocation())) {
-      throw new IOException(".META. is onlined on the dead server "
+      throw new IOException("hbase:meta is onlined on the dead server "
           + serverName);
     } else {
-      LOG.info("Skip assigning .META., because it is online on the "
+      LOG.info("Skip assigning hbase:meta, because it is online on the "
           + server.getCatalogTracker().getMetaLocation());
     }
   }

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java Fri Sep  6 00:29:48 2013
@@ -86,7 +86,7 @@ public class OpenedRegionHandler extends
   public HRegionInfo getHRegionInfo() {
     return this.regionInfo;
   }
-  
+
   @Override
   public String toString() {
     String name = "UnknownServerName";

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Fri Sep  6 00:29:48 2013
@@ -99,7 +99,7 @@ public class ServerShutdownHandler exten
   }
 
   /**
-   * @return True if the server we are processing was carrying <code>.META.</code>
+   * @return True if the server we are processing was carrying <code>hbase:meta</code>
    */
   boolean isCarryingMeta() {
     return false;
@@ -121,16 +121,16 @@ public class ServerShutdownHandler exten
     try {
 
       // We don't want worker thread in the MetaServerShutdownHandler
-      // executor pool to block by waiting availability of .META.
+      // executor pool to block by waiting availability of hbase:meta
       // Otherwise, it could run into the following issue:
-      // 1. The current MetaServerShutdownHandler instance For RS1 waits for the .META.
+      // 1. The current MetaServerShutdownHandler instance For RS1 waits for the hbase:meta
       //    to come online.
-      // 2. The newly assigned .META. region server RS2 was shutdown right after
-      //    it opens the .META. region. So the MetaServerShutdownHandler
+      // 2. The newly assigned hbase:meta region server RS2 was shutdown right after
+      //    it opens the hbase:meta region. So the MetaServerShutdownHandler
       //    instance For RS1 will still be blocked.
       // 3. The new instance of MetaServerShutdownHandler for RS2 is queued.
-      // 4. The newly assigned .META. region server RS3 was shutdown right after
-      //    it opens the .META. region. So the MetaServerShutdownHandler
+      // 4. The newly assigned hbase:meta region server RS3 was shutdown right after
+      //    it opens the hbase:meta region. So the MetaServerShutdownHandler
       //    instance For RS1 and RS2 will still be blocked.
       // 5. The new instance of MetaServerShutdownHandler for RS3 is queued.
       // 6. Repeat until we run out of MetaServerShutdownHandler worker threads
@@ -141,7 +141,7 @@ public class ServerShutdownHandler exten
       // If AssignmentManager hasn't finished rebuilding user regions,
       // we are not ready to assign dead regions either. So we re-queue up
       // the dead server for further processing too.
-      if (isCarryingMeta() // .META.
+      if (isCarryingMeta() // hbase:meta
           || !services.getAssignmentManager().isFailoverCleanupDone()) {
         this.services.getServerManager().processDeadServer(serverName, this.shouldSplitHlog);
         return;
@@ -150,18 +150,18 @@ public class ServerShutdownHandler exten
       // Wait on meta to come online; we need it to progress.
       // TODO: Best way to hold strictly here?  We should build this retry logic
       // into the MetaReader operations themselves.
-      // TODO: Is the reading of .META. necessary when the Master has state of
-      // cluster in its head?  It should be possible to do without reading .META.
-      // in all but one case. On split, the RS updates the .META.
+      // TODO: Is the reading of hbase:meta necessary when the Master has state of
+      // cluster in its head?  It should be possible to do without reading hbase:meta
+      // in all but one case. On split, the RS updates the hbase:meta
       // table and THEN informs the master of the split via zk nodes in
       // 'unassigned' dir.  Currently the RS puts ephemeral nodes into zk so if
       // the regionserver dies, these nodes do not stick around and this server
       // shutdown processing does fixup (see the fixupDaughters method below).
-      // If we wanted to skip the .META. scan, we'd have to change at least the
+      // If we wanted to skip the hbase:meta scan, we'd have to change at least the
       // final SPLIT message to be permanent in zk so in here we'd know a SPLIT
-      // completed (zk is updated after edits to .META. have gone in).  See
+      // completed (zk is updated after edits to hbase:meta have gone in).  See
       // {@link SplitTransaction}.  We'd also have to be figure another way for
-      // doing the below .META. daughters fixup.
+      // doing the below hbase:meta daughters fixup.
       NavigableMap<HRegionInfo, Result> hris = null;
       while (!this.server.isStopped()) {
         try {
@@ -173,8 +173,8 @@ public class ServerShutdownHandler exten
           Thread.currentThread().interrupt();
           throw new IOException("Interrupted", e);
         } catch (IOException ioe) {
-          LOG.info("Received exception accessing META during server shutdown of " +
-              serverName + ", retrying META read", ioe);
+          LOG.info("Received exception accessing hbase:meta during server shutdown of " +
+              serverName + ", retrying hbase:meta read", ioe);
         }
       }
       if (this.server.isStopped()) {
@@ -340,7 +340,7 @@ public class ServerShutdownHandler exten
       return false;
     }
     if (hri.isOffline() && hri.isSplit()) {
-      //HBASE-7721: Split parent and daughters are inserted into META as an atomic operation.
+      //HBASE-7721: Split parent and daughters are inserted into hbase:meta as an atomic operation.
       //If the meta scanner saw the parent split, then it should see the daughters as assigned
       //to the dead server. We don't have to do anything.
       return false;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java Fri Sep  6 00:29:48 2013
@@ -95,7 +95,7 @@ public class CloneSnapshotHandler extend
   /**
    * Create the on-disk regions, using the tableRootDir provided by the CreateTableHandler.
    * The cloned table will be created in a temp directory, and then the CreateTableHandler
-   * will be responsible to add the regions returned by this method to META and do the assignment.
+   * will be responsible to add the regions returned by this method to hbase:meta and do the assignment.
    */
   @Override
   protected List<HRegionInfo> handleCreateHdfsRegions(final Path tableRootDir,

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java Fri Sep  6 00:29:48 2013
@@ -143,7 +143,7 @@ public final class MasterSnapshotVerifie
   /**
    * Check that all the regions in the snapshot are valid, and accounted for.
    * @param snapshotDir snapshot directory to check
-   * @throws IOException if we can't reach .META. or read the files from the FS
+   * @throws IOException if we can't reach hbase:meta or read the files from the FS
    */
   private void verifyRegions(Path snapshotDir) throws IOException {
     List<HRegionInfo> regions = MetaReader.getTableRegions(this.services.getCatalogTracker(),

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java Fri Sep  6 00:29:48 2013
@@ -100,8 +100,8 @@ public class RestoreSnapshotHandler exte
    * The restore table is executed in place.
    *  - The on-disk data will be restored - reference files are put in place without moving data
    *  -  [if something fail here: you need to delete the table and re-run the restore]
-   *  - META will be updated
-   *  -  [if something fail here: you need to run hbck to fix META entries]
+   *  - hbase:meta will be updated
+   *  -  [if something fail here: you need to run hbck to fix hbase:meta entries]
    * The passed in list gets changed in this method
    */
   @Override
@@ -133,7 +133,7 @@ public class RestoreSnapshotHandler exte
       // which is the same state that the regions will be after a delete table.
       forceRegionsOffline(metaChanges);
 
-      // 4. Applies changes to .META.
+      // 4. Applies changes to hbase:meta
       status.setStatus("Preparing to restore each region");
 
       // 4.1 Removes the current set of regions from META
@@ -152,7 +152,7 @@ public class RestoreSnapshotHandler exte
       //
       // At this point the old regions are no longer present in META.
       // and the set of regions present in the snapshot will be written to META.
-      // All the information in META are coming from the .regioninfo of each region present
+      // All the information in hbase:meta are coming from the .regioninfo of each region present
       // in the snapshot folder.
       hris.clear();
       if (metaChanges.hasRegionsToAdd()) hris.addAll(metaChanges.getRegionsToAdd());

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java Fri Sep  6 00:29:48 2013
@@ -62,7 +62,7 @@ import org.apache.zookeeper.KeeperExcept
 /**
  * A handler for taking snapshots from the master.
  *
- * This is not a subclass of TableEventHandler because using that would incur an extra META scan.
+ * This is not a subclass of TableEventHandler because using that would incur an extra hbase:meta scan.
  *
  * The {@link #snapshotRegions(List)} call should get implemented for each snapshot flavor.
  */

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java Fri Sep  6 00:29:48 2013
@@ -56,7 +56,7 @@ class GetClosestRowBeforeTracker {
    * @param kv Presume first on row: i.e. empty column, maximum timestamp and
    * a type of Type.Maximum
    * @param ttl Time to live in ms for this Store
-   * @param metaregion True if this is .META. or -ROOT- region.
+   * @param metaregion True if this is hbase:meta or -ROOT- region.
    */
   GetClosestRowBeforeTracker(final KVComparator c, final KeyValue kv,
       final long ttl, final boolean metaregion) {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Sep  6 00:29:48 2013
@@ -599,7 +599,7 @@ public class HRegion implements HeapSize
       coprocessorHost.preOpen();
     }
 
-    // Write HRI to a file in case we need to recover .META.
+    // Write HRI to a file in case we need to recover hbase:meta
     status.setStatus("Writing region info on filesystem");
     fs.checkRegionInfoOnFilesystem();
 
@@ -4171,9 +4171,9 @@ public class HRegion implements HeapSize
   /**
    * Inserts a new region's meta information into the passed
    * <code>meta</code> region. Used by the HMaster bootstrap code adding
-   * new table to META table.
+   * new table to hbase:meta table.
    *
-   * @param meta META HRegion to be updated
+   * @param meta hbase:meta HRegion to be updated
    * @param r HRegion to add to <code>meta</code>
    *
    * @throws IOException

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java Fri Sep  6 00:29:48 2013
@@ -742,7 +742,7 @@ public class HRegionFileSystem {
       LOG.warn(REGION_INFO_FILE + " file not found for region: " + regionInfo.getEncodedName());
     }
 
-    // Write HRI to a file in case we need to recover .META.
+    // Write HRI to a file in case we need to recover hbase:meta
     writeRegionInfoOnFilesystem(content, true);
   }
 
@@ -780,7 +780,7 @@ public class HRegionFileSystem {
         FSUtils.delete(fs, tmpPath, true);
       }
 
-      // Write HRI to a file in case we need to recover .META.
+      // Write HRI to a file in case we need to recover hbase:meta
       writeRegionInfoFileContent(conf, fs, tmpPath, regionInfoContent);
 
       // Move the created file to the original path
@@ -788,7 +788,7 @@ public class HRegionFileSystem {
         throw new IOException("Unable to rename " + tmpPath + " to " + regionInfoFile);
       }
     } else {
-      // Write HRI to a file in case we need to recover .META.
+      // Write HRI to a file in case we need to recover hbase:meta
       writeRegionInfoFileContent(conf, fs, regionInfoFile, regionInfoContent);
     }
   }
@@ -817,7 +817,7 @@ public class HRegionFileSystem {
       throw new IOException("Unable to create region directory: " + regionDir);
     }
 
-    // Write HRI to a file in case we need to recover .META.
+    // Write HRI to a file in case we need to recover hbase:meta
     regionFs.writeRegionInfoOnFilesystem(false);
     return regionFs;
   }
@@ -848,7 +848,7 @@ public class HRegionFileSystem {
       regionFs.cleanupSplitsDir();
       regionFs.cleanupMergesDir();
 
-      // if it doesn't exists, Write HRI to a file, in case we need to recover .META.
+      // if it doesn't exists, Write HRI to a file, in case we need to recover hbase:meta
       regionFs.checkRegionInfoOnFilesystem();
     }
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Sep  6 00:29:48 2013
@@ -1654,7 +1654,7 @@ public class HRegionServer implements Cl
     //TODO: at some point this should delegate to the HLogFactory
     //currently, we don't care about the region as much as we care about the
     //table.. (hence checking the tablename below)
-    //_ROOT_ and .META. regions have separate WAL.
+    //_ROOT_ and hbase:meta regions have separate WAL.
     if (regionInfo != null && regionInfo.isMetaTable()) {
       return getMetaWAL();
     }
@@ -2322,7 +2322,7 @@ public class HRegionServer implements Cl
 
   /**
    * Gets the online regions of the specified table.
-   * This method looks at the in-memory onlineRegions.  It does not go to <code>.META.</code>.
+   * This method looks at the in-memory onlineRegions.  It does not go to <code>hbase:meta</code>.
    * Only returns <em>online</em> regions.  If a region on this table has been
    * closed during a disable, etc., it will not be included in the returned list.
    * So, the returned list may not necessarily be ALL regions in this table, its
@@ -3496,7 +3496,7 @@ public class HRegionServer implements Cl
           if (onlineRegion.getCoprocessorHost() != null) {
             onlineRegion.getCoprocessorHost().preOpen();
           }
-          // See HBASE-5094. Cross check with META if still this RS is owning
+          // See HBASE-5094. Cross check with hbase:meta if still this RS is owning
           // the region.
           Pair<HRegionInfo, ServerName> p = MetaReader.getRegion(
               this.catalogTracker, region.getRegionName());
@@ -3516,7 +3516,7 @@ public class HRegionServer implements Cl
             }
           } else {
             LOG.warn("The region " + region.getEncodedName() + " is online on this server" +
-                " but META does not have this server - continue opening.");
+                " but hbase:meta does not have this server - continue opening.");
             removeFromOnlineRegions(onlineRegion, null);
           }
         }

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java Fri Sep  6 00:29:48 2013
@@ -48,7 +48,7 @@ import com.google.protobuf.TextFormat;
 
 /**
  * A guava function that will return a priority for use by QoS facility in regionserver; e.g.
- * rpcs to .META. and -ROOT-, etc., get priority.
+ * rpcs to hbase:meta and -ROOT-, etc., get priority.
  */
 // TODO: Remove.  This is doing way too much work just to figure a priority.  Do as Elliott
 // suggests and just have the client specify a priority.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java Fri Sep  6 00:29:48 2013
@@ -112,7 +112,7 @@ class RegionMergeRequest implements Runn
         }
         return;
       }
-      LOG.info("Regions merged, META updated, and report to master. region_a="
+      LOG.info("Regions merged, hbase:meta updated, and report to master. region_a="
           + region_a + ", region_b=" + region_b + ",merged region="
           + mt.getMergedRegionInfo().getRegionNameAsString()
           + ". Region merge took "

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java Fri Sep  6 00:29:48 2013
@@ -202,7 +202,7 @@ public class RegionMergeTransaction {
     }
 
     // WARN: make sure there is no parent region of the two merging regions in
-    // .META. If exists, fixing up daughters would cause daughter regions(we
+    // hbase:meta If exists, fixing up daughters would cause daughter regions(we
     // have merged one) online again when we restart master, so we should clear
     // the parent region to prevent the above case
     // Since HBASE-7721, we don't need fix up daughters any more. so here do
@@ -327,7 +327,7 @@ public class RegionMergeTransaction {
     this.journal.add(JournalEntry.PONR);
 
     // Add merged region and delete region_a and region_b
-    // as an atomic update. See HBASE-7721. This update to META makes the region
+    // as an atomic update. See HBASE-7721. This update to hbase:meta makes the region
     // will determine whether the region is merged or not in case of failures.
     // If it is successful, master will roll-forward, if not, master will
     // rollback
@@ -408,7 +408,7 @@ public class RegionMergeTransaction {
       final HRegionInfo b) {
     long rid = EnvironmentEdgeManager.currentTimeMillis();
     // Regionid is timestamp. Merged region's id can't be less than that of
-    // merging regions else will insert at wrong location in .META.
+    // merging regions else will insert at wrong location in hbase:meta
     if (rid < a.getRegionId() || rid < b.getRegionId()) {
       LOG.warn("Clock skew; merging regions id are " + a.getRegionId()
           + " and " + b.getRegionId() + ", but current time here is " + rid);
@@ -772,7 +772,7 @@ public class RegionMergeTransaction {
   }
 
   /**
-   * Checks if the given region has merge qualifier in .META.
+   * Checks if the given region has merge qualifier in hbase:meta
    * @param services
    * @param regionName name of specified region
    * @return true if the given region has merge qualifier in META.(It will be

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java Fri Sep  6 00:29:48 2013
@@ -106,7 +106,7 @@ class SplitRequest implements Runnable {
         }
         return;
       }
-      LOG.info("Region split, META updated, and report to master. Parent="
+      LOG.info("Region split, hbase:meta updated, and report to master. Parent="
           + parent.getRegionNameAsString() + ", new regions: "
           + st.getFirstDaughter().getRegionNameAsString() + ", "
           + st.getSecondDaughter().getRegionNameAsString() + ". Split took "

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java Fri Sep  6 00:29:48 2013
@@ -181,7 +181,7 @@ public class SplitTransaction {
   private static long getDaughterRegionIdTimestamp(final HRegionInfo hri) {
     long rid = EnvironmentEdgeManager.currentTimeMillis();
     // Regionid is timestamp.  Can't be less than that of parent else will insert
-    // at wrong location in .META. (See HBASE-710).
+    // at wrong location in hbase:meta (See HBASE-710).
     if (rid < hri.getRegionId()) {
       LOG.warn("Clock skew; parent regions id is " + hri.getRegionId() +
         " but current time here is " + rid);
@@ -306,8 +306,8 @@ public class SplitTransaction {
     this.journal.add(JournalEntry.STARTED_REGION_B_CREATION);
     HRegion b = this.parent.createDaughterRegionFromSplits(this.hri_b);
 
-    // This is the point of no return.  Adding subsequent edits to .META. as we
-    // do below when we do the daughter opens adding each to .META. can fail in
+    // This is the point of no return.  Adding subsequent edits to hbase:meta as we
+    // do below when we do the daughter opens adding each to hbase:meta can fail in
     // various interesting ways the most interesting of which is a timeout
     // BUT the edits all go through (See HBASE-3872).  IF we reach the PONR
     // then subsequent failures need to crash out this regionserver; the
@@ -315,7 +315,7 @@ public class SplitTransaction {
     // The offlined parent will have the daughters as extra columns.  If
     // we leave the daughter regions in place and do not remove them when we
     // crash out, then they will have their references to the parent in place
-    // still and the server shutdown fixup of .META. will point to these
+    // still and the server shutdown fixup of hbase:meta will point to these
     // regions.
     // We should add PONR JournalEntry before offlineParentInMeta,so even if
     // OfflineParentInMeta timeout,this will cause regionserver exit,and then
@@ -324,7 +324,7 @@ public class SplitTransaction {
     this.journal.add(JournalEntry.PONR);
 
     // Edit parent in meta.  Offlines parent region and adds splita and splitb
-    // as an atomic update. See HBASE-7721. This update to META makes the region
+    // as an atomic update. See HBASE-7721. This update to hbase:meta makes the region
     // will determine whether the region is split or not in case of failures.
     // If it is successful, master will roll-forward, if not, master will rollback
     // and assign the parent region.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java Fri Sep  6 00:29:48 2013
@@ -240,7 +240,7 @@ public class OpenRegionHandler extends E
 
   /**
    * Update ZK or META.  This can take a while if for example the
-   * .META. is not available -- if server hosting .META. crashed and we are
+   * hbase:meta is not available -- if server hosting hbase:meta crashed and we are
    * waiting on it to come back -- so run in a thread and keep updating znode
    * state meantime so master doesn't timeout our region-in-transition.
    * Caller must cleanup region if this fails.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Fri Sep  6 00:29:48 2013
@@ -48,7 +48,7 @@ public interface HLog {
   /** File Extension used while splitting an HLog into regions (HBASE-2312) */
   String SPLITTING_EXT = "-splitting";
   boolean SPLIT_SKIP_ERRORS_DEFAULT = false;
-  /** The META region's HLog filename extension */
+  /** The hbase:meta region's HLog filename extension */
   String META_HLOG_FILE_EXTN = ".meta";
 
   /**

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java Fri Sep  6 00:29:48 2013
@@ -410,7 +410,7 @@ public class HLogKey implements Writable
     } catch (IllegalArgumentException iae) {
       if (Bytes.toString(tablenameBytes).equals(TableName.OLD_META_STR)) {
         // It is a pre-namespace meta table edit, continue with new format.
-        LOG.info("Got an old META edit, continuing with new format ");
+        LOG.info("Got an old .META. edit, continuing with new format ");
         this.tablename = TableName.META_TABLE_NAME;
         this.encodedRegionName = HRegionInfo.FIRST_META_REGIONINFO.getEncodedNameAsBytes();
       } else if (Bytes.toString(tablenameBytes).equals(TableName.OLD_ROOT_STR)) {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java Fri Sep  6 00:29:48 2013
@@ -325,7 +325,7 @@ public class HLogPrettyPrinter {
     options.addOption("j", "json", false, "Output JSON");
     options.addOption("p", "printvals", false, "Print values");
     options.addOption("r", "region", true,
-        "Region to filter by. Pass region name; e.g. '.META.,,1'");
+        "Region to filter by. Pass region name; e.g. 'hbase:meta,,1'");
     options.addOption("s", "sequence", true,
         "Sequence to filter by. Pass sequence number.");
     options.addOption("w", "row", true, "Row to filter by. Pass row name.");

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java Fri Sep  6 00:29:48 2013
@@ -1528,7 +1528,7 @@ public class HLogSplitter {
       // fetch location from cache
       HRegionLocation loc = onlineRegions.get(originalEncodedRegionName);
       if(loc != null) return loc;
-      // fetch location from .META. directly without using cache to avoid hit old dead server
+      // fetch location from hbase:meta directly without using cache to avoid hit old dead server
       loc = hconn.getRegionLocation(table, row, true);
       if (loc == null) {
         throw new IOException("Can't locate location for row:" + Bytes.toString(row)

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html Fri Sep  6 00:29:48 2013
@@ -387,7 +387,7 @@ Content-Type: text/plain
         urls,http|www.legacy.com|80|site=Legacy|aamsz=300x250||position=1|prod
           =1,1244851990859
         urls,http|weather.boston.com|80|LYNX.js,1244851990859
-        .META.,,1
+        hbase:meta,,1
         content,601292a839b95e50200d8f8767859864,1244869158156
         content,9d7f3aeb2a5c1e2b45d690a91de3f23c,1244879698031
         content,7f6d48830ef51d635e9a5b672e79a083,1244879698031

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java Fri Sep  6 00:29:48 2013
@@ -210,7 +210,7 @@ public class AccessController extends Ba
     HRegionInfo hri = e.getRegion().getRegionInfo();
     TableName tableName = hri.getTableName();
 
-    // 1. All users need read access to .META. table.
+    // 1. All users need read access to hbase:meta table.
     // this is a very common operation, so deal with it quickly.
     if (hri.isMetaRegion()) {
       if (permRequest == Permission.Action.READ) {
@@ -224,10 +224,10 @@ public class AccessController extends Ba
         permRequest, tableName, families);
     }
 
-    // Users with CREATE/ADMIN rights need to modify .META. and _acl_ table
-    // e.g. When a new table is created a new entry in .META. is added,
+    // Users with CREATE/ADMIN rights need to modify hbase:meta and _acl_ table
+    // e.g. When a new table is created a new entry in hbase:meta is added,
     // so the user need to be allowed to write on it.
-    // e.g. When a table is removed an entry is removed from .META. and _acl_
+    // e.g. When a table is removed an entry is removed from hbase:meta and _acl_
     // and the user need to be allowed to write on both tables.
     if (permRequest == Permission.Action.WRITE &&
        (hri.isMetaRegion() ||

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java Fri Sep  6 00:29:48 2013
@@ -219,7 +219,7 @@ public class RestoreSnapshotHelper {
   }
 
   /**
-   * Describe the set of operations needed to update META after restore.
+   * Describe the set of operations needed to update hbase:meta after restore.
    */
   public static class RestoreMetaChanges {
     private final Map<String, Pair<String, String> > parentsMap;
@@ -258,7 +258,7 @@ public class RestoreSnapshotHelper {
 
     /**
      * Returns the list of 'restored regions' during the on-disk restore.
-     * The caller is responsible to add the regions to META if not present.
+     * The caller is responsible to add the regions to hbase:meta if not present.
      * @return the list of regions restored
      */
     public List<HRegionInfo> getRegionsToRestore() {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java Fri Sep  6 00:29:48 2013
@@ -50,7 +50,7 @@ public class FSTableDescriptorMigrationT
   }
 
   /**
-   * Determines if migration is required by checking to see whether the META table has been
+   * Determines if migration is required by checking to see whether the hbase:meta table has been
    * migrated.
    */
   private static boolean needsMigration(FileSystem fs, Path rootDir) throws IOException {
@@ -66,7 +66,7 @@ public class FSTableDescriptorMigrationT
    * First migrates snapshots.
    * Then migrates each user table in order,
    * then attempts ROOT (should be gone)
-   * Migrates META last to indicate migration is complete.
+   * Migrates hbase:meta last to indicate migration is complete.
    */
   private static void migrateFsTableDescriptors(FileSystem fs, Path rootDir) throws IOException {
     // First migrate snapshots - will migrate any snapshot dir that contains a table info file

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java Fri Sep  6 00:29:48 2013
@@ -148,7 +148,7 @@ public class FSTableDescriptors implemen
       cachehits++;
       return HTableDescriptor.META_TABLEDESC;
     }
-    // .META. is already handled. If some one tries to get the descriptor for
+    // hbase:meta is already handled. If some one tries to get the descriptor for
     // .logs, .oldlogs or .corrupt throw an exception.
     if (HConstants.HBASE_NON_USER_TABLE_DIRS.contains(tablename.getNameAsString())) {
        throw new IOException("No descriptor found for non table = " + tablename);
@@ -490,7 +490,7 @@ public class FSTableDescriptors implemen
    */
   private TableDescriptorAndModtime getTableDescriptorAndModtime(TableName tableName)
   throws IOException {
-    // ignore both -ROOT- and .META. tables
+    // ignore both -ROOT- and hbase:meta tables
     if (tableName.equals(TableName.META_TABLE_NAME)) {
       return null;
     }

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1520463&r1=1520462&r2=1520463&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Fri Sep  6 00:29:48 2013
@@ -975,7 +975,7 @@ public abstract class FSUtils {
 
   // TODO move this method OUT of FSUtils. No dependencies to HMaster
   /**
-   * Returns the total overall fragmentation percentage. Includes .META. and
+   * Returns the total overall fragmentation percentage. Includes hbase:meta and
    * -ROOT- as well.
    *
    * @param master  The master defining the HBase root and file system.
@@ -990,7 +990,7 @@ public abstract class FSUtils {
 
   /**
    * Runs through the HBase rootdir and checks how many stores for each table
-   * have more than one file in them. Checks -ROOT- and .META. too. The total
+   * have more than one file in them. Checks -ROOT- and hbase:meta too. The total
    * percentage across all tables is stored under the special key "-TOTAL-".
    *
    * @param master  The master defining the HBase root and file system.
@@ -1009,7 +1009,7 @@ public abstract class FSUtils {
 
   /**
    * Runs through the HBase rootdir and checks how many stores for each table
-   * have more than one file in them. Checks -ROOT- and .META. too. The total
+   * have more than one file in them. Checks -ROOT- and hbase:meta too. The total
    * percentage across all tables is stored under the special key "-TOTAL-".
    *
    * @param fs  The file system to use.



Mime
View raw message