Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 17D9510136 for ; Fri, 6 Sep 2013 00:32:39 +0000 (UTC) Received: (qmail 76605 invoked by uid 500); 6 Sep 2013 00:32:39 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 76574 invoked by uid 500); 6 Sep 2013 00:32:38 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 76567 invoked by uid 99); 6 Sep 2013 00:32:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Sep 2013 00:32:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Sep 2013 00:32:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 572E923888D7; Fri, 6 Sep 2013 00:32:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1520464 [1/4] - in /hbase/branches/0.96: hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/... Date: Fri, 06 Sep 2013 00:31:59 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130906003204.572E923888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Fri Sep 6 00:31:57 2013 New Revision: 1520464 URL: http://svn.apache.org/r1520464 Log: HBASE-9413 WebUI says ".META." table but table got renames to "hbase:meta". Meed to update the UI Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java hbase/branches/0.96/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java hbase/branches/0.96/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java hbase/branches/0.96/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SnapshotOfRegionAssignmentFromMeta.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/CloneSnapshotHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/MasterSnapshotVerifier.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/RestoreSnapshotHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/GetClosestRowBeforeTracker.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogPrettyPrinter.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptorMigrationToSubdir.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java hbase/branches/0.96/hbase-server/src/test/data/TestMetaMigrationConvertToPB.README hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java hbase/branches/0.96/hbase-server/src/test/resources/hbase-site.xml Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java Fri Sep 6 00:31:57 2013 @@ -60,20 +60,20 @@ public class HRegionInfo implements Comp * 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 @@ public class HRegionInfo implements Comp *

* **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 @@ public class HRegionInfo implements Comp 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 @@ public class HRegionInfo implements Comp /** * 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 @@ public class HRegionInfo implements Comp } /** - * @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 @@ public class HRegionInfo implements Comp * 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) { Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Fri Sep 6 00:31:57 2013 @@ -59,7 +59,7 @@ import com.google.protobuf.InvalidProtoc /** * 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 @@ public class HTableDescriptor implements /** * 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 @@ public class HTableDescriptor implements /** * 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 @@ public class HTableDescriptor implements /** * 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 @@ public class HTableDescriptor implements /* * 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 @@ public class HTableDescriptor implements } /** - * 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 @@ public class HTableDescriptor implements /** * 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 @@ public class HTableDescriptor implements 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 @@ public class HTableDescriptor implements "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 @@ public class HTableDescriptor implements 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; } Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java Fri Sep 6 00:31:57 2013 @@ -47,11 +47,11 @@ import java.net.UnknownHostException; /** * 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 @@ public class CatalogTracker { // 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 @@ public class CatalogTracker { } /** - * 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 @@ public class CatalogTracker { 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 @@ public class CatalogTracker { } /** - * 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 @@ public class CatalogTracker { 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 @@ public class CatalogTracker { } /** - * 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 */ Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java Fri Sep 6 00:31:57 2013 @@ -43,7 +43,7 @@ import java.util.Set; 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 @@ public class MetaReader { 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 @@ public class MetaReader { } /** - * 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 @@ public class MetaReader { } /** - * 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 @@ public class MetaReader { } /** - * Performs a full scan of .META.. + * Performs a full scan of hbase:meta. * @return List of {@link Result} * @throws IOException */ @@ -129,7 +129,7 @@ public class MetaReader { } /** - * 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 @@ public class MetaReader { } /** - * 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 @@ public class MetaReader { /** * 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 @@ public class MetaReader { } /** - * 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 @@ public class MetaReader { } /** - * 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 @@ public class MetaReader { /** * @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 @@ public class MetaReader { 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 @@ public class MetaReader { * @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 @@ public class MetaReader { } /** - * 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 Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Fri Sep 6 00:31:57 2013 @@ -277,11 +277,11 @@ public class HBaseAdmin implements Abort } /** - * 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 @@ public class HBaseAdmin implements Abort 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 @@ public class HBaseAdmin implements Abort * 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 @@ public class HBaseAdmin implements Abort * 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 Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java Fri Sep 6 00:31:57 2013 @@ -209,11 +209,11 @@ public interface HConnection extends Abo 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 Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Fri Sep 6 00:31:57 2013 @@ -1089,14 +1089,14 @@ public class HConnectionManager { } /* - * 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 @@ public class HConnectionManager { 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 @@ public class HConnectionManager { } 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."); } Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java Fri Sep 6 00:31:57 2013 @@ -186,8 +186,8 @@ public interface HTableInterface extends * * @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; Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java Fri Sep 6 00:31:57 2013 @@ -38,14 +38,14 @@ import org.apache.hadoop.hbase.TableNotF 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 @@ public class MetaScanner { 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 @@ public class MetaScanner { } /** - * 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 @@ public class MetaScanner { /** * 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; Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java Fri Sep 6 00:31:57 2013 @@ -117,12 +117,12 @@ public abstract class RegionServerCallab (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); } Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Registry.java Fri Sep 6 00:31:57 2013 @@ -24,7 +24,7 @@ import org.apache.hadoop.hbase.HRegionLo /** * 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 { /** Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java Fri Sep 6 00:31:57 2013 @@ -213,7 +213,7 @@ public enum EventType { /** * 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), /** Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaRegionTracker.java Fri Sep 6 00:31:57 2013 @@ -111,16 +111,16 @@ public class MetaRegionTracker extends Z } /** - * 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 @@ public class MetaRegionTracker extends Z } /** - * 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); Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (original) +++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java Fri Sep 6 00:31:57 2013 @@ -1587,7 +1587,7 @@ public class ZKUtil { 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); Modified: hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java (original) +++ hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/Cell.java Fri Sep 6 00:31:57 2013 @@ -47,7 +47,7 @@ import org.apache.hadoop.classification. * 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 Modified: hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java (original) +++ hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java Fri Sep 6 00:31:57 2013 @@ -30,9 +30,9 @@ import com.google.common.primitives.Long /** * 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( Modified: hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (original) +++ hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java Fri Sep 6 00:31:57 2013 @@ -356,7 +356,7 @@ public final class HConstants { // 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(); Modified: hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java (original) +++ hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java Fri Sep 6 00:31:57 2013 @@ -85,7 +85,7 @@ public class KeyValue implements Cell, H */ 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(); @@ -1461,7 +1461,7 @@ public class KeyValue implements Cell, H 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; @@ -1510,12 +1510,12 @@ public class KeyValue implements Cell, H } /** - * 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 @@ -1526,7 +1526,7 @@ public class KeyValue implements Cell, H 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; Modified: hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java (original) +++ hbase/branches/0.96/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java Fri Sep 6 00:31:57 2013 @@ -64,7 +64,7 @@ public final class TableName implements "(?:(?:(?:"+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"); Modified: hbase/branches/0.96/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java (original) +++ hbase/branches/0.96/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java Fri Sep 6 00:31:57 2013 @@ -153,7 +153,7 @@ public class TestKeyValue extends TestCa 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; } Modified: hbase/branches/0.96/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java (original) +++ hbase/branches/0.96/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterFileSystemSource.java Fri Sep 6 00:31:57 2013 @@ -48,7 +48,7 @@ public interface MetricsMasterFileSystem 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"; Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java (original) +++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RestartRsHoldingMetaAction.java Fri Sep 6 00:31:57 2013 @@ -32,7 +32,7 @@ public class RestartRsHoldingMetaAction 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); Modified: hbase/branches/0.96/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java (original) +++ hbase/branches/0.96/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/PrefixTreeCodec.java Fri Sep 6 00:31:57 2013 @@ -194,7 +194,7 @@ public class PrefixTreeCodec implements 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"); } Modified: hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original) +++ hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Fri Sep 6 00:31:57 2013 @@ -273,7 +273,7 @@ AssignmentManager assignmentManager = ma - + @@ -318,7 +318,7 @@ AssignmentManager assignmentManager = ma <%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."; } Modified: hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon (original) +++ hbase/branches/0.96/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon Fri Sep 6 00:31:57 2013 @@ -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.

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java Fri Sep 6 00:31:57 2013 @@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.util.Byte 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { /** * 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 @@ public class MetaEditor { /** - * 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 @@ public class MetaEditor { * @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 @@ public class MetaEditor { } /** - * 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 @@ public class MetaEditor { } /** - * 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 Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/catalog/MetaMigrationConvertingToPB.java Fri Sep 6 00:31:57 2013 @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.protobuf. 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 @@ public class MetaMigrationConvertingToPB 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 @@ public class MetaMigrationConvertingToPB 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) { Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java Fri Sep 6 00:31:57 2013 @@ -101,11 +101,11 @@ public class HFilePrettyPrinter { "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"); } Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java Fri Sep 6 00:31:57 2013 @@ -270,7 +270,7 @@ public class WALPlayer extends Configure 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."); Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Fri Sep 6 00:31:57 2013 @@ -148,7 +148,7 @@ public class AssignmentManager extends Z 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 @@ public class AssignmentManager extends Z // 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 @@ public class AssignmentManager extends Z 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 @@ public class AssignmentManager extends Z 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 @@ public class AssignmentManager extends Z // 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 @@ public class AssignmentManager extends Z } /** - * 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 @@ public class AssignmentManager extends Z // 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 @@ public class AssignmentManager extends Z 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 @@ public class AssignmentManager extends Z } /** - * 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 Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java Fri Sep 6 00:31:57 2013 @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.util.Pair 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 @@ public class CatalogJanitor extends Chor } /** - * 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 @@ public class CatalogJanitor extends Chor } /** - * 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 @@ public class CatalogJanitor extends Chor 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 @@ public class CatalogJanitor extends Chor } }; - // 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 @@ public class CatalogJanitor extends Chor /** * 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 @@ public class CatalogJanitor extends Chor } /** - * 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 Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java?rev=1520464&r1=1520463&r2=1520464&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java Fri Sep 6 00:31:57 2013 @@ -147,7 +147,7 @@ public class ClusterStatusPublisher exte // 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,

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