Index: hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (working copy) @@ -60,20 +60,20 @@ * There are two versions associated with HRegionInfo: HRegionInfo.VERSION and * HConstants.META_VERSION. HRegionInfo.VERSION indicates the data structure's versioning * while HConstants.META_VERSION indicates the versioning of the serialized HRIs stored in - * the META table. + * the hbase:meta table. * * Pre-0.92: - * HRI.VERSION == 0 and HConstants.META_VERSION does not exist (is not stored at META table) + * HRI.VERSION == 0 and HConstants.META_VERSION does not exist (is not stored at hbase:meta table) * HRegionInfo had an HTableDescriptor reference inside it. - * HRegionInfo is serialized as Writable to META table. + * HRegionInfo is serialized as Writable to hbase:meta table. * For 0.92.x and 0.94.x: * HRI.VERSION == 1 and HConstants.META_VERSION == 0 * HRI no longer has HTableDescriptor in it. - * HRI is serialized as Writable to META table. + * HRI is serialized as Writable to hbase:meta table. * For 0.96.x: * HRI.VERSION == 1 and HConstants.META_VERSION == 1 * HRI data structure is the same as 0.92 and 0.94 - * HRI is serialized as PB to META table. + * HRI is serialized as PB to hbase:meta table. * * Versioning of HRegionInfo is deprecated. HRegionInfo does protobuf * serialization using RegionInfo class, which has it's own versioning. @@ -100,7 +100,7 @@ *

* **NOTE** * - * The first META region, and regions created by an older + * The first hbase:meta region, and regions created by an older * version of HBase (0.20 or prior) will continue to use the * old region name format. */ @@ -143,7 +143,7 @@ regionName.length - MD5_HEX_LENGTH - 1, MD5_HEX_LENGTH); } else { - // old format region name. First META region also + // old format region name. First hbase:meta region also // use this format.EncodedName is the JenkinsHash value. int hashVal = Math.abs(JenkinsHash.getInstance().hash(regionName, regionName.length, 0)); @@ -162,12 +162,12 @@ /** * Use logging. * @param encodedRegionName The encoded regionname. - * @return .META. if passed 1028785192 else returns + * @return hbase:meta if passed 1028785192 else returns * encodedRegionName */ public static String prettyPrint(final String encodedRegionName) { if (encodedRegionName.equals("1028785192")) { - return encodedRegionName + "/.META."; + return encodedRegionName + "/hbase:meta"; } return encodedRegionName; } @@ -562,7 +562,7 @@ } /** - * @return true if this region is from .META. + * @return true if this region is from hbase:meta */ public boolean isMetaTable() { return isMetaRegion(); @@ -927,7 +927,7 @@ * Extract a HRegionInfo and ServerName from catalog table {@link Result}. * @param r Result to pull from * @return A pair of the {@link HRegionInfo} and the {@link ServerName} - * (or null for server address if no address set in .META.). + * (or null for server address if no address set in hbase:meta). * @throws IOException */ public static Pair getHRegionInfoAndServerName(final Result r) { Index: hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (working copy) @@ -59,7 +59,7 @@ /** * HTableDescriptor contains the details about an HBase table such as the descriptors of * all the column families, is the table a catalog table, -ROOT- or - * .META. , if the table is read only, the maximum size of the memstore, + * hbase:meta , if the table is read only, the maximum size of the memstore, * when the region split should occur, coprocessors associated with it etc... */ @InterfaceAudience.Public @@ -156,7 +156,7 @@ /** * INTERNAL Used by rest interface to access this metadata * attribute which denotes if it is a catalog table, either - * .META. or -ROOT- + * hbase:meta or -ROOT- * * @see #isMetaRegion() */ @@ -256,7 +256,7 @@ /** * INTERNAL Private constructor used internally creating table descriptors for - * catalog tables, .META. and -ROOT-. + * catalog tables, hbase:meta and -ROOT-. */ protected HTableDescriptor(final TableName name, HColumnDescriptor[] families) { setName(name); @@ -267,7 +267,7 @@ /** * INTERNAL Private constructor used internally creating table descriptors for - * catalog tables, .META. and -ROOT-. + * catalog tables, hbase:meta and -ROOT-. */ protected HTableDescriptor(final TableName name, HColumnDescriptor[] families, Map values) { @@ -347,7 +347,7 @@ /* * Set meta flags on this table. * IS_ROOT_KEY is set if its a -ROOT- table - * IS_META_KEY is set either if its a -ROOT- or a .META. table + * IS_META_KEY is set either if its a -ROOT- or a hbase:meta table * Called by constructors. * @param name */ @@ -381,10 +381,10 @@ } /** - * Checks if this table is .META. + * Checks if this table is hbase:meta * region. * - * @return true if this table is .META. + * @return true if this table is hbase:meta * region */ public boolean isMetaRegion() { @@ -410,20 +410,20 @@ /** * INTERNAL Used to denote if the current table represents - * -ROOT- or .META. region. This is used + * -ROOT- or hbase:meta region. This is used * internally by the HTableDescriptor constructors * * @param isMeta true if its either -ROOT- or - * .META. region + * hbase:meta region */ protected void setMetaRegion(boolean isMeta) { setValue(IS_META_KEY, isMeta? TRUE: FALSE); } /** - * Checks if the table is a .META. table + * Checks if the table is a hbase:meta table * - * @return true if table is .META. region. + * @return true if table is hbase:meta region. */ public boolean isMetaTable() { return isMetaRegion() && !isRootRegion(); @@ -1319,7 +1319,7 @@ new Path(name.getNamespaceAsString(), new Path(name.getQualifierAsString())))); } - /** Table descriptor for .META. catalog table */ + /** Table descriptor for hbase:meta catalog table */ public static final HTableDescriptor META_TABLEDESC = new HTableDescriptor( TableName.META_TABLE_NAME, new HColumnDescriptor[] { @@ -1339,7 +1339,7 @@ "org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint", null, Coprocessor.PRIORITY_SYSTEM, null); } catch (IOException ex) { - //LOG.warn("exception in loading coprocessor for the META table"); + //LOG.warn("exception in loading coprocessor for the hbase:meta table"); throw new RuntimeException(ex); } } @@ -1381,7 +1381,7 @@ return Bytes.toString(getValue(OWNER_KEY)); } // Note that every table should have an owner (i.e. should have OWNER_KEY set). - // .META. and -ROOT- should return system user as owner, not null (see + // hbase:meta and -ROOT- should return system user as owner, not null (see // MasterFileSystem.java:bootstrap()). return null; } Index: hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (working copy) @@ -47,11 +47,11 @@ /** * Tracks the availability of the catalog tables - * .META.. + * hbase:meta. * * This class is "read-only" in that the locations of the catalog tables cannot * be explicitly set. Instead, ZooKeeper is used to learn of the availability - * and location of .META.. + * and location of hbase:meta. * *

Call {@link #start()} to start up operation. Call {@link #stop()}} to * interrupt waits and close up shop. @@ -67,7 +67,7 @@ // locations on fault, the client would instead get notifications out of zk. // // But this original intent is frustrated by the fact that this class has to - // read an hbase table, the -ROOT- table, to figure out the .META. region + // read an hbase table, the -ROOT- table, to figure out the hbase:meta region // location which means we depend on an HConnection. HConnection will do // retrying but also, it has its own mechanism for finding root and meta // locations (and for 'verifying'; it tries the location and if it fails, does @@ -224,9 +224,9 @@ } /** - * Gets the current location for .META. or null if location is + * Gets the current location for hbase:meta or null if location is * not currently available. - * @return {@link ServerName} for server hosting .META. or null + * @return {@link ServerName} for server hosting hbase:meta or null * if none available * @throws InterruptedException */ @@ -242,11 +242,11 @@ return this.metaRegionTracker.isLocationAvailable(); } /** - * Gets the current location for .META. if available and waits + * Gets the current location for hbase:meta if available and waits * for up to the specified timeout if not immediately available. Returns null * if the timeout elapses before root is available. * @param timeout maximum time to wait for root availability, in milliseconds - * @return {@link ServerName} for server hosting .META. or null + * @return {@link ServerName} for server hosting hbase:meta or null * if none available * @throws InterruptedException if interrupted while waiting * @throws NotAllMetaRegionsOnlineException if meta not available before @@ -294,7 +294,7 @@ } /** - * Waits indefinitely for availability of .META.. Used during + * Waits indefinitely for availability of hbase:meta. Used during * cluster startup. Does not verify meta, just that something has been * set up in zk. * @see #waitForMeta(long) @@ -306,7 +306,7 @@ if (waitForMeta(100) != null) break; } catch (NotAllMetaRegionsOnlineException e) { if (LOG.isTraceEnabled()) { - LOG.info(".META. still not available, sleeping and retrying." + + LOG.info("hbase:meta still not available, sleeping and retrying." + " Reason: " + e.getMessage()); } } @@ -409,10 +409,10 @@ } /** - * Verify .META. is deployed and accessible. + * Verify hbase:meta is deployed and accessible. * @param timeout How long to wait on zk for meta address (passed through to * the internal call to {@link #waitForMetaServerConnection(long)}. - * @return True if the .META. location is healthy. + * @return True if the hbase:meta location is healthy. * @throws IOException * @throws InterruptedException */ Index: hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (working copy) @@ -43,7 +43,7 @@ import java.util.TreeMap; /** - * Reads region and assignment information from .META.. + * Reads region and assignment information from hbase:meta. */ @InterfaceAudience.Private public class MetaReader { @@ -55,7 +55,7 @@ static final byte [] META_REGION_PREFIX; static { // Copy the prefix from FIRST_META_REGIONINFO into META_REGION_PREFIX. - // FIRST_META_REGIONINFO == '.META.,,1'. META_REGION_PREFIX == '.META.,' + // FIRST_META_REGIONINFO == 'hbase:meta,,1'. META_REGION_PREFIX == 'hbase:meta,' int len = HRegionInfo.FIRST_META_REGIONINFO.getRegionName().length - 2; META_REGION_PREFIX = new byte [len]; System.arraycopy(HRegionInfo.FIRST_META_REGIONINFO.getRegionName(), 0, @@ -63,7 +63,7 @@ } /** - * Performs a full scan of .META., skipping regions from any + * Performs a full scan of hbase:meta, skipping regions from any * tables in the specified set of disabled tables. * @param catalogTracker * @param disabledTables set of disabled tables that will not be returned @@ -79,7 +79,7 @@ } /** - * Performs a full scan of .META., skipping regions from any + * Performs a full scan of hbase:meta, skipping regions from any * tables in the specified set of disabled tables. * @param catalogTracker * @param disabledTables set of disabled tables that will not be returned @@ -117,7 +117,7 @@ } /** - * Performs a full scan of .META.. + * Performs a full scan of hbase:meta. * @return List of {@link Result} * @throws IOException */ @@ -129,7 +129,7 @@ } /** - * Performs a full scan of a .META. table. + * Performs a full scan of a hbase:meta table. * @return List of {@link Result} * @throws IOException */ @@ -141,7 +141,7 @@ } /** - * Performs a full scan of .META.. + * Performs a full scan of hbase:meta. * @param catalogTracker * @param visitor Visitor invoked against each row. * @throws IOException @@ -183,7 +183,7 @@ /** * Callers should call close on the returned {@link HTable} instance. * @param ct - * @return An {@link HTable} for .META. + * @return An {@link HTable} for hbase:meta * @throws IOException */ static HTable getMetaHTable(final CatalogTracker ct) @@ -235,7 +235,7 @@ } /** - * Gets the result in META for the specified region. + * Gets the result in hbase:meta for the specified region. * @param catalogTracker * @param regionName * @return result of the specified region @@ -267,7 +267,7 @@ } /** - * Checks if the specified table exists. Looks at the META table hosted on + * Checks if the specified table exists. Looks at the hbase:meta table hosted on * the specified server. * @param catalogTracker * @param tableName table to check @@ -367,7 +367,7 @@ /** * @param tableName - * @return Place to start Scan in .META. when passed a + * @return Place to start Scan in hbase:meta when passed a * tableName; returns <tableName&rt; <,&rt; <,&rt; */ static byte [] getTableStartRowForMeta(TableName tableName) { @@ -475,7 +475,7 @@ getServerUserRegions(CatalogTracker catalogTracker, final ServerName serverName) throws IOException { final NavigableMap hris = new TreeMap(); - // Fill the above hris map with entries from .META. that have the passed + // Fill the above hris map with entries from hbase:meta that have the passed // servername. CollectingVisitor v = new CollectingVisitor() { @Override @@ -518,7 +518,7 @@ * @param visitor Visitor invoked against each row. * @param startrow Where to start the scan. Pass null if want to begin scan * at first row. - * .META., the default (pass false to scan .META.) + * hbase:meta, the default (pass false to scan hbase:meta) * @throws IOException */ public static void fullScan(CatalogTracker catalogTracker, @@ -595,7 +595,7 @@ } /** - * Count regions in .META. for passed table. + * Count regions in hbase:meta for passed table. * @param c * @param tableName * @return Count or regions in table tableName Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -277,11 +277,11 @@ } /** - * List all the userspace tables. In other words, scan the META table. + * List all the userspace tables. In other words, scan the hbase:meta table. * * If we wanted this to be really fast, we could implement a special * catalog table that just contains table names and their descriptors. - * Right now, it only exists as part of the META table's region info. + * Right now, it only exists as part of the hbase:meta table's region info. * * @return - returns an array of HTableDescriptors * @throws IOException if a remote or network exception occurs @@ -641,7 +641,7 @@ throw ProtobufUtil.getRemoteException(se); } - // let us wait until .META. table is updated and + // let us wait until hbase:meta table is updated and // HMaster removes the table from its HTableDescriptors if (values == null || values.length == 0) { tableExists = false; @@ -1270,7 +1270,7 @@ * master will not be informed of the close. * @param regionname region name to close * @param serverName If supplied, we'll use this location rather than - * the one currently in .META. + * the one currently in hbase:meta * @throws IOException if a remote or network exception occurs */ public void closeRegion(final String regionname, final String serverName) @@ -1283,7 +1283,7 @@ * master will not be informed of the close. * @param regionname region name to close * @param serverName The servername of the regionserver. If passed null we - * will use servername found in the .META. table. A server name + * will use servername found in the hbase:meta table. A server name * is made of host, port and startcode. Here is an example: * host187.example.com,60020,1289493121758 * @throws IOException if a remote or network exception occurs Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (working copy) @@ -209,11 +209,11 @@ IOException; /** - * List all the userspace tables. In other words, scan the META table. + * List all the userspace tables. In other words, scan the hbase:meta table. * * If we wanted this to be really fast, we could implement a special * catalog table that just contains table names and their descriptors. - * Right now, it only exists as part of the META table's region info. + * Right now, it only exists as part of the hbase:meta table's region info. * * @return - returns an array of HTableDescriptors * @throws IOException if a remote or network exception occurs Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -1089,14 +1089,14 @@ } /* - * Search .META. for the HRegionLocation info that contains the table and + * Search hbase:meta for the HRegionLocation info that contains the table and * row we're seeking. It will prefetch certain number of regions info and * save them to the global region cache. */ private void prefetchRegionCache(final TableName tableName, final byte[] row) { // Implement a new visitor for MetaScanner, and use it to walk through - // the .META. + // the hbase:meta MetaScannerVisitor visitor = new MetaScannerVisitorBase() { public boolean processRow(Result result) throws IOException { try { @@ -1134,12 +1134,12 @@ MetaScanner.metaScan(conf, this, visitor, tableName, row, this.prefetchRegionLimit, TableName.META_TABLE_NAME); } catch (IOException e) { - LOG.warn("Encountered problems when prefetch META table: ", e); + LOG.warn("Encountered problems when prefetch hbase:meta table: ", e); } } /* - * Search the .META. table for the HRegionLocation + * Search the hbase:meta table for the HRegionLocation * info that contains the table and row we're seeking. */ private HRegionLocation locateRegionInMeta(final TableName parentTable, @@ -1245,7 +1245,7 @@ } if (isDeadServer(serverName)){ - throw new RegionServerStoppedException(".META. says the region "+ + throw new RegionServerStoppedException("hbase:meta says the region "+ regionInfo.getRegionNameAsString()+" is managed by the server " + serverName + ", but it is dead."); } Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java (working copy) @@ -186,8 +186,8 @@ * * @deprecated As of version 0.92 this method is deprecated without * replacement. - * getRowOrBefore is used internally to find entries in .META. and makes - * various assumptions about the table (which are true for .META. but not + * getRowOrBefore is used internally to find entries in hbase:meta and makes + * various assumptions about the table (which are true for hbase:meta but not * in general) to be efficient. */ Result getRowOrBefore(byte[] row, byte[] family) throws IOException; Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java (working copy) @@ -38,14 +38,14 @@ import org.apache.hadoop.hbase.util.Bytes; /** - * Scanner class that contains the .META. table scanning logic. + * Scanner class that contains the hbase:meta table scanning logic. * Provided visitors will be called for each row. * * Although public visibility, this is not a public-facing API and may evolve in * minor releases. * *

Note that during concurrent region splits, the scanner might not see - * META changes across rows (for parent and daughter entries) consistently. + * hbase:meta changes across rows (for parent and daughter entries) consistently. * see HBASE-5986, and {@link DefaultMetaScannerVisitor} for details.

*/ @InterfaceAudience.Private @@ -155,10 +155,10 @@ byte[] rowBefore = regionInfo.getStartKey(); startRow = HRegionInfo.createRegionName(tableName, rowBefore, HConstants.ZEROES, false); } else if (tableName == null || tableName.getName().length == 0) { - // Full META scan + // Full hbase:meta scan startRow = HConstants.EMPTY_START_ROW; } else { - // Scan META for an entire table + // Scan hbase:meta for an entire table startRow = HRegionInfo.createRegionName(tableName, HConstants.EMPTY_START_ROW, HConstants.ZEROES, false); } @@ -287,7 +287,7 @@ } /** - * Visitor class called to process each row of the .META. table + * Visitor class called to process each row of the hbase:meta table */ public interface MetaScannerVisitor extends Closeable { /** @@ -337,9 +337,9 @@ /** * A MetaScannerVisitor for a table. Provides a consistent view of the table's - * META entries during concurrent splits (see HBASE-5986 for details). This class + * hbase:meta entries during concurrent splits (see HBASE-5986 for details). This class * does not guarantee ordered traversal of meta entries, and can block until the - * META entries for daughters are available during splits. + * hbase:meta entries for daughters are available during splits. */ public static abstract class TableMetaScannerVisitor extends DefaultMetaScannerVisitor { private TableName tableName; Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java (working copy) @@ -117,12 +117,12 @@ (location != null && getConnection().isDeadServer(location.getServerName()))) { // if thrown these exceptions, we clear all the cache entries that // map to that slow/dead server; otherwise, let cache miss and ask - // .META. again to find the new location + // hbase:meta again to find the new location getConnection().clearCaches(location.getServerName()); } else if (t instanceof RegionMovedException) { getConnection().updateCachedLocations(tableName, row, t, location); } else if (t instanceof NotServingRegionException && !retrying) { - // Purge cache entries for this specific region from META cache + // Purge cache entries for this specific region from hbase:meta cache // since we don't call connect(true) when number of retries is 1. getConnection().deleteCachedRegionLocation(location); } Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java (working copy) @@ -24,7 +24,7 @@ /** * Cluster registry. - * Implemenations hold cluster information such as this cluster's id, location of .META., etc. + * Implemenations hold cluster information such as this cluster's id, location of hbase:meta, etc. */ interface Registry { /** Index: hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java (working copy) @@ -213,7 +213,7 @@ /** * Master controlled events to be executed on the master.
* M_META_SERVER_SHUTDOWN
- * Master is processing shutdown of RS hosting a meta region (-ROOT- or .META.). + * Master is processing shutdown of RS hosting a meta region (-ROOT- or hbase:meta). */ M_META_SERVER_SHUTDOWN (72, ExecutorType.MASTER_META_SERVER_OPERATIONS), /** Index: hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java (working copy) @@ -111,16 +111,16 @@ } /** - * Sets the location of .META. in ZooKeeper to the + * Sets the location of hbase:meta in ZooKeeper to the * specified server address. * @param zookeeper zookeeper reference - * @param location The server hosting .META. + * @param location The server hosting hbase:meta * @throws KeeperException unexpected zookeeper exception */ public static void setMetaLocation(ZooKeeperWatcher zookeeper, final ServerName location) throws KeeperException { - LOG.info("Setting META region location in ZooKeeper as " + location); + LOG.info("Setting hbase:meta region location in ZooKeeper as " + location); // Make the MetaRegionServer pb and then get its bytes and save this as // the znode content. byte [] data = toByteArray(location); @@ -155,13 +155,13 @@ } /** - * Deletes the location of .META. in ZooKeeper. + * Deletes the location of hbase:meta in ZooKeeper. * @param zookeeper zookeeper reference * @throws KeeperException unexpected zookeeper exception */ public static void deleteMetaLocation(ZooKeeperWatcher zookeeper) throws KeeperException { - LOG.info("Unsetting META region location in ZooKeeper"); + LOG.info("Unsetting hbase:meta region location in ZooKeeper"); try { // Just delete the node. Don't need any watches. ZKUtil.deleteNode(zookeeper, zookeeper.metaServerZNode); Index: hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (revision 1520311) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (working copy) @@ -1587,7 +1587,7 @@ zkw.backupMasterAddressesZNode)) { sb.append("\n ").append(child); } - sb.append("\nRegion server holding .META.: " + MetaRegionTracker.getMetaRegionLocation(zkw)); + sb.append("\nRegion server holding hbase:meta: " + MetaRegionTracker.getMetaRegionLocation(zkw)); sb.append("\nRegion servers:"); for (String child : listChildrenNoWatch(zkw, zkw.rsZNode)) { sb.append("\n ").append(child); Index: hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java (revision 1520311) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java (working copy) @@ -47,7 +47,7 @@ * include the costly helper methods marked as deprecated. *

* Cell implements Comparable which is only meaningful when comparing to other keys in the - * same table. It uses CellComparator which does not work on the -ROOT- and .META. tables. + * same table. It uses CellComparator which does not work on the -ROOT- and hbase:meta tables. *

* In the future, we may consider adding a boolean isOnHeap() method and a getValueBuffer() method * that can be used to pass a value directly from an off-heap ByteBuffer to the network without Index: hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java (revision 1520311) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java (working copy) @@ -30,9 +30,9 @@ /** * Compare two HBase cells. Do not use this method comparing -ROOT- or - * .META. cells. Cells from these tables need a specialized comparator, one that + * hbase:meta cells. Cells from these tables need a specialized comparator, one that * takes account of the special formatting of the row where we have commas to delimit table from - * regionname, from row. See KeyValue for how it has a special comparator to do .META. cells + * regionname, from row. See KeyValue for how it has a special comparator to do hbase:meta cells * and yet another for -ROOT-. */ @edu.umd.cs.findbugs.annotations.SuppressWarnings( Index: hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1520311) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -356,7 +356,7 @@ // should go down. - /** The META table's name. */ + /** The hbase:meta table's name. */ @Deprecated // for compat from 0.94 -> 0.96. public static final byte[] META_TABLE_NAME = TableName.META_TABLE_NAME.getName(); Index: hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java (revision 1520311) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java (working copy) @@ -85,7 +85,7 @@ */ public static final KVComparator COMPARATOR = new KVComparator(); /** - * A {@link KVComparator} for .META. catalog table + * A {@link KVComparator} for hbase:meta catalog table * {@link KeyValue}s. */ public static final KVComparator META_COMPARATOR = new MetaComparator(); @@ -1342,7 +1342,7 @@ final int offset, final int length, final int delimiter) { int index = getDelimiterInReverse(b, offset, length, delimiter); if (index < 0) { - throw new IllegalArgumentException(".META. key must have two '" + (char)delimiter + "' " + throw new IllegalArgumentException("hbase:meta key must have two '" + (char)delimiter + "' " + "delimiters and have the following format: ',,'"); } return index; @@ -1391,12 +1391,12 @@ } /** - * A {@link KVComparator} for .META. catalog table + * A {@link KVComparator} for hbase:meta catalog table * {@link KeyValue}s. */ public static class MetaComparator extends KVComparator { /** - * Compare key portion of a {@link KeyValue} for keys in .META. + * Compare key portion of a {@link KeyValue} for keys in hbase:meta * table. */ @Override @@ -1407,7 +1407,7 @@ int rightDelimiter = getDelimiter(right, roffset, rlength, HConstants.DELIMITER); if (leftDelimiter < 0 && rightDelimiter >= 0) { - // Nothing between .META. and regionid. Its first key. + // Nothing between hbase:meta and regionid. Its first key. return -1; } else if (rightDelimiter < 0 && leftDelimiter >= 0) { return 1; Index: hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java (revision 1520311) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java (working copy) @@ -64,7 +64,7 @@ "(?:(?:(?:"+VALID_NAMESPACE_REGEX+"\\"+NAMESPACE_DELIM+")?)" + "(?:"+VALID_TABLE_QUALIFIER_REGEX+"))"; - /** The META table's name. */ + /** The hbase:meta table's name. */ public static final TableName META_TABLE_NAME = valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "meta"); @@ -81,7 +81,7 @@ */ public static final TableName OLD_ROOT_TABLE_NAME = getADummyTableName(OLD_ROOT_STR); /** - * TableName for old .META. table. Used in testing. + * TableName for old .META. table. Used in testing. */ public static final TableName OLD_META_TABLE_NAME = getADummyTableName(OLD_META_STR); Index: hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java =================================================================== --- hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java (revision 1520311) +++ hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java (working copy) @@ -153,7 +153,7 @@ try { c.compare(a, b); } catch (IllegalArgumentException iae) { - assertEquals(".META. key must have two ',' delimiters and have the following" + + assertEquals("hbase:meta key must have two ',' delimiters and have the following" + " format: '
,,'", iae.getMessage()); return; } Index: hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java =================================================================== --- hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java (revision 1520311) +++ hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java (working copy) @@ -48,7 +48,7 @@ String SPLIT_SIZE_NAME = "hlogSplitSize"; String META_SPLIT_TIME_DESC = "Time it takes to finish splitMetaLog()"; - String META_SPLIT_SIZE_DESC = "Size of META HLog files being split"; + String META_SPLIT_SIZE_DESC = "Size of hbase:meta HLog files being split"; String SPLIT_TIME_DESC = "Time it takes to finish HLog.splitLog()"; String SPLIT_SIZE_DESC = "Size of HLog files being split"; Index: hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java =================================================================== --- hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java (revision 1520311) +++ hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java (working copy) @@ -32,7 +32,7 @@ LOG.info("Performing action: Restart region server holding META"); ServerName server = cluster.getServerHoldingMeta(); if (server == null) { - LOG.warn("No server is holding .META. right now."); + LOG.warn("No server is holding hbase:meta right now."); return; } restartRs(server, sleepTime); Index: hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java =================================================================== --- hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java (revision 1520311) +++ hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java (working copy) @@ -194,7 +194,7 @@ if (comparator instanceof RawBytesComparator){ throw new IllegalArgumentException("comparator must be KeyValue.KeyComparator"); } else if (comparator instanceof MetaComparator){ - throw new IllegalArgumentException("DataBlockEncoding.PREFIX_TREE not compatible with META " + throw new IllegalArgumentException("DataBlockEncoding.PREFIX_TREE not compatible with hbase:meta " +"table"); } Index: hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon =================================================================== --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (revision 1520311) +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (working copy) @@ -273,7 +273,7 @@ - + @@ -318,7 +318,7 @@ <%java>String description = null; if (tableName.equals(TableName.META_TABLE_NAME)){ - description = "The .META. table holds references to all User Table regions"; + description = "The hbase:meta table holds references to all User Table regions"; } else { description = "The .NAMESPACE. table holds information about namespaces."; } Index: hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon =================================================================== --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon (revision 1520311) +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon (working copy) @@ -68,9 +68,9 @@ the region named domains,apache.org,5464829424211263407 is party to the table domains, has an id of 5464829424211263407 and the first key - in the region is apache.org. The .META. 'table' is an internal + in the region is apache.org. The hbase:meta 'table' is an internal system table (or 'catalog' tables in db-speak). - The .META. table keeps a list of all regions in the system. The empty key is used to denote + The hbase:meta table keeps a list of all regions in the system. The empty key is used to denote table start and table end. A region with an empty start key is the first region in a table. If region has both an empty start and an empty end key, its the only region in the table. See HBase Home for further explication.

Index: hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (working copy) @@ -46,7 +46,7 @@ import com.google.protobuf.ServiceException; /** - * Writes region and assignment information to .META.. + * Writes region and assignment information to hbase:meta. * TODO: Put MetaReader and MetaEditor together; doesn't make sense having * them distinct. see HBASE-3475. */ @@ -93,9 +93,9 @@ } /** - * Put the passed p to the .META. table. + * Put the passed p to the hbase:meta table. * @param ct CatalogTracker on whose back we will ride the edit. - * @param p Put to add to .META. + * @param p Put to add to hbase:meta * @throws IOException */ static void putToMetaTable(final CatalogTracker ct, final Put p) @@ -128,9 +128,9 @@ } /** - * Put the passed ps to the .META. table. + * Put the passed ps to the hbase:meta table. * @param ct CatalogTracker on whose back we will ride the edit. - * @param ps Put to add to .META. + * @param ps Put to add to hbase:meta * @throws IOException */ public static void putsToMetaTable(final CatalogTracker ct, final List ps) @@ -144,9 +144,9 @@ } /** - * Delete the passed d from the .META. table. + * Delete the passed d from the hbase:meta table. * @param ct CatalogTracker on whose back we will ride the edit. - * @param d Delete to add to .META. + * @param d Delete to add to hbase:meta * @throws IOException */ static void deleteFromMetaTable(final CatalogTracker ct, final Delete d) @@ -157,9 +157,9 @@ } /** - * Delete the passed deletes from the .META. table. + * Delete the passed deletes from the hbase:meta table. * @param ct CatalogTracker on whose back we will ride the edit. - * @param deletes Deletes to add to .META. This list should support #remove. + * @param deletes Deletes to add to hbase:meta This list should support #remove. * @throws IOException */ public static void deleteFromMetaTable(final CatalogTracker ct, final List deletes) @@ -173,9 +173,9 @@ } /** - * Execute the passed mutations against .META. table. + * Execute the passed mutations against hbase:meta table. * @param ct CatalogTracker on whose back we will ride the edit. - * @param mutations Puts and Deletes to execute on .META. + * @param mutations Puts and Deletes to execute on hbase:meta * @throws IOException */ static void mutateMetaTable(final CatalogTracker ct, final List mutations) @@ -193,7 +193,7 @@ } /** - * Adds a META row for the specified new region. + * Adds a hbase:meta row for the specified new region. * @param regionInfo region information * @throws IOException if problem connecting or updating meta */ @@ -205,7 +205,7 @@ } /** - * Adds a META row for the specified new region to the given catalog table. The + * Adds a hbase:meta row for the specified new region to the given catalog table. The * HTable is not flushed or closed. * @param meta the HTable for META * @param regionInfo region information @@ -216,7 +216,7 @@ } /** - * Adds a (single) META row for the specified new region and its daughters. Note that this does + * Adds a (single) hbase:meta row for the specified new region and its daughters. Note that this does * not add its daughter's as different rows, but adds information about the daughters * in the same row as the parent. Use * {@link #splitRegion(CatalogTracker, HRegionInfo, HRegionInfo, HRegionInfo, ServerName)} @@ -238,7 +238,7 @@ } /** - * Adds a (single) META row for the specified new region and its daughters. Note that this does + * Adds a (single) hbase:meta row for the specified new region and its daughters. Note that this does * not add its daughter's as different rows, but adds information about the daughters * in the same row as the parent. Use * {@link #splitRegion(CatalogTracker, HRegionInfo, HRegionInfo, HRegionInfo, ServerName)} @@ -260,7 +260,7 @@ } /** - * Adds a META row for each of the specified new regions. + * Adds a hbase:meta row for each of the specified new regions. * @param catalogTracker CatalogTracker * @param regionInfos region information list * @throws IOException if problem connecting or updating meta @@ -297,7 +297,7 @@ /** * Merge the two regions into one in an atomic operation. Deletes the two - * merging regions in META and adds the merged region with the information of + * merging regions in hbase:meta and adds the merged region with the information of * two merging regions. * @param catalogTracker the catalog tracker * @param mergedRegion the merged region @@ -401,7 +401,7 @@ /** - * Updates the location of the specified META region in ROOT to be the + * Updates the location of the specified hbase:meta region in ROOT to be the * specified server hostname and startcode. *

* Uses passed catalog tracker to get a connection to the server hosting @@ -412,7 +412,7 @@ * @param sn Server name * @param openSeqNum the latest sequence number obtained when the region was open * @throws IOException - * @throws ConnectException Usually because the regionserver carrying .META. + * @throws ConnectException Usually because the regionserver carrying hbase:meta * is down. * @throws NullPointerException Because no -ROOT- server connection */ @@ -423,11 +423,11 @@ } /** - * Updates the location of the specified region in META to be the specified + * Updates the location of the specified region in hbase:meta to be the specified * server hostname and startcode. *

* Uses passed catalog tracker to get a connection to the server hosting - * META and makes edits to that region. + * hbase:meta and makes edits to that region. * * @param catalogTracker catalog tracker * @param regionInfo region to update location of @@ -494,7 +494,7 @@ } /** - * Adds and Removes the specified regions from .META. + * Adds and Removes the specified regions from hbase:meta * @param catalogTracker * @param regionsToRemove list of regions to be deleted from META * @param regionsToAdd list of regions to be added to META Index: hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java (working copy) @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.util.Bytes; /** - * A tool to migrate the data stored in META table to pbuf serialization. + * A tool to migrate the data stored in hbase:meta table to pbuf serialization. * Supports migrating from 0.92.x and 0.94.x to 0.96.x for the catalog table. * @deprecated will be removed for the major release after 0.96. */ @@ -132,19 +132,19 @@ LOG.info("META already up-to date with PB serialization"); return 0; } - LOG.info("META has Writable serializations, migrating META to PB serialization"); + LOG.info("META has Writable serializations, migrating hbase:meta to PB serialization"); try { long rows = updateMeta(services); LOG.info("META updated with PB serialization. Total rows updated: " + rows); return rows; } catch (IOException e) { - LOG.warn("Update META with PB serialization failed." + "Master startup aborted."); + LOG.warn("Update hbase:meta with PB serialization failed." + "Master startup aborted."); throw e; } } /** - * Update META rows, converting writable serialization to PB + * Update hbase:meta rows, converting writable serialization to PB * @return num migrated rows */ static long updateMeta(final MasterServices masterServices) throws IOException { @@ -163,7 +163,7 @@ static boolean isMetaTableUpdated(final CatalogTracker catalogTracker) throws IOException { List results = MetaReader.fullScanOfMeta(catalogTracker); if (results == null || results.isEmpty()) { - LOG.info(".META. doesn't have any entries to update."); + LOG.info("hbase:meta doesn't have any entries to update."); return true; } for (Result r : results) { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java (working copy) @@ -101,11 +101,11 @@ "Enable row order check; looks for out-of-order keys"); options.addOption("a", "checkfamily", false, "Enable family check"); options.addOption("f", "file", true, - "File to scan. Pass full-path; e.g. hdfs://a:9000/hbase/.META./12/34"); + "File to scan. Pass full-path; e.g. hdfs://a:9000/hbase/hbase:meta/12/34"); options.addOption("w", "seekToRow", true, "Seek to this row and print all the kvs for this row only"); options.addOption("r", "region", true, - "Region to scan. Pass region name; e.g. '.META.,,1'"); + "Region to scan. Pass region name; e.g. 'hbase:meta,,1'"); options.addOption("s", "stats", false, "Print statistics"); } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java (working copy) @@ -270,7 +270,7 @@ System.err.println("Usage: " + NAME + " [options] []"); System.err.println("Read all WAL entries for ."); System.err.println("If no tables (\"\") are specific, all tables are imported."); - System.err.println("(Careful, even -ROOT- and .META. entries will be imported in that case.)"); + System.err.println("(Careful, even -ROOT- and hbase:meta entries will be imported in that case.)"); System.err.println("Otherwise is a comma separated list of tables.\n"); System.err.println("The WAL entries can be mapped to new set of tables via ."); System.err.println(" is a command separated list of targettables."); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -148,7 +148,7 @@ private final int maximumAttempts; /** - * The sleep time for which the assignment will wait before retrying in case of META assignment + * The sleep time for which the assignment will wait before retrying in case of hbase:meta assignment * failure due to lack of availability of region plan */ private final long sleepTimeBeforeRetryingMetaAssignment; @@ -416,7 +416,7 @@ // TODO: Regions that have a null location and are not in regionsInTransitions // need to be handled. - // Scan META to build list of existing regions, servers, and assignment + // Scan hbase:meta to build list of existing regions, servers, and assignment // Returns servers who have not checked in (assumed dead) and their regions Map> deadServers = rebuildUserRegions(); @@ -1141,7 +1141,7 @@ Pair p = MetaReader.getRegion(catalogTracker, name); regionInfo = p.getFirst(); } catch (IOException e) { - LOG.info("Exception reading META doing HBCK repair operation", e); + LOG.info("Exception reading hbase:meta doing HBCK repair operation", e); return; } } @@ -1874,9 +1874,9 @@ continue; } // TODO : Ensure HBCK fixes this - LOG.error("Unable to determine a plan to assign META even after repeated attempts. Run HBCK to fix this"); + LOG.error("Unable to determine a plan to assign hbase:meta even after repeated attempts. Run HBCK to fix this"); } catch (InterruptedException e) { - LOG.error("Got exception while waiting for META assignment"); + LOG.error("Got exception while waiting for hbase:meta assignment"); Thread.currentThread().interrupt(); } } @@ -1895,7 +1895,7 @@ // In case of assignment from EnableTableHandler table state is ENABLING. Any how // EnableTableHandler will set ENABLED after assigning all the table regions. If we // try to set to ENABLED directly then client API may think table is enabled. - // When we have a case such as all the regions are added directly into .META. and we call + // When we have a case such as all the regions are added directly into hbase:meta and we call // assignRegion then we need to make the table ENABLED. Hence in such case the table // will not be in ENABLING or ENABLED state. TableName tableName = region.getTableName(); @@ -2453,13 +2453,13 @@ } /** - * Assigns the META region. + * Assigns the hbase:meta region. *

- * Assumes that META is currently closed and is not being actively served by + * Assumes that hbase:meta is currently closed and is not being actively served by * any RegionServer. *

* Forcibly unsets the current meta region location in ZooKeeper and assigns - * META to a random RegionServer. + * hbase:meta to a random RegionServer. * @throws KeeperException */ public void assignMeta() throws KeeperException { @@ -2573,7 +2573,7 @@ // See HBASE-6281. Set disabledOrDisablingOrEnabling = ZKTable.getDisabledOrDisablingTables(watcher); disabledOrDisablingOrEnabling.addAll(ZKTable.getEnablingTables(watcher)); - // Scan META for all user regions, skipping any disabled tables + // Scan hbase:meta for all user regions, skipping any disabled tables Map allRegions; SnapshotOfRegionAssignmentFromMeta snapshotOfRegionAssignment = new SnapshotOfRegionAssignmentFromMeta(catalogTracker, disabledOrDisablingOrEnabling, true); @@ -2677,7 +2677,7 @@ if (regionLocation == null) { // regionLocation could be null if createTable didn't finish properly. // When createTable is in progress, HMaster restarts. - // Some regions have been added to .META., but have not been assigned. + // Some regions have been added to hbase:meta, but have not been assigned. // When this happens, the region's table must be in ENABLING state. // It can't be in ENABLED state as that is set when all regions are // assigned. @@ -2770,7 +2770,7 @@ } /** - * Processes list of dead servers from result of META scan and regions in RIT + * Processes list of dead servers from result of hbase:meta scan and regions in RIT *

* This is used for failover to recover the lost regions that belonged to * RegionServers which failed while there was no active master or regions Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java (working copy) @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.util.Triple; /** - * A janitor for the catalog tables. Scans the .META. catalog + * A janitor for the catalog tables. Scans the hbase:meta catalog * table on a period looking for unused regions to garbage collect. */ @InterfaceAudience.Private @@ -108,7 +108,7 @@ } /** - * Scans META and returns a number of scanned rows, and a map of merged + * Scans hbase:meta and returns a number of scanned rows, and a map of merged * regions, and an ordered map of split parents. * @return triple of scanned rows, map of merged regions and map of split * parent regioninfos @@ -120,7 +120,7 @@ } /** - * Scans META and returns a number of scanned rows, and a map of merged + * Scans hbase:meta and returns a number of scanned rows, and a map of merged * regions, and an ordered map of split parents. if the given table name is * null, return merged regions and split parents of all tables, else only the * specified table @@ -132,14 +132,14 @@ Triple, Map> getMergedRegionsAndSplitParents( final TableName tableName) throws IOException { final boolean isTableSpecified = (tableName != null); - // TODO: Only works with single .META. region currently. Fix. + // TODO: Only works with single hbase:meta region currently. Fix. final AtomicInteger count = new AtomicInteger(0); // Keep Map of found split parents. There are candidates for cleanup. // Use a comparator that has split parents come before its daughters. final Map splitParents = new TreeMap(new SplitParentFirstComparator()); final Map mergedRegions = new TreeMap(); - // This visitor collects split parents and counts rows in the .META. table + // This visitor collects split parents and counts rows in the hbase:meta table MetaScannerVisitor visitor = new MetaScanner.MetaScannerVisitorBase() { @Override @@ -162,7 +162,7 @@ } }; - // Run full scan of .META. catalog table passing in our custom visitor with + // Run full scan of hbase:meta catalog table passing in our custom visitor with // the start row MetaScanner.metaScan(server.getConfiguration(), null, visitor, tableName); @@ -172,11 +172,11 @@ /** * If merged region no longer holds reference to the merge regions, archive - * merge region on hdfs and perform deleting references in .META. + * merge region on hdfs and perform deleting references in hbase:meta * @param mergedRegion * @param regionA * @param regionB - * @return true if we delete references in merged region on .META. and archive + * @return true if we delete references in merged region on hbase:meta and archive * the files on the file system * @throws IOException */ @@ -207,7 +207,7 @@ } /** - * Run janitorial scan of catalog .META. table looking for + * Run janitorial scan of catalog hbase:meta table looking for * garbage to collect. * @return number of cleaned regions * @throws IOException Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java (working copy) @@ -147,7 +147,7 @@ // We're reusing an existing protobuf message, but we don't send everything. // This could be extended in the future, for example if we want to send stuff like the - // META server name. + // hbase:meta server name. ClusterStatus cs = new ClusterStatus(VersionInfo.getVersion(), master.getMasterFileSystem().getClusterId().toString(), null, Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -826,7 +826,7 @@ } // 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 previouslyFailedServers = this.fileSystemManager .getFailedServersFromLogFolders(); @@ -834,7 +834,7 @@ // 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 @@ // 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 @@ 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 @@ } /** - * Check .META. is assigned. If not, assign it. + * Check hbase:meta is assigned. If not, assign it. * @param status MonitoredTask * @throws InterruptedException * @throws IOException @@ -987,7 +987,7 @@ 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 @@ 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 @@ } 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 regions = new HashSet(); 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 @@ // See HBASE-6281. Set 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 allRegions = MetaReader.fullScan(catalogTracker, disabledOrDisablingOrEnabling, true); for(Iterator iter = allRegions.keySet().iterator(); @@ -1172,7 +1172,7 @@ } /** - * 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 @@ 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 @@ /** * 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; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (working copy) @@ -135,7 +135,7 @@ * Create initial layout in filesystem. *

    *
  1. 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. *
  2. *
  3. Create a log archive directory for RS to put archived logs
  4. *
@@ -482,7 +482,7 @@ .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 @@ 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 @@ } /** - * Enable in memory caching for .META. + * Enable in memory caching for hbase:meta */ public static void setInfoFamilyCachingForMeta(final boolean b) { for (HColumnDescriptor hcd: Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java (working copy) @@ -631,20 +631,20 @@ } /** - * 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> 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 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 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 @@ // 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 @@ 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(); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java (working copy) @@ -413,7 +413,7 @@ /** * Gets the online regions of the specified table. - * This method looks at the in-memory state. It does not go to .META.. + * This method looks at the in-memory state. It does not go to hbase:meta. * Only returns online 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 @@ } /** - * 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 @@ 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; } } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java (working copy) @@ -66,7 +66,7 @@ /** the regionServer to region map */ private final Map> 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 disabledTables; private final boolean excludeOfflinedSplitParents; @@ -88,11 +88,11 @@ } /** - * 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 @@ } } }; - // 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"); } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java (working copy) @@ -307,7 +307,7 @@ } /** - * 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. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java (working copy) @@ -672,9 +672,9 @@ 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; } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java (working copy) @@ -86,7 +86,7 @@ } return getClass().getSimpleName() + "-" + name + "-" + getSeqid(); } - + @Override public void process() { LOG.debug("Handling CLOSED event for " + regionInfo.getEncodedName()); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java (working copy) @@ -86,7 +86,7 @@ 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 @@ // 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 @@ } /** - * 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 regionInfos) throws IOException { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java (working copy) @@ -37,7 +37,7 @@ import org.apache.zookeeper.KeeperException; /** - * Shutdown handler for the server hosting .META. + * Shutdown handler for the server hosting hbase:meta */ @InterfaceAudience.Private public class MetaServerShutdownHandler extends ServerShutdownHandler { @@ -56,7 +56,7 @@ 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 regions = new HashSet(); regions.add(HRegionInfo.FIRST_META_REGIONINFO); @@ -125,12 +125,12 @@ } /** - * Before assign the META region, ensure it haven't + * Before assign the hbase:meta region, ensure it haven't * been assigned by other place *

- * 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 @@ 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()); } } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java (working copy) @@ -86,7 +86,7 @@ public HRegionInfo getHRegionInfo() { return this.regionInfo; } - + @Override public String toString() { String name = "UnknownServerName"; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (working copy) @@ -99,7 +99,7 @@ } /** - * @return True if the server we are processing was carrying .META. + * @return True if the server we are processing was carrying hbase:meta */ boolean isCarryingMeta() { return false; @@ -121,16 +121,16 @@ 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 @@ // 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 @@ // 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 hris = null; while (!this.server.isStopped()) { try { @@ -173,8 +173,8 @@ 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 @@ 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; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java (working copy) @@ -95,7 +95,7 @@ /** * 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 handleCreateHdfsRegions(final Path tableRootDir, Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java (working copy) @@ -143,7 +143,7 @@ /** * 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 regions = MetaReader.getTableRegions(this.services.getCatalogTracker(), Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java (working copy) @@ -100,8 +100,8 @@ * 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 @@ // 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 @@ // // 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()); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java (working copy) @@ -62,7 +62,7 @@ /** * 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. */ Index: hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java (working copy) @@ -59,8 +59,8 @@ * Upgrades old 0.94 filesystem layout to namespace layout * Does the following: * - * - creates system namespace directory and move .META. table there - * renaming .META. table to hbase:meta, + * - creates system namespace directory and move .META. table there + * renaming .META. table to hbase:meta, * this in turn would require to re-encode the region directory name * *

The pre-0.96 paths and dir names are hardcoded in here. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java (working copy) @@ -56,7 +56,7 @@ * @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) { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (working copy) @@ -599,7 +599,7 @@ 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 @@ /** * Inserts a new region's meta information into the passed * meta 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 meta * * @throws IOException Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java (working copy) @@ -742,7 +742,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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(); } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -1654,7 +1654,7 @@ //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 @@ /** * Gets the online regions of the specified table. - * This method looks at the in-memory onlineRegions. It does not go to .META.. + * This method looks at the in-memory onlineRegions. It does not go to hbase:meta. * Only returns online 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 @@ 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 p = MetaReader.getRegion( this.catalogTracker, region.getRegionName()); @@ -3516,7 +3516,7 @@ } } 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); } } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java (working copy) @@ -48,7 +48,7 @@ /** * 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. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java (working copy) @@ -112,7 +112,7 @@ } 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 " Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java (working copy) @@ -202,7 +202,7 @@ } // 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 @@ 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 @@ 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 @@ } /** - * 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 Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java (working copy) @@ -106,7 +106,7 @@ } 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 " Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (working copy) @@ -181,7 +181,7 @@ 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 @@ 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 @@ // 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 @@ 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. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java (working copy) @@ -240,7 +240,7 @@ /** * 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. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (working copy) @@ -48,7 +48,7 @@ /** 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"; /** Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java (working copy) @@ -418,7 +418,7 @@ } 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)) { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java (working copy) @@ -325,7 +325,7 @@ 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."); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java (working copy) @@ -1528,7 +1528,7 @@ // 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) Index: hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html (working copy) @@ -387,7 +387,7 @@ 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 Index: hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java (working copy) @@ -210,7 +210,7 @@ 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 @@ 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() || Index: hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java (working copy) @@ -219,7 +219,7 @@ } /** - * 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 > parentsMap; @@ -258,7 +258,7 @@ /** * 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 getRegionsToRestore() { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java (working copy) @@ -50,7 +50,7 @@ } /** - * 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 @@ * 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 Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java (working copy) @@ -148,7 +148,7 @@ 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); @@ -489,7 +489,7 @@ 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; } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (working copy) @@ -975,7 +975,7 @@ // 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 @@ /** * 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 @@ /** * 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. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (working copy) @@ -119,7 +119,7 @@ * HBaseFsck (hbck) is a tool for checking and repairing region consistency and * table integrity problems in a corrupted HBase. *

- * Region consistency checks verify that .META., region deployment on region + * Region consistency checks verify that hbase:meta, region deployment on region * servers and the state of data in HDFS (.regioninfo files) all are in * accordance. *

@@ -131,7 +131,7 @@ * The general repair strategy works in two phases: *

    *
  1. Repair Table Integrity on HDFS. (merge or fabricate regions) - *
  2. Repair Region Consistency with .META. and assignments + *
  3. Repair Region Consistency with hbase:meta and assignments *
*

* For table integrity repairs, the tables' region directories are scanned @@ -143,7 +143,7 @@ *

* Table integrity repairs deal solely with HDFS and could potentially be done * offline -- the hbase region servers or master do not need to be running. - * This phase can eventually be used to completely reconstruct the META table in + * This phase can eventually be used to completely reconstruct the hbase:meta table in * an offline fashion. *

* Region consistency requires three conditions -- 1) valid .regioninfo file @@ -203,7 +203,7 @@ private boolean fixTableLocks = false; // fix table locks which are expired // limit checking/fixes to listed tables, if empty attempt to check/fix all - // .META. are always checked + // hbase:meta are always checked private Set tablesIncluded = new HashSet(); private int maxMerge = DEFAULT_MAX_MERGE; // maximum number of overlapping regions to merge private int maxOverlapsToSideline = DEFAULT_OVERLAPS_TO_SIDELINE; // maximum number of overlapping regions to sideline @@ -229,7 +229,7 @@ private TreeMap regionInfoMap = new TreeMap(); private TreeSet disabledTables = new TreeSet(); - // Empty regioninfo qualifiers in .META. + // Empty regioninfo qualifiers in hbase:meta private Set emptyRegionInfoQualifiers = new HashSet(); /** @@ -385,7 +385,7 @@ /** * This repair method requires the cluster to be online since it contacts * region servers and the masters. It makes each region's state in HDFS, in - * .META., and deployments consistent. + * hbase:meta, and deployments consistent. * * @return If > 0 , number of errors detected, if < 0 there was an unrecoverable * error. If 0, we have a clean hbase. @@ -396,32 +396,32 @@ // get regions according to what is online on each RegionServer loadDeployedRegions(); - // check whether .META. is deployed and online + // check whether hbase:meta is deployed and online if (!recordMetaRegion()) { // Will remove later if we can fix it - errors.reportError("Fatal error: unable to get .META. region location. Exiting..."); + errors.reportError("Fatal error: unable to get hbase:meta region location. Exiting..."); return -2; } - // Check if .META. is found only once and in the right place + // Check if hbase:meta is found only once and in the right place if (!checkMetaRegion()) { - String errorMsg = ".META. table is not consistent. "; + String errorMsg = "hbase:meta table is not consistent. "; if (shouldFixAssignments()) { - errorMsg += "HBCK will try fixing it. Rerun once .META. is back to consistent state."; + errorMsg += "HBCK will try fixing it. Rerun once hbase:meta is back to consistent state."; } else { - errorMsg += "Run HBCK with proper fix options to fix .META. inconsistency."; + errorMsg += "Run HBCK with proper fix options to fix hbase:meta inconsistency."; } errors.reportError(errorMsg + " Exiting..."); return -2; } - // Not going with further consistency check for tables when META itself is not consistent. - LOG.info("Loading regionsinfo from the .META. table"); + // Not going with further consistency check for tables when hbase:meta itself is not consistent. + LOG.info("Loading regionsinfo from the hbase:meta table"); boolean success = loadMetaEntries(); if (!success) return -1; - // Empty cells in .META.? + // Empty cells in hbase:meta? reportEmptyMetaCells(); - // Check if we have to cleanup empty REGIONINFO_QUALIFIER rows from .META. + // Check if we have to cleanup empty REGIONINFO_QUALIFIER rows from hbase:meta if (shouldFixEmptyMetaCells()) { fixEmptyMetaCells(); } @@ -647,7 +647,7 @@ isReference = StoreFileInfo.isReference(path); } catch (Throwable t) { // Ignore. Some files may not be store files at all. - // For example, files under .oldlogs folder in .META. + // For example, files under .oldlogs folder in hbase:meta // Warning message is already logged by // StoreFile#isReference. } @@ -693,7 +693,7 @@ * TODO -- need to add tests for this. */ private void reportEmptyMetaCells() { - errors.print("Number of empty REGIONINFO_QUALIFIER rows in .META.: " + + errors.print("Number of empty REGIONINFO_QUALIFIER rows in hbase:meta: " + emptyRegionInfoQualifiers.size()); if (details) { for (Result r: emptyRegionInfoQualifiers) { @@ -805,7 +805,7 @@ // get table name from hdfs, populate various HBaseFsck tables. TableName tableName = hbi.getTableName(); if (tableName == null) { - // There was an entry in META not in the HDFS? + // There was an entry in hbase:meta not in the HDFS? LOG.warn("tableName was null for: " + hbi); continue; } @@ -877,12 +877,12 @@ } /** - * To fix the empty REGIONINFO_QUALIFIER rows from .META.
+ * To fix the empty REGIONINFO_QUALIFIER rows from hbase:meta
* @throws IOException */ public void fixEmptyMetaCells() throws IOException { if (shouldFixEmptyMetaCells() && !emptyRegionInfoQualifiers.isEmpty()) { - LOG.info("Trying to fix empty REGIONINFO_QUALIFIER .META. rows."); + LOG.info("Trying to fix empty REGIONINFO_QUALIFIER hbase:meta rows."); for (Result region : emptyRegionInfoQualifiers) { deleteMetaRegion(region.getRow()); errors.getErrorList().remove(ERROR_CODE.EMPTY_META_CELL); @@ -956,7 +956,7 @@ /** * This borrows code from MasterFileSystem.bootstrap() * - * @return an open .META. HRegion + * @return an open hbase:meta HRegion */ private HRegion createNewMeta() throws IOException { Path rootdir = FSUtils.getRootDir(getConf()); @@ -982,7 +982,7 @@ for (Entry e : tablesInfo.entrySet()) { TableName name = e.getKey(); - // skip ".META." + // skip "hbase:meta" if (name.compareTo(TableName.META_TABLE_NAME) == 0) { continue; } @@ -1065,23 +1065,23 @@ } // we can rebuild, move old meta out of the way and start - LOG.info("HDFS regioninfo's seems good. Sidelining old .META."); + LOG.info("HDFS regioninfo's seems good. Sidelining old hbase:meta"); Path backupDir = sidelineOldMeta(); - LOG.info("Creating new .META."); + LOG.info("Creating new hbase:meta"); HRegion meta = createNewMeta(); // populate meta List puts = generatePuts(tablesInfo); if (puts == null) { - LOG.fatal("Problem encountered when creating new .META. entries. " + - "You may need to restore the previously sidelined .META."); + LOG.fatal("Problem encountered when creating new hbase:meta entries. " + + "You may need to restore the previously sidelined hbase:meta"); return false; } meta.batchMutate(puts.toArray(new Put[0])); HRegion.closeHRegion(meta); - LOG.info("Success! .META. table rebuilt."); - LOG.info("Old .META. is moved into " + backupDir); + LOG.info("Success! hbase:meta table rebuilt."); + LOG.info("Old hbase:meta is moved into " + backupDir); return true; } @@ -1222,7 +1222,7 @@ * @return Path to backup of original directory */ Path sidelineOldMeta() throws IOException { - // put current .META. aside. + // put current hbase:meta aside. Path hbaseDir = FSUtils.getRootDir(getConf()); FileSystem fs = hbaseDir.getFileSystem(getConf()); Path backupDir = getSidelineDir(); @@ -1232,7 +1232,7 @@ sidelineTable(fs, TableName.META_TABLE_NAME, hbaseDir, backupDir); } catch (IOException e) { LOG.fatal("... failed to sideline meta. Currently in inconsistent state. To restore " - + "try to rename .META. in " + backupDir.getName() + " to " + + "try to rename hbase:meta in " + backupDir.getName() + " to " + hbaseDir.getName() + ".", e); throw e; // throw original exception } @@ -1332,7 +1332,7 @@ } /** - * Record the location of the META region as found in ZooKeeper. + * Record the location of the hbase:meta region as found in ZooKeeper. */ private boolean recordMetaRegion() throws IOException { HRegionLocation metaLocation = connection.locateRegion( @@ -1574,7 +1574,7 @@ HRegionInfo hri = HRegionInfo.getHRegionInfo(r); if (hri == null) { LOG.warn("Unable to close region " + hi.getRegionNameAsString() - + " because META had invalid or missing " + + " because hbase:meta had invalid or missing " + HConstants.CATALOG_FAMILY_STR + ":" + Bytes.toString(HConstants.REGIONINFO_QUALIFIER) + " qualifier value."); @@ -1637,13 +1637,13 @@ LOG.warn("Region " + descriptiveName + " was recently modified -- skipping"); return; } - // ========== Cases where the region is not in META ============= + // ========== Cases where the region is not in hbase:meta ============= else if (!inMeta && !inHdfs && !isDeployed) { // We shouldn't have record of this region at all then! assert false : "Entry for region with no data"; } else if (!inMeta && !inHdfs && isDeployed) { errors.reportError(ERROR_CODE.NOT_IN_META_HDFS, "Region " - + descriptiveName + ", key=" + key + ", not on HDFS or in META but " + + + descriptiveName + ", key=" + key + ", not on HDFS or in hbase:meta but " + "deployed on " + Joiner.on(", ").join(hbi.deployedOn)); if (shouldFixAssignments()) { undeployRegions(hbi); @@ -1651,7 +1651,7 @@ } else if (!inMeta && inHdfs && !isDeployed) { errors.reportError(ERROR_CODE.NOT_IN_META_OR_DEPLOYED, "Region " - + descriptiveName + " on HDFS, but not listed in META " + + + descriptiveName + " on HDFS, but not listed in hbase:meta " + "or deployed on any region server"); // restore region consistency of an adopted orphan if (shouldFixMeta()) { @@ -1662,7 +1662,7 @@ return; } - LOG.info("Patching .META. with .regioninfo: " + hbi.getHdfsHRI()); + LOG.info("Patching hbase:meta with .regioninfo: " + hbi.getHdfsHRI()); HBaseFsckRepair.fixMetaHoleOnline(getConf(), hbi.getHdfsHRI()); tryAssignmentRepair(hbi, "Trying to reassign region..."); @@ -1678,13 +1678,13 @@ return; } - LOG.info("Patching .META. with with .regioninfo: " + hbi.getHdfsHRI()); + LOG.info("Patching hbase:meta with with .regioninfo: " + hbi.getHdfsHRI()); HBaseFsckRepair.fixMetaHoleOnline(getConf(), hbi.getHdfsHRI()); tryAssignmentRepair(hbi, "Trying to fix unassigned region..."); } - // ========== Cases where the region is in META ============= + // ========== Cases where the region is in hbase:meta ============= } else if (inMeta && inHdfs && !isDeployed && splitParent) { // check whether this is an actual error, or just transient state where parent // is not cleaned @@ -1742,7 +1742,7 @@ } } else if (inMeta && inHdfs && isMultiplyDeployed) { errors.reportError(ERROR_CODE.MULTI_DEPLOYED, "Region " + descriptiveName - + " is listed in META on region server " + hbi.metaEntry.regionServer + + " is listed in hbase:meta on region server " + hbi.metaEntry.regionServer + " but is multiply assigned to region servers " + Joiner.on(", ").join(hbi.deployedOn)); // If we are trying to fix the errors @@ -1753,7 +1753,7 @@ } } else if (inMeta && inHdfs && isDeployed && !deploymentMatchesMeta) { errors.reportError(ERROR_CODE.SERVER_DOES_NOT_MATCH_META, "Region " - + descriptiveName + " listed in META on region server " + + + descriptiveName + " listed in hbase:meta on region server " + hbi.metaEntry.regionServer + " but found on region server " + hbi.deployedOn.get(0)); // If we are trying to fix the errors @@ -2504,10 +2504,10 @@ } /** - * Check values in regionInfo for .META. - * Check if zero or more than one regions with META are found. + * Check values in regionInfo for hbase:meta + * Check if zero or more than one regions with hbase:meta are found. * If there are inconsistencies (i.e. zero or more than one regions - * pretend to be holding the .META.) try to fix that and report an error. + * pretend to be holding the hbase:meta) try to fix that and report an error. * @throws IOException from HBaseFsckRepair functions * @throws KeeperException * @throws InterruptedException @@ -2520,15 +2520,15 @@ } } - // There will be always one entry in regionInfoMap corresponding to .META. + // There will be always one entry in regionInfoMap corresponding to hbase:meta // Check the deployed servers. It should be exactly one server. HbckInfo metaHbckInfo = metaRegions.get(0); List servers = metaHbckInfo.deployedOn; if (servers.size() != 1) { if (servers.size() == 0) { - errors.reportError(ERROR_CODE.NO_META_REGION, ".META. is not found on any region."); + errors.reportError(ERROR_CODE.NO_META_REGION, "hbase:meta is not found on any region."); if (shouldFixAssignments()) { - errors.print("Trying to fix a problem with .META..."); + errors.print("Trying to fix a problem with hbase:meta.."); setShouldRerun(); // try to fix it (treat it as unassigned region) HBaseFsckRepair.fixUnassigned(admin, metaHbckInfo.metaEntry); @@ -2536,9 +2536,9 @@ } } else if (servers.size() > 1) { errors - .reportError(ERROR_CODE.MULTI_META_REGION, ".META. is found on more than one region."); + .reportError(ERROR_CODE.MULTI_META_REGION, "hbase:meta is found on more than one region."); if (shouldFixAssignments()) { - errors.print("Trying to fix a problem with .META..."); + errors.print("Trying to fix a problem with hbase:meta.."); setShouldRerun(); // try fix it (treat is a dupe assignment) HBaseFsckRepair.fixMultiAssignment(admin, metaHbckInfo.metaEntry, servers); @@ -2552,7 +2552,7 @@ } /** - * Scan .META., adding all regions found to the regionInfo map. + * Scan hbase:meta, adding all regions found to the regionInfo map. * @throws IOException if an error is encountered */ boolean loadMetaEntries() throws IOException { @@ -2569,13 +2569,13 @@ public boolean processRow(Result result) throws IOException { try { - // record the latest modification of this META record + // record the latest modification of this hbase:meta record long ts = Collections.max(result.list(), comp).getTimestamp(); Pair pair = HRegionInfo.getHRegionInfoAndServerName(result); if (pair == null || pair.getFirst() == null) { emptyRegionInfoQualifiers.add(result); errors.reportError(ERROR_CODE.EMPTY_META_CELL, - "Empty REGIONINFO_QUALIFIER found in .META."); + "Empty REGIONINFO_QUALIFIER found in hbase:meta"); return true; } ServerName sn = null; @@ -2595,7 +2595,7 @@ } else if (previous.metaEntry == null) { previous.metaEntry = m; } else { - throw new IOException("Two entries in META are same " + previous); + throw new IOException("Two entries in hbase:meta are same " + previous); } // show proof of progress to the user, once for every 100 records. @@ -2611,7 +2611,7 @@ } }; if (!checkMetaOnly) { - // Scan .META. to pick up user regions + // Scan hbase:meta to pick up user regions MetaScanner.metaScan(getConf(), visitor); } @@ -3245,8 +3245,8 @@ } /** - * Set META check mode. - * Print only info about META table deployment/state + * Set hbase:meta check mode. + * Print only info about hbase:meta table deployment/state */ void setCheckMetaOnly() { checkMetaOnly = true; @@ -3419,7 +3419,7 @@ /** * We are interested in only those tables that have not changed their state in - * META during the last few seconds specified by hbase.admin.fsck.timelag + * hbase:meta during the last few seconds specified by hbase.admin.fsck.timelag * @param seconds - the time in seconds */ public void setTimeLag(long seconds) { @@ -3467,7 +3467,7 @@ out.println(" -sleepBeforeRerun Sleep this many seconds" + " before checking if the fix worked if run with -fix"); out.println(" -summary Print only summary of the tables and status."); - out.println(" -metaonly Only check the state of the .META. table."); + out.println(" -metaonly Only check the state of the hbase:meta table."); out.println(" -sidelineDir HDFS path to backup existing meta."); out.println(""); @@ -3476,7 +3476,7 @@ out.println(" -fixAssignments Try to fix region assignments. Replaces the old -fix"); out.println(" -fixMeta Try to fix meta problems. This assumes HDFS region info is good."); out.println(" -noHdfsChecking Don't load/check region info from HDFS." - + " Assumes META region info is good. Won't check/fix any HDFS issue, e.g. hole, orphan, or overlap"); + + " Assumes hbase:meta region info is good. Won't check/fix any HDFS issue, e.g. hole, orphan, or overlap"); out.println(" -fixHdfsHoles Try to fix region holes in hdfs."); out.println(" -fixHdfsOrphans Try to fix region dirs with no .regioninfo file in hdfs"); out.println(" -fixTableOrphans Try to fix table dirs with no .tableinfo file in hdfs (online mode only)"); @@ -3488,7 +3488,7 @@ out.println(" -fixSplitParents Try to force offline split parents to be online."); out.println(" -ignorePreCheckPermission ignore filesystem permission pre-check"); out.println(" -fixReferenceFiles Try to offline lingering reference store files"); - out.println(" -fixEmptyMetaCells Try to fix .META. entries not referencing any region" + out.println(" -fixEmptyMetaCells Try to fix hbase:meta entries not referencing any region" + " (empty REGIONINFO_QUALIFIER rows)"); out.println(""); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java (working copy) @@ -338,10 +338,10 @@ } private static boolean isTableDir(final FileSystem fs, final Path path) throws IOException { - // check for old format, of having /table/.tableinfo; .META. doesn't has .tableinfo, + // check for old format, of having /table/.tableinfo; hbase:meta doesn't has .tableinfo, // include it. return (FSTableDescriptors.getTableInfoPath(fs, path) != null || FSTableDescriptors - .getCurrentTableInfoStatus(fs, path, false) != null) || path.toString().endsWith(".META."); + .getCurrentTableInfoStatus(fs, path, false) != null) || path.toString().endsWith(".META."); } private static boolean isRegionDir(final FileSystem fs, final Path path) throws IOException { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java (working copy) @@ -70,7 +70,7 @@ * Scans the table and merges two adjacent regions if they are small. This * only happens when a lot of rows are deleted. * - * When merging the META region, the HBase instance must be offline. + * When merging the hbase:meta region, the HBase instance must be offline. * When merging a normal table, the HBase instance must be online, but the * table must be disabled. * @@ -89,7 +89,7 @@ * Scans the table and merges two adjacent regions if they are small. This * only happens when a lot of rows are deleted. * - * When merging the META region, the HBase instance must be offline. + * When merging the hbase:meta region, the HBase instance must be offline. * When merging a normal table, the HBase instance must be online, but the * table must be disabled. * @@ -116,7 +116,7 @@ if (tableName.equals(TableName.META_TABLE_NAME)) { if (masterIsRunning) { throw new IllegalStateException( - "Can not compact META table if instance is on-line"); + "Can not compact hbase:meta table if instance is on-line"); } // TODO reenable new OfflineMerger(conf, fs).process(); } else { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java (working copy) @@ -211,7 +211,7 @@ * Removes a region's meta information from the passed meta * region. * - * @param meta META HRegion to be updated + * @param meta hbase:meta HRegion to be updated * @param regioninfo HRegionInfo of region to remove from meta * * @throws IOException @@ -231,7 +231,7 @@ * Adds a region's meta information from the passed meta * region. * - * @param metainfo META HRegionInfo to be updated + * @param metainfo hbase:meta HRegionInfo to be updated * @param region HRegion to add to meta * * @throws IOException Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java (working copy) @@ -122,7 +122,7 @@ } try { for (HRegion r: metaRegions.values()) { - LOG.info("CLOSING META " + r.toString()); + LOG.info("CLOSING hbase:meta " + r.toString()); r.close(); } } catch (IOException e) { Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java (working copy) @@ -57,7 +57,7 @@ /** * Create new set of regions on the specified file-system. - * NOTE: that you should add the regions to .META. after this operation. + * NOTE: that you should add the regions to hbase:meta after this operation. * * @param conf {@link Configuration} * @param rootDir Root directory for HBase instance @@ -72,7 +72,7 @@ /** * Create new set of regions on the specified file-system. - * NOTE: that you should add the regions to .META. after this operation. + * NOTE: that you should add the regions to hbase:meta after this operation. * * @param conf {@link Configuration} * @param rootDir Root directory for HBase instance Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java (working copy) @@ -660,7 +660,7 @@ continue; } } catch (NoServerForRegionException nsfre) { - // NSFRE will occur if the old META entry has no server assigned + // NSFRE will occur if the old hbase:meta entry has no server assigned LOG.info(nsfre); logicalSplitting.add(region); continue; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java (working copy) @@ -140,7 +140,7 @@ String znode = ZKUtil.joinZNode(zkw.tableZNode, table); // Delete -ROOT- table state znode since its no longer present in 0.95.0 // onwards. - if (table.equals("-ROOT-") || table.equals(".META.")) { + if (table.equals("-ROOT-") || table.equals(".META.")) { ZKUtil.deleteNode(zkw, znode); continue; } Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java (revision 1520311) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java (working copy) @@ -34,7 +34,7 @@ /** * This code is used to rebuild meta off line from file system data. If there * are any problem detected, it will fail suggesting actions for the user to do - * to "fix" problems. If it succeeds, it will backup the previous .META. and + * to "fix" problems. If it succeeds, it will backup the previous hbase:meta and * -ROOT- dirs and write new tables in place. * * This is an advanced feature, so is only exposed for use if explicitly Index: hbase-server/src/test/data/TestMetaMigrationConvertToPB.README =================================================================== --- hbase-server/src/test/data/TestMetaMigrationConvertToPB.README (revision 1520311) +++ hbase-server/src/test/data/TestMetaMigrationConvertToPB.README (working copy) @@ -19,7 +19,7 @@ TestMetaMigrationConvertToPB uses the file TestMetaMigrationConvertToPB.tgz for testing upgrade to 0.96 from 0.92/0.94 cluster data. The files are untarred to the local filesystem, and copied over to a minidfscluster. However, since the directory -name .META. causes problems on Windows, it has been renamed to -META- inside +name hbase:meta causes problems on Windows, it has been renamed to -META- inside the .tgz file. After untarring and copying the contents to minidfs, -TestMetaMigrationConvertToPB.setUpBeforeClass() renames the file back to .META. +TestMetaMigrationConvertToPB.setUpBeforeClass() renames the file back to hbase:meta See https://issues.apache.org/jira/browse/HBASE-6821. Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java (working copy) @@ -246,7 +246,7 @@ } /** - * Get the ServerName of region server serving the first META region + * Get the ServerName of region server serving the first hbase:meta region */ public ServerName getServerHoldingMeta() throws IOException { return getServerHoldingRegion(HRegionInfo.FIRST_META_REGIONINFO.getRegionName()); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -883,7 +883,7 @@ Configuration c = new Configuration(this.conf); this.hbaseCluster = new MiniHBaseCluster(c, numMasters, numSlaves, masterClass, regionserverClass); - // Don't leave here till we've done a successful scan of the .META. + // Don't leave here till we've done a successful scan of the hbase:meta HTable t = new HTable(c, TableName.META_TABLE_NAME); ResultScanner s = t.getScanner(new Scan()); while (s.next() != null) { @@ -905,7 +905,7 @@ */ public void restartHBaseCluster(int servers) throws IOException, InterruptedException { this.hbaseCluster = new MiniHBaseCluster(this.conf, servers); - // Don't leave here till we've done a successful scan of the .META. + // Don't leave here till we've done a successful scan of the hbase:meta HTable t = new HTable(new Configuration(this.conf), TableName.META_TABLE_NAME); ResultScanner s = t.getScanner(new Scan()); while (s.next() != null) { @@ -1146,7 +1146,7 @@ desc.addFamily(hcd); } getHBaseAdmin().createTable(desc, startKey, endKey, numRegions); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(getConfiguration(), tableName); } @@ -1172,7 +1172,7 @@ desc.addFamily(hcd); } getHBaseAdmin().createTable(desc); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(c, tableName); } @@ -1220,7 +1220,7 @@ desc.addFamily(hcd); } getHBaseAdmin().createTable(desc); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(c, tableName); } @@ -1304,7 +1304,7 @@ desc.addFamily(hcd); } getHBaseAdmin().createTable(desc); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(new Configuration(getConfiguration()), tableName); } @@ -1341,7 +1341,7 @@ desc.addFamily(hcd); } getHBaseAdmin().createTable(desc); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(new Configuration(getConfiguration()), tableName); } @@ -1380,7 +1380,7 @@ i++; } getHBaseAdmin().createTable(desc); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(new Configuration(getConfiguration()), tableName); } @@ -1412,7 +1412,7 @@ HColumnDescriptor hcd = new HColumnDescriptor(family); desc.addFamily(hcd); getHBaseAdmin().createTable(desc, splitRows); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(tableName); return new HTable(getConfiguration(), tableName); } @@ -1433,7 +1433,7 @@ desc.addFamily(hcd); } getHBaseAdmin().createTable(desc, splitRows); - // HBaseAdmin only waits for regions to appear in META we should wait until they are assigned + // HBaseAdmin only waits for regions to appear in hbase:meta we should wait until they are assigned waitUntilAllRegionsAssigned(TableName.valueOf(tableName)); return new HTable(getConfiguration(), tableName); } @@ -1849,7 +1849,7 @@ } /** - * Create rows in META for regions of the specified table with the specified + * Create rows in hbase:meta for regions of the specified table with the specified * start keys. The first startKey should be a 0 length byte array if you * want to form a proper range of regions. * @param conf @@ -1878,7 +1878,7 @@ } /** - * Returns all rows from the .META. table. + * Returns all rows from the hbase:meta table. * * @throws IOException When reading the rows fails. */ @@ -1898,7 +1898,7 @@ } /** - * Returns all rows from the .META. table for a given user table + * Returns all rows from the hbase:meta table for a given user table * * @throws IOException When reading the rows fails. */ @@ -1932,7 +1932,7 @@ * It first searches for the meta rows that contain the region of the * specified table, then gets the index of that RS, and finally retrieves * the RS's reference. - * @param tableName user table to lookup in .META. + * @param tableName user table to lookup in hbase:meta * @return region server that holds it, null if the row doesn't exist * @throws IOException * @throws InterruptedException @@ -1947,7 +1947,7 @@ * It first searches for the meta rows that contain the region of the * specified table, then gets the index of that RS, and finally retrieves * the RS's reference. - * @param tableName user table to lookup in .META. + * @param tableName user table to lookup in hbase:meta * @return region server that holds it, null if the row doesn't exist * @throws IOException */ @@ -2496,7 +2496,7 @@ Thread.sleep(200); } // Finally make sure all regions are fully open and online out on the cluster. Regions may be - // in the .META. table and almost open on all regionservers but there setting the region + // in the hbase:meta table and almost open on all regionservers but there setting the region // online in the regionserver is the very last thing done and can take a little while to happen. // Below we do a get. The get will retry if a NotServeringRegionException or a // RegionOpeningException. It is crass but when done all will be online. @@ -2618,9 +2618,9 @@ } /** - * Wait until all regions for a table in .META. have a non-empty + * Wait until all regions for a table in hbase:meta have a non-empty * info:server, up to 60 seconds. This means all regions have been deployed, - * master has been informed and updated .META. with the regions deployed + * master has been informed and updated hbase:meta with the regions deployed * server. * @param tableName the table name * @throws IOException @@ -2630,9 +2630,9 @@ } /** - * Wait until all regions for a table in .META. have a non-empty + * Wait until all regions for a table in hbase:meta have a non-empty * info:server, or until timeout. This means all regions have been deployed, - * master has been informed and updated .META. with the regions deployed + * master has been informed and updated hbase:meta with the regions deployed * server. * @param tableName the table name * @param timeout timeout, in milliseconds Index: hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java (working copy) @@ -627,7 +627,7 @@ * Get the location of the specified region * @param regionName Name of the region in bytes * @return Index into List of {@link MiniHBaseCluster#getRegionServerThreads()} - * of HRS carrying .META.. Returns -1 if none found. + * of HRS carrying hbase:meta. Returns -1 if none found. */ public int getServerWith(byte[] regionName) { int index = -1; @@ -657,7 +657,7 @@ /** * Counts the total numbers of regions being served by the currently online * region servers by asking each how many regions they have. Does not look - * at META at all. Count includes catalog tables. + * at hbase:meta at all. Count includes catalog tables. * @return number of regions being served by all region servers */ public long countServedRegions() { Index: hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java (working copy) @@ -88,11 +88,11 @@ new HTable(UTIL.getConfiguration(), TableName.META_TABLE_NAME).close(); int port = UTIL.getHBaseCluster().getMaster().getInfoServer().getPort(); assertContainsContent(new URL("http://localhost:" + port + - "/master-status"), "META"); + "/master-status"), "meta"); port = UTIL.getHBaseCluster().getRegionServerThreads().get(0).getRegionServer(). getInfoServer().getPort(); assertContainsContent(new URL("http://localhost:" + port + - "/rs-status"), "META"); + "/rs-status"), "meta"); } @Test Index: hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java (working copy) @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.util.Bytes; /** - * Mocking utility for common META functionality + * Mocking utility for common hbase:meta functionality */ public class MetaMockingUtil { @@ -40,7 +40,7 @@ * Returns a Result object constructed from the given region information simulating * a catalog table result. * @param region the HRegionInfo object or null - * @return A mocked up Result that fakes a Get on a row in the .META. table. + * @return A mocked up Result that fakes a Get on a row in the hbase:meta table. * @throws IOException */ public static Result getMetaTableRowResult(final HRegionInfo region) @@ -53,7 +53,7 @@ * a catalog table result. * @param region the HRegionInfo object or null * @param ServerName to use making startcode and server hostname:port in meta or null - * @return A mocked up Result that fakes a Get on a row in the .META. table. + * @return A mocked up Result that fakes a Get on a row in the hbase:meta table. * @throws IOException */ public static Result getMetaTableRowResult(final HRegionInfo region, final ServerName sn) @@ -68,7 +68,7 @@ * @param ServerName to use making startcode and server hostname:port in meta or null * @param splita daughter region or null * @param splitb daughter region or null - * @return A mocked up Result that fakes a Get on a row in the .META. table. + * @return A mocked up Result that fakes a Get on a row in the hbase:meta table. * @throws IOException */ public static Result getMetaTableRowResult(HRegionInfo region, final ServerName sn, @@ -113,7 +113,7 @@ /** * @param sn ServerName to use making startcode and server in meta * @param hri Region to serialize into HRegionInfo - * @return A mocked up Result that fakes a Get on a row in the .META. table. + * @return A mocked up Result that fakes a Get on a row in the hbase:meta table. * @throws IOException */ public static Result getMetaTableRowResultAsSplitRegion(final HRegionInfo hri, final ServerName sn) Index: hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java (working copy) @@ -108,7 +108,7 @@ // start fresh in zk. MetaRegionTracker.deleteMetaLocation(this.watcher); } catch (KeeperException e) { - LOG.warn("Unable to delete META location", e); + LOG.warn("Unable to delete hbase:meta location", e); } // Clear out our doctored connection or could mess up subsequent tests. @@ -126,7 +126,7 @@ } /** - * Test that we get notification if .META. moves. + * Test that we get notification if hbase:meta moves. * @throws IOException * @throws InterruptedException * @throws KeeperException @@ -337,7 +337,7 @@ /** * @return A mocked up Result that fakes a Get on a row in the - * .META. table. + * hbase:meta table. * @throws IOException */ private Result getMetaTableRowResult() throws IOException { Index: hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java (working copy) @@ -61,7 +61,7 @@ /** * Test migration that changes HRI serialization into PB. Tests by bringing up a cluster from actual - * data from a 0.92 cluster, as well as manually downgrading and then upgrading the META info. + * data from a 0.92 cluster, as well as manually downgrading and then upgrading the hbase:meta info. * @deprecated Remove after 0.96 */ @Category(MediumTests.class) @@ -81,7 +81,7 @@ * This test uses a tgz file named "TestMetaMigrationConvertingToPB.tgz" under * hbase-server/src/test/data which contains file data from a 0.92 cluster. * The cluster has a table named "TestTable", which has 100 rows. 0.94 has same - * META structure, so it should be the same. + * hbase:meta structure, so it should be the same. * * hbase(main):001:0> create 'TestTable', 'f1' * hbase(main):002:0> for i in 1..100 @@ -114,7 +114,7 @@ doFsCommand(shell, new String [] {"-put", untar.toURI().toString(), hbaseRootDir.toString()}); - //windows fix: tgz file has .META. directory renamed as -META- since the original is an illegal + //windows fix: tgz file has hbase:meta directory renamed as -META- since the original is an illegal //name under windows. So we rename it back. See src/test/data//TestMetaMigrationConvertingToPB.README and //https://issues.apache.org/jira/browse/HBASE-6821 doFsCommand(shell, new String [] {"-mv", new Path(hbaseRootDir, "-META-").toString(), @@ -273,7 +273,7 @@ } /** - * Verify that every META row is updated + * Verify that every hbase:meta row is updated */ void verifyMetaRowsAreUpdated(CatalogTracker catalogTracker) throws IOException { @@ -300,7 +300,7 @@ } } - /** Changes the version of META to 0 to simulate 0.92 and 0.94 clusters*/ + /** Changes the version of hbase:meta to 0 to simulate 0.92 and 0.94 clusters*/ private void undoVersionInRoot(CatalogTracker ct) throws IOException { Put p = new Put(HRegionInfo.FIRST_META_REGIONINFO.getRegionName()); @@ -312,7 +312,7 @@ } /** - * Inserts multiple regions into META using Writable serialization instead of PB + * Inserts multiple regions into hbase:meta using Writable serialization instead of PB */ public int createMultiRegionsWithWritableSerialization(final Configuration c, final byte[] tableName, int numRegions) throws IOException { @@ -336,7 +336,7 @@ } /** - * Inserts multiple regions into META using Writable serialization instead of PB + * Inserts multiple regions into hbase:meta using Writable serialization instead of PB */ public int createMultiRegionsWithWritableSerialization(final Configuration c, final TableName tableName, byte [][] startKeys) @@ -386,7 +386,7 @@ } /** - * Inserts multiple regions into META using PB serialization + * Inserts multiple regions into hbase:meta using PB serialization */ int createMultiRegionsWithPBSerialization(final Configuration c, final byte[] tableName, int numRegions) @@ -404,7 +404,7 @@ } /** - * Inserts multiple regions into META using PB serialization + * Inserts multiple regions into hbase:meta using PB serialization */ int createMultiRegionsWithPBSerialization(final Configuration c, final byte[] tableName, byte [][] startKeys) throws IOException { Index: hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java (working copy) @@ -92,7 +92,7 @@ /** * Does {@link MetaReader#getRegion(CatalogTracker, byte[])} and a write - * against .META. while its hosted server is restarted to prove our retrying + * against hbase:meta while its hosted server is restarted to prove our retrying * works. * @throws IOException * @throws InterruptedException Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (working copy) @@ -1619,7 +1619,7 @@ private HRegionServer startAndWriteData(String tableName, byte[] value) throws IOException, InterruptedException { - // When the META table can be opened, the region servers are running + // When the hbase:meta table can be opened, the region servers are running new HTable( TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME).close(); @@ -1701,7 +1701,7 @@ fail("Expected to throw ConstraintException"); } catch (ConstraintException e) { } - // Before the fix for HBASE-6146, the below table creation was failing as the META table + // Before the fix for HBASE-6146, the below table creation was failing as the hbase:meta table // actually getting disabled by the disableTable() call. HTableDescriptor htd = new HTableDescriptor(TableName.valueOf("testDisableCatalogTable".getBytes())); HColumnDescriptor hcd = new HColumnDescriptor("cf1".getBytes()); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java (working copy) @@ -91,7 +91,7 @@ verify(visitor, times(3)).processRow((Result)anyObject()); // Scanning the table with a specified empty start row should also - // give us three META rows + // give us three hbase:meta rows reset(visitor); doReturn(true).when(visitor).processRow((Result)anyObject()); MetaScanner.metaScan(conf, visitor, TABLENAME, HConstants.EMPTY_BYTE_ARRAY, 1000); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java (working copy) @@ -113,7 +113,7 @@ } /** - * Test snapshotting not allowed .META. and -ROOT- + * Test snapshotting not allowed hbase:meta and -ROOT- * @throws Exception */ @Test (timeout=300000) @@ -123,7 +123,7 @@ try { admin.snapshot(snapshotName, TableName.META_TABLE_NAME); - fail("taking a snapshot of .META. should not be allowed"); + fail("taking a snapshot of hbase:meta should not be allowed"); } catch (IllegalArgumentException e) { // expected } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java (working copy) @@ -268,7 +268,7 @@ public void testReaderV2() throws IOException { for (Compression.Algorithm algo : COMPRESSION_ALGORITHMS) { for (boolean pread : new boolean[] { false, true }) { - LOG.info("testReaderV2: Compression algorithm: " + algo + + LOG.info("testReaderV2: Compression algorithm: " + algo + ", pread=" + pread); Path path = new Path(TEST_UTIL.getDataTestDir(), "blocks_v2_" + algo); @@ -295,7 +295,7 @@ b.sanityCheck(); assertEquals(4936, b.getUncompressedSizeWithoutHeader()); - assertEquals(algo == GZ ? 2173 : 4936, + assertEquals(algo == GZ ? 2173 : 4936, b.getOnDiskSizeWithoutHeader() - b.totalChecksumBytes()); String blockStr = b.toString(); @@ -393,7 +393,7 @@ static void writeEncodedBlock(Algorithm algo, DataBlockEncoding encoding, DataOutputStream dos, final List encodedSizes, - final List encodedBlocks, int blockId, + final List encodedBlocks, int blockId, boolean includesMemstoreTS, byte[] dummyHeader) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); DoubleOutputStream doubleOutputStream = @@ -478,7 +478,7 @@ for (boolean pread : BOOLEAN_VALUES) { for (boolean cacheOnWrite : BOOLEAN_VALUES) { Random rand = defaultRandom(); - LOG.info("testPreviousOffset:Compression algorithm: " + algo + + LOG.info("testPreviousOffset:Compression algorithm: " + algo + ", pread=" + pread + ", cacheOnWrite=" + cacheOnWrite); Path path = new Path(TEST_UTIL.getDataTestDir(), "prev_offset"); @@ -532,7 +532,7 @@ assertEquals(b.getPrevBlockOffset(), b2.getPrevBlockOffset()); assertEquals(curOffset, b2.getOffset()); assertEquals(b.getBytesPerChecksum(), b2.getBytesPerChecksum()); - assertEquals(b.getOnDiskDataSizeWithHeader(), + assertEquals(b.getOnDiskDataSizeWithHeader(), b2.getOnDiskDataSizeWithHeader()); assertEquals(0, HFile.getChecksumFailuresCount()); @@ -541,12 +541,12 @@ if (cacheOnWrite) { // In the cache-on-write mode we store uncompressed bytes so we // can compare them to what was read by the block reader. - // b's buffer has header + data + checksum while + // b's buffer has header + data + checksum while // expectedContents have header + data only ByteBuffer bufRead = b.getBufferWithHeader(); ByteBuffer bufExpected = expectedContents.get(i); boolean bytesAreCorrect = Bytes.compareTo(bufRead.array(), - bufRead.arrayOffset(), + bufRead.arrayOffset(), bufRead.limit() - b.totalChecksumBytes(), bufExpected.array(), bufExpected.arrayOffset(), bufExpected.limit()) == 0; @@ -565,9 +565,9 @@ + Bytes.toStringBinary(bufRead.array(), bufRead.arrayOffset(), Math.min(32, bufRead.limit())); if (detailedLogging) { - LOG.warn("expected header" + + LOG.warn("expected header" + HFileBlock.toStringHeader(bufExpected) + - "\nfound header" + + "\nfound header" + HFileBlock.toStringHeader(bufRead)); LOG.warn("bufread offset " + bufRead.arrayOffset() + " limit " + bufRead.limit() + @@ -759,7 +759,7 @@ byte[] byteArr = new byte[HConstants.HFILEBLOCK_HEADER_SIZE + size]; ByteBuffer buf = ByteBuffer.wrap(byteArr, 0, size); HFileBlock block = new HFileBlock(BlockType.DATA, size, size, -1, buf, - HFileBlock.FILL_HEADER, -1, includesMemstoreTS, + HFileBlock.FILL_HEADER, -1, includesMemstoreTS, HFileBlock.MINOR_VERSION_NO_CHECKSUM, 0, ChecksumType.NULL.getCode(), 0); long byteBufferExpectedSize = Index: hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java (working copy) @@ -174,7 +174,7 @@ public void testReaderV2() throws IOException { for (Compression.Algorithm algo : COMPRESSION_ALGORITHMS) { for (boolean pread : new boolean[] { false, true }) { - LOG.info("testReaderV2: Compression algorithm: " + algo + + LOG.info("testReaderV2: Compression algorithm: " + algo + ", pread=" + pread); Path path = new Path(TEST_UTIL.getDataTestDir(), "blocks_v2_" + algo); @@ -199,7 +199,7 @@ b.sanityCheck(); assertEquals(4936, b.getUncompressedSizeWithoutHeader()); - assertEquals(algo == GZ ? 2173 : 4936, + assertEquals(algo == GZ ? 2173 : 4936, b.getOnDiskSizeWithoutHeader() - b.totalChecksumBytes()); String blockStr = b.toString(); @@ -239,7 +239,7 @@ for (Compression.Algorithm algo : COMPRESSION_ALGORITHMS) { for (boolean pread : new boolean[] { false, true }) { for (DataBlockEncoding encoding : DataBlockEncoding.values()) { - LOG.info("testDataBlockEncoding algo " + algo + + LOG.info("testDataBlockEncoding algo " + algo + " pread = " + pread + " encoding " + encoding); Path path = new Path(TEST_UTIL.getDataTestDir(), "blocks_v2_" @@ -305,12 +305,12 @@ /** - * This is the version of the HFileBlock.Writer that is used to - * create V2 blocks with minor version 0. These blocks do not - * have hbase-level checksums. The code is here to test - * backward compatibility. The reason we do not inherit from + * This is the version of the HFileBlock.Writer that is used to + * create V2 blocks with minor version 0. These blocks do not + * have hbase-level checksums. The code is here to test + * backward compatibility. The reason we do not inherit from * HFileBlock.Writer is because we never ever want to change the code - * in this class but the code in HFileBlock.Writer will continually + * in this class but the code in HFileBlock.Writer will continually * evolve. */ public static final class Writer { @@ -318,7 +318,7 @@ // These constants are as they were in minorVersion 0. private static final int HEADER_SIZE = HConstants.HFILEBLOCK_HEADER_SIZE_NO_CHECKSUM; private static final boolean DONT_FILL_HEADER = HFileBlock.DONT_FILL_HEADER; - private static final byte[] DUMMY_HEADER = + private static final byte[] DUMMY_HEADER = HFileBlock.DUMMY_HEADER_NO_CHECKSUM; private enum State { @@ -711,7 +711,7 @@ } /** - * Creates a new HFileBlock. + * Creates a new HFileBlock. */ public HFileBlock getBlockForCaching() { return new HFileBlock(blockType, getOnDiskSizeWithoutHeader(), Index: hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java (working copy) @@ -189,7 +189,7 @@ } /** - * Test export .META. table + * Test export hbase:meta table * * @throws Exception */ Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (working copy) @@ -471,7 +471,7 @@ /** * To test if the split region is removed from RIT if the region was in SPLITTING state but the RS - * has actually completed the splitting in META but went down. See HBASE-6070 and also HBASE-5806 + * has actually completed the splitting in hbase:meta but went down. See HBASE-6070 and also HBASE-5806 * * @throws KeeperException * @throws IOException @@ -1067,7 +1067,7 @@ // it and a get to return the single region, REGIONINFO, this test is // messing with. Needed when "new master" joins cluster. AM will try and // rebuild its list of user regions and it will also get the HRI that goes - // with an encoded name by doing a Get on .META. + // with an encoded name by doing a Get on hbase:meta ClientProtos.ClientService.BlockingInterface ri = Mockito.mock(ClientProtos.ClientService.BlockingInterface.class); // Get a meta row result that has region up on SERVERNAME_A for REGIONINFO Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (working copy) @@ -1314,7 +1314,7 @@ /** * Find a RS that has regions of a table. - * @param hasMetaRegion when true, the returned RS has META region as well + * @param hasMetaRegion when true, the returned RS has hbase:meta region as well * @param tableName * @return * @throws Exception Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (working copy) @@ -214,7 +214,7 @@ List disabledRegions = TEST_UTIL.createMultiRegionsInMeta( TEST_UTIL.getConfiguration(), htdDisabled, SPLIT_KEYS); - log("Regions in META and namespace have been created"); + log("Regions in hbase:meta and namespace have been created"); // at this point we only expect 3 regions to be assigned out (catalogs and namespace) assertEquals(2, cluster.countServedRegions()); @@ -519,7 +519,7 @@ List disabledRegions = TEST_UTIL.createMultiRegionsInMeta( TEST_UTIL.getConfiguration(), htdDisabled, SPLIT_KEYS); - log("Regions in META and Namespace have been created"); + log("Regions in hbase:meta and Namespace have been created"); // at this point we only expect 2 regions to be assigned out (catalogs and namespace ) assertEquals(2, cluster.countServedRegions()); @@ -870,7 +870,7 @@ } // TODO: Next test to add is with testing permutations of the RIT or the RS - // killed are hosting ROOT and META regions. + // killed are hosting ROOT and hbase:meta regions. private void log(String string) { LOG.info("\n\n" + string + " \n\n"); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java (working copy) @@ -164,7 +164,7 @@ regionsInTransition.put(hri.getEncodedName(), new RegionState(hri, RegionState.State.CLOSING, 12345L, FAKE_HOST)); } - // Add META in transition as well + // Add hbase:meta in transition as well regionsInTransition.put( HRegionInfo.FIRST_META_REGIONINFO.getEncodedName(), new RegionState(HRegionInfo.FIRST_META_REGIONINFO, Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (working copy) @@ -81,7 +81,7 @@ /** * Listener for regionserver events testing hbase-2428 (Infinite loop of - * region closes if META region is offline). In particular, listen + * region closes if hbase:meta region is offline). In particular, listen * for the close of the 'metaServer' and when it comes in, requeue it with a * delay as though there were an issue processing the shutdown. As part of * the requeuing, send over a close of a region on 'otherServer' so it comes @@ -196,7 +196,7 @@ MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster(); final HMaster master = cluster.getMaster(); int metaIndex = cluster.getServerWithMeta(); - // Figure the index of the server that is not server the .META. + // Figure the index of the server that is not server the hbase:meta int otherServerIndex = -1; for (int i = 0; i < cluster.getRegionServerThreads().size(); i++) { if (i == metaIndex) continue; @@ -472,7 +472,7 @@ } */ /* - * Add to each of the regions in .META. a value. Key is the startrow of the + * Add to each of the regions in hbase:meta a value. Key is the startrow of the * region (except its 'aaa' for first region). Actual value is the row name. * @param expected * @return Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (working copy) @@ -225,7 +225,7 @@ // Verify all the region server are update with the latest favored nodes verifyRegionServerUpdated(currentPlan); // Test Case 2: To verify whether the region placement tools can - // correctly update the new assignment plan to META and Region Server. + // correctly update the new assignment plan to hbase:meta and Region Server. // The new assignment plan is generated by shuffle the existing assignment // plan by switching PRIMARY, SECONDARY and TERTIARY nodes. // Shuffle the plan by switching the secondary region server with @@ -234,7 +234,7 @@ // Shuffle the secondary with tertiary favored nodes FavoredNodesPlan shuffledPlan = this.shuffleAssignmentPlan(currentPlan, FavoredNodesPlan.Position.SECONDARY, FavoredNodesPlan.Position.TERTIARY); - // Let the region placement update the META and Region Servers + // Let the region placement update the hbase:meta and Region Servers rp.updateAssignmentPlan(shuffledPlan); // Verify the region assignment. There are supposed to no region reassignment @@ -246,7 +246,7 @@ shuffledPlan = this.shuffleAssignmentPlan(currentPlan, FavoredNodesPlan.Position.PRIMARY, FavoredNodesPlan.Position.SECONDARY); - // Let the region placement update the META and Region Servers + // Let the region placement update the hbase:meta and Region Servers rp.updateAssignmentPlan(shuffledPlan); verifyRegionAssignment(shuffledPlan, REGION_NUM, REGION_NUM); @@ -417,7 +417,7 @@ /** * To verify the region assignment status. - * It will check the assignment plan consistency between META and + * It will check the assignment plan consistency between hbase:meta and * region servers. * Also it will verify weather the number of region movement and * the number regions on the primary region server are expected @@ -431,7 +431,7 @@ private void verifyRegionAssignment(FavoredNodesPlan plan, int regionMovementNum, int numRegionsOnPrimaryRS) throws InterruptedException, IOException { - // Verify the assignment plan in META is consistent with the expected plan. + // Verify the assignment plan in hbase:meta is consistent with the expected plan. verifyMETAUpdated(plan); // Verify the number of region movement is expected @@ -541,10 +541,10 @@ List favoredServerList = plan.getAssignmentMap().get(region.getRegionInfo()); // All regions are supposed to have favored nodes, - // except for META and ROOT + // except for hbase:meta and ROOT if (favoredServerList == null) { HTableDescriptor desc = region.getTableDesc(); - // Verify they are ROOT and META regions since no favored nodes + // Verify they are ROOT and hbase:meta regions since no favored nodes assertNull(favoredSocketAddress); assertTrue("User region " + region.getTableDesc().getTableName() + @@ -575,7 +575,7 @@ /** * Check whether regions are assigned to servers consistent with the explicit - * hints that are persisted in the META table. + * hints that are persisted in the hbase:meta table. * Also keep track of the number of the regions are assigned to the * primary region server. * @return the number of regions are assigned to the primary region server Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java (working copy) @@ -70,7 +70,7 @@ ZKAssign.createNodeOffline(zooKeeper, HRegionInfo.FIRST_META_REGIONINFO, sn); - LOG.debug("Created UNASSIGNED zNode for ROOT and META regions in state " + + LOG.debug("Created UNASSIGNED zNode for ROOT and hbase:meta regions in state " + EventType.M_ZK_REGION_OFFLINE); // start the HB cluster Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java (working copy) @@ -184,10 +184,10 @@ Thread.sleep(1000); assertRegionsAssigned(cluster, regions); - // Bring the RS hosting META down + // Bring the RS hosting hbase:meta down RegionServerThread metaServer = getServerHostingMeta(cluster); - log("Stopping server hosting META #1"); - metaServer.getRegionServer().stop("Stopping META server"); + log("Stopping server hosting hbase:meta #1"); + metaServer.getRegionServer().stop("Stopping hbase:meta server"); cluster.hbaseCluster.waitOnRegionServer(metaServer); log("Meta server down #1"); expectedNumRS--; @@ -204,10 +204,10 @@ assertRegionsAssigned(cluster, regions); assertEquals(expectedNumRS, cluster.getRegionServerThreads().size()); - // Kill off the server hosting META again + // Kill off the server hosting hbase:meta again metaServer = getServerHostingMeta(cluster); - log("Stopping server hosting META #2"); - metaServer.getRegionServer().stop("Stopping META server"); + log("Stopping server hosting hbase:meta #2"); + metaServer.getRegionServer().stop("Stopping hbase:meta server"); cluster.hbaseCluster.waitOnRegionServer(metaServer); log("Meta server down"); expectedNumRS--; @@ -231,8 +231,8 @@ assertRegionsAssigned(cluster, regions); // Shutdown server hosting META metaServer = getServerHostingMeta(cluster); - log("Stopping server hosting META (1 of 3)"); - metaServer.getRegionServer().stop("Stopping META server"); + log("Stopping server hosting hbase:meta (1 of 3)"); + metaServer.getRegionServer().stop("Stopping hbase:meta server"); cluster.hbaseCluster.waitOnRegionServer(metaServer); log("Meta server down (1 of 3)"); log("Waiting for RS shutdown to be handled by master"); @@ -243,10 +243,10 @@ log("Verifying there are " + numRegions + " assigned on cluster"); assertRegionsAssigned(cluster, regions); - // Shutdown server hosting META again + // Shutdown server hosting hbase:meta again metaServer = getServerHostingMeta(cluster); - log("Stopping server hosting META (2 of 3)"); - metaServer.getRegionServer().stop("Stopping META server"); + log("Stopping server hosting hbase:meta (2 of 3)"); + metaServer.getRegionServer().stop("Stopping hbase:meta server"); cluster.hbaseCluster.waitOnRegionServer(metaServer); log("Meta server down (2 of 3)"); log("Waiting for RS shutdown to be handled by master"); @@ -257,10 +257,10 @@ log("Verifying there are " + numRegions + " assigned on cluster"); assertRegionsAssigned(cluster, regions); - // Shutdown server hosting META again + // Shutdown server hosting hbase:meta again metaServer = getServerHostingMeta(cluster); - log("Stopping server hosting META (3 of 3)"); - metaServer.getRegionServer().stop("Stopping META server"); + log("Stopping server hosting hbase:meta (3 of 3)"); + metaServer.getRegionServer().stop("Stopping hbase:meta server"); cluster.hbaseCluster.waitOnRegionServer(metaServer); log("Meta server down (3 of 3)"); log("Waiting for RS shutdown to be handled by master"); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java (working copy) @@ -266,7 +266,7 @@ } /* - * Add to each of the regions in .META. a value. Key is the startrow of the + * Add to each of the regions in hbase:meta a value. Key is the startrow of the * region (except its 'aaa' for first region). Actual value is the row name. * @param expected * @return Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java (working copy) @@ -360,7 +360,7 @@ // ensure that we do not have any gaps for (int i=0; i 0); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (working copy) @@ -1005,7 +1005,7 @@ } /** - * Ensure single table region is not on same server as the single .META. table + * Ensure single table region is not on same server as the single hbase:meta table * region. * @param admin * @param hri @@ -1020,7 +1020,7 @@ throws HBaseIOException, MasterNotRunningException, ZooKeeperConnectionException, InterruptedException { // Now make sure that the table region is not on same server as that hosting - // .META. We don't want .META. replay polluting our test when we later crash + // hbase:meta We don't want hbase:meta replay polluting our test when we later crash // the table region serving server. int metaServerIndex = cluster.getServerWithMeta(); assertTrue(metaServerIndex != -1); @@ -1037,17 +1037,17 @@ hrs.getServerName() + "; metaServerIndex=" + metaServerIndex); admin.move(hri.getEncodedNameAsBytes(), Bytes.toBytes(hrs.getServerName().toString())); } - // Wait till table region is up on the server that is NOT carrying .META.. + // Wait till table region is up on the server that is NOT carrying hbase:meta. for (int i = 0; i < 100; i++) { tableRegionIndex = cluster.getServerWith(hri.getRegionName()); if (tableRegionIndex != -1 && tableRegionIndex != metaServerIndex) break; - LOG.debug("Waiting on region move off the .META. server; current index " + + LOG.debug("Waiting on region move off the hbase:meta server; current index " + tableRegionIndex + " and metaServerIndex=" + metaServerIndex); Thread.sleep(100); } - assertTrue("Region not moved off .META. server", tableRegionIndex != -1 + assertTrue("Region not moved off hbase:meta server", tableRegionIndex != -1 && tableRegionIndex != metaServerIndex); - // Verify for sure table region is not on same server as .META. + // Verify for sure table region is not on same server as hbase:meta tableRegionIndex = cluster.getServerWith(hri.getRegionName()); assertTrue(tableRegionIndex != -1); assertNotSame(metaServerIndex, tableRegionIndex); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java (working copy) @@ -117,7 +117,7 @@ public void testRSAbortWithUnflushedEdits() throws Exception { LOG.info("Starting testRSAbortWithUnflushedEdits()"); - // When the META table can be opened, the region servers are running + // When the hbase:meta table can be opened, the region servers are running new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME).close(); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java (working copy) @@ -190,7 +190,7 @@ } private void startAndWriteData() throws IOException, InterruptedException { - // When the META table can be opened, the region servers are running + // When the hbase:meta table can be opened, the region servers are running new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME); this.server = cluster.getRegionServerThreads().get(0).getRegionServer(); this.log = server.getWAL(); @@ -426,7 +426,7 @@ assertTrue("This test requires HLog file replication.", fs.getDefaultReplication() > 1); LOG.info("Replication=" + fs.getDefaultReplication()); - // When the META table can be opened, the region servers are running + // When the hbase:meta table can be opened, the region servers are running new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME); this.server = cluster.getRegionServer(0); @@ -583,7 +583,7 @@ */ @Test public void testCompactionRecordDoesntBlockRolling() throws Exception { - // When the META table can be opened, the region servers are running + // When the hbase:meta table can be opened, the region servers are running new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME); String tableName = getName(); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java (working copy) @@ -73,7 +73,7 @@ /** * Inserts three waledits in the wal file, and reads them back. The first edit is of a regular * table, second waledit is for the ROOT table (it will be ignored while reading), - * and last waledit is for the META table, which will be linked to the new system:meta table. + * and last waledit is for the hbase:meta table, which will be linked to the new system:meta table. * @throws IOException */ @Test @@ -106,7 +106,7 @@ TableName.OLD_ROOT_TABLE_NAME, ++logCount, timestamp, HConstants.DEFAULT_CLUSTER_ID), kvs); - // create a old meta edit (.META.). + // create a old meta edit (hbase:meta). HLog.Entry oldMetaEntry = createAEntry(new HLogKey(Bytes.toBytes(TableName.OLD_META_STR), TableName.OLD_META_TABLE_NAME, ++logCount, timestamp, HConstants.DEFAULT_CLUSTER_ID), kvs); @@ -129,7 +129,7 @@ assertEquals(Bytes.toString(entry.getKey().getEncodedRegionName()), Bytes.toString(tRegionInfo.getEncodedNameAsBytes())); - // read the ROOT waledit, but that will be ignored, and META waledit will be read instead. + // read the ROOT waledit, but that will be ignored, and hbase:meta waledit will be read instead. entry = reader.next(); assertEquals(entry.getKey().getTablename(), TableName.META_TABLE_NAME); // should reach end of log Index: hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java (working copy) @@ -45,7 +45,7 @@ * @throws Exception */ public void loadTableAndKillRS(HBaseTestingUtility util) throws Exception { - // killing the RS with .META. can result into failed puts until we solve + // killing the RS with hbase:meta can result into failed puts until we solve // IO fencing int rsToKill1 = util.getHBaseCluster().getServerWithMeta() == 0 ? 1 : 0; Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java (working copy) @@ -34,7 +34,7 @@ /** * A command-line tool that spins up a local process-based cluster, loads - * some data, restarts the regionserver holding .META., and verifies that the + * some data, restarts the regionserver holding hbase:meta, and verifies that the * cluster recovers. */ public class RestartMetaTest extends AbstractHBaseTool { @@ -110,7 +110,7 @@ int metaRSPort = HBaseTestingUtility.getMetaRSPort(conf); - LOG.debug("Killing META region server running on port " + metaRSPort); + LOG.debug("Killing hbase:meta region server running on port " + metaRSPort); hbaseCluster.killRegionServer(metaRSPort); Threads.sleep(2000); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (working copy) @@ -153,7 +153,7 @@ // We created 1 table, should be fine assertNoErrors(doFsck(conf, false)); - // Now let's mess it up and change the assignment in .META. to + // Now let's mess it up and change the assignment in hbase:meta to // point to a different region server HTable meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName(), executorService); @@ -1054,7 +1054,7 @@ } /** - * This creates entries in META with no hdfs data. This should cleanly + * This creates entries in hbase:meta with no hdfs data. This should cleanly * remove the table. */ @Test @@ -1332,7 +1332,7 @@ HBaseFsck hbck = doFsck(conf, true, true, false, false, false, true, true, true, false, false, null); assertErrors(hbck, new ERROR_CODE[] {}); //no LINGERING_SPLIT_PARENT reported - // assert that the split META entry is still there. + // assert that the split hbase:meta entry is still there. Get get = new Get(hri.getRegionName()); Result result = meta.get(get); assertNotNull(result); @@ -1350,7 +1350,7 @@ } /** - * Split crashed after write to META finished for the parent region, but + * Split crashed after write to hbase:meta finished for the parent region, but * failed to write daughters (pre HBASE-7721 codebase) */ @Test(timeout=75000) @@ -1396,7 +1396,7 @@ assertErrors(hbck, new ERROR_CODE[] {ERROR_CODE.NOT_IN_META_OR_DEPLOYED, ERROR_CODE.NOT_IN_META_OR_DEPLOYED, ERROR_CODE.HOLE_IN_REGION_CHAIN}); - // assert that the split META entry is still there. + // assert that the split hbase:meta entry is still there. Get get = new Get(hri.getRegionName()); Result result = meta.get(get); assertNotNull(result); @@ -1852,7 +1852,7 @@ } /** - * Test mission REGIONINFO_QUALIFIER in .META. + * Test mission REGIONINFO_QUALIFIER in hbase:meta */ @Test public void testMissingRegionInfoQualifier() throws Exception { @@ -1882,7 +1882,7 @@ }); meta.delete(deletes); - // Mess it up by creating a fake META entry with no associated RegionInfo + // Mess it up by creating a fake hbase:meta entry with no associated RegionInfo meta.put(new Put(Bytes.toBytes(table + ",,1361911384013.810e28f59a57da91c66")).add( HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER, Bytes.toBytes("node1:60020"))); meta.put(new Put(Bytes.toBytes(table + ",,1361911384013.810e28f59a57da91c66")).add( @@ -2063,7 +2063,7 @@ assertNoErrors(hbck); deleteMetaRegion(conf, true, false, false); hbck = doFsck(conf, false); - // ERROR_CODE.UNKNOWN is coming because we reportError with a message for the .META. + // ERROR_CODE.UNKNOWN is coming because we reportError with a message for the hbase:meta // inconsistency and whether we will be fixing it or not. assertErrors(hbck, new ERROR_CODE[] { ERROR_CODE.NO_META_REGION, ERROR_CODE.UNKNOWN }); hbck = doFsck(conf, true); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java (working copy) @@ -103,7 +103,7 @@ }; // Now create the root and meta regions and insert the data regions - // created above into .META. + // created above into hbase:meta setupMeta(rootdir, regions); try { LOG.info("Starting mini zk cluster"); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java (revision 1520311) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java (working copy) @@ -271,7 +271,7 @@ } /** - * Dumps .META. table info + * Dumps hbase:meta table info * * @return # of entries in meta. */ Index: hbase-server/src/test/resources/hbase-site.xml =================================================================== --- hbase-server/src/test/resources/hbase-site.xml (revision 1520311) +++ hbase-server/src/test/resources/hbase-site.xml (working copy) @@ -37,7 +37,7 @@ hbase.server.thread.wakefrequency 1000 Time to sleep in between searches for work (in milliseconds). - Used as sleep interval by service threads such as META scanner and log roller. + Used as sleep interval by service threads such as hbase:meta scanner and log roller.

Fragmentation <% frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %>Overall fragmentation of all tables, including .META.Overall fragmentation of all tables, including hbase:meta