You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/09/06 02:31:59 UTC
svn commit: r1520464 [3/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/...
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Fri Sep 6 00:31:57 2013
@@ -119,7 +119,7 @@ import com.google.protobuf.ServiceExcept
* HBaseFsck (hbck) is a tool for checking and repairing region consistency and
* table integrity problems in a corrupted HBase.
* <p>
- * 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.
* <p>
@@ -131,7 +131,7 @@ import com.google.protobuf.ServiceExcept
* The general repair strategy works in two phases:
* <ol>
* <li> Repair Table Integrity on HDFS. (merge or fabricate regions)
- * <li> Repair Region Consistency with .META. and assignments
+ * <li> Repair Region Consistency with hbase:meta and assignments
* </ol>
* <p>
* For table integrity repairs, the tables' region directories are scanned
@@ -143,7 +143,7 @@ import com.google.protobuf.ServiceExcept
* <p>
* 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.
* <p>
* Region consistency requires three conditions -- 1) valid .regioninfo file
@@ -203,7 +203,7 @@ public class HBaseFsck extends Configure
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<TableName> tablesIncluded = new HashSet<TableName>();
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 @@ public class HBaseFsck extends Configure
private TreeMap<String, HbckInfo> regionInfoMap = new TreeMap<String, HbckInfo>();
private TreeSet<TableName> disabledTables =
new TreeSet<TableName>();
- // Empty regioninfo qualifiers in .META.
+ // Empty regioninfo qualifiers in hbase:meta
private Set<Result> emptyRegionInfoQualifiers = new HashSet<Result>();
/**
@@ -385,7 +385,7 @@ public class HBaseFsck extends Configure
/**
* 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 @@ public class HBaseFsck extends Configure
// 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();
}
@@ -648,7 +648,7 @@ public class HBaseFsck extends Configure
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.
}
@@ -694,7 +694,7 @@ public class HBaseFsck extends Configure
* 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) {
@@ -806,7 +806,7 @@ public class HBaseFsck extends Configure
// 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;
}
@@ -878,12 +878,12 @@ public class HBaseFsck extends Configure
}
/**
- * To fix the empty REGIONINFO_QUALIFIER rows from .META. <br>
+ * To fix the empty REGIONINFO_QUALIFIER rows from hbase:meta <br>
* @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);
@@ -957,7 +957,7 @@ public class HBaseFsck extends Configure
/**
* 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());
@@ -983,7 +983,7 @@ public class HBaseFsck extends Configure
for (Entry<TableName, TableInfo> e : tablesInfo.entrySet()) {
TableName name = e.getKey();
- // skip ".META."
+ // skip "hbase:meta"
if (name.compareTo(TableName.META_TABLE_NAME) == 0) {
continue;
}
@@ -1066,23 +1066,23 @@ public class HBaseFsck extends Configure
}
// 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<Put> 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;
}
@@ -1223,7 +1223,7 @@ public class HBaseFsck extends Configure
* @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();
@@ -1332,7 +1332,7 @@ public class HBaseFsck extends Configure
}
/**
- * 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 @@ public class HBaseFsck extends Configure
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 @@ public class HBaseFsck extends Configure
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 @@ public class HBaseFsck extends Configure
} 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 @@ public class HBaseFsck extends Configure
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 @@ public class HBaseFsck extends Configure
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 @@ public class HBaseFsck extends Configure
}
} 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 @@ public class HBaseFsck extends Configure
}
} 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 @@ public class HBaseFsck extends Configure
}
/**
- * 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 @@ public class HBaseFsck extends Configure
}
}
- // 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<ServerName> 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 @@ public class HBaseFsck extends Configure
}
} 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 @@ public class HBaseFsck extends Configure
}
/**
- * 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 class HBaseFsck extends Configure
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<HRegionInfo, ServerName> 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 @@ public class HBaseFsck extends Configure
} 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 @@ public class HBaseFsck extends Configure
}
};
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 @@ public class HBaseFsck extends Configure
}
/**
- * 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 @@ public class HBaseFsck extends Configure
/**
* 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 @@ public class HBaseFsck extends Configure
out.println(" -sleepBeforeRerun <timeInSeconds> 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://> HDFS path to backup existing meta.");
out.println("");
@@ -3476,7 +3476,7 @@ public class HBaseFsck extends Configure
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 @@ public class HBaseFsck extends Configure
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("");
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HFileV1Detector.java Fri Sep 6 00:31:57 2013
@@ -338,7 +338,7 @@ public class HFileV1Detector extends Con
}
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.");
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java Fri Sep 6 00:31:57 2013
@@ -70,7 +70,7 @@ class HMerge {
* 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 @@ class HMerge {
* 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 @@ class HMerge {
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 {
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java Fri Sep 6 00:31:57 2013
@@ -211,7 +211,7 @@ public class Merge extends Configured im
* Removes a region's meta information from the passed <code>meta</code>
* region.
*
- * @param meta META HRegion to be updated
+ * @param meta hbase:meta HRegion to be updated
* @param regioninfo HRegionInfo of region to remove from <code>meta</code>
*
* @throws IOException
@@ -231,7 +231,7 @@ public class Merge extends Configured im
* Adds a region's meta information from the passed <code>meta</code>
* region.
*
- * @param metainfo META HRegionInfo to be updated
+ * @param metainfo hbase:meta HRegionInfo to be updated
* @param region HRegion to add to <code>meta</code>
*
* @throws IOException
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MetaUtils.java Fri Sep 6 00:31:57 2013
@@ -122,7 +122,7 @@ public class MetaUtils {
}
try {
for (HRegion r: metaRegions.values()) {
- LOG.info("CLOSING META " + r.toString());
+ LOG.info("CLOSING hbase:meta " + r.toString());
r.close();
}
} catch (IOException e) {
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ModifyRegionUtils.java Fri Sep 6 00:31:57 2013
@@ -57,7 +57,7 @@ public abstract class ModifyRegionUtils
/**
* 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 @@ public abstract class ModifyRegionUtils
/**
* 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
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java Fri Sep 6 00:31:57 2013
@@ -660,7 +660,7 @@ public class RegionSplitter {
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;
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java Fri Sep 6 00:31:57 2013
@@ -34,7 +34,7 @@ import org.apache.hadoop.io.MultipleIOEx
/**
* 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
Modified: hbase/branches/0.96/hbase-server/src/test/data/TestMetaMigrationConvertToPB.README
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/data/TestMetaMigrationConvertToPB.README?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/data/TestMetaMigrationConvertToPB.README (original)
+++ hbase/branches/0.96/hbase-server/src/test/data/TestMetaMigrationConvertToPB.README Fri Sep 6 00:31:57 2013
@@ -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.
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java Fri Sep 6 00:31:57 2013
@@ -246,7 +246,7 @@ public abstract class HBaseCluster imple
}
/**
- * 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());
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Fri Sep 6 00:31:57 2013
@@ -883,7 +883,7 @@ public class HBaseTestingUtility extends
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 class HBaseTestingUtility extends
*/
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
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 @@ public class HBaseTestingUtility extends
}
/**
- * 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 @@ public class HBaseTestingUtility extends
}
/**
- * 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 @@ public class HBaseTestingUtility extends
}
/**
- * 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 @@ public class HBaseTestingUtility extends
* 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 @@ public class HBaseTestingUtility extends
* 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
*/
@@ -2450,7 +2450,7 @@ public class HBaseTestingUtility extends
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.
@@ -2621,9 +2621,9 @@ public class HBaseTestingUtility extends
}
/**
- * 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
@@ -2633,9 +2633,9 @@ public class HBaseTestingUtility extends
}
/**
- * 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java Fri Sep 6 00:31:57 2013
@@ -627,7 +627,7 @@ public class MiniHBaseCluster extends HB
* 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 @@ public class MiniHBaseCluster extends HB
/**
* 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() {
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java Fri Sep 6 00:31:57 2013
@@ -88,11 +88,11 @@ public class TestInfoServers {
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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/MetaMockingUtil.java Fri Sep 6 00:31:57 2013
@@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.client.Re
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 @@ public class MetaMockingUtil {
* 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 <code>.META.</code> table.
+ * @return A mocked up Result that fakes a Get on a row in the <code>hbase:meta</code> table.
* @throws IOException
*/
public static Result getMetaTableRowResult(final HRegionInfo region)
@@ -53,7 +53,7 @@ public class MetaMockingUtil {
* 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 <code>.META.</code> table.
+ * @return A mocked up Result that fakes a Get on a row in the <code>hbase:meta</code> table.
* @throws IOException
*/
public static Result getMetaTableRowResult(final HRegionInfo region, final ServerName sn)
@@ -68,7 +68,7 @@ public class MetaMockingUtil {
* @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 <code>.META.</code> table.
+ * @return A mocked up Result that fakes a Get on a row in the <code>hbase:meta</code> table.
* @throws IOException
*/
public static Result getMetaTableRowResult(HRegionInfo region, final ServerName sn,
@@ -113,7 +113,7 @@ public class MetaMockingUtil {
/**
* @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 <code>.META.</code> table.
+ * @return A mocked up Result that fakes a Get on a row in the <code>hbase:meta</code> table.
* @throws IOException
*/
public static Result getMetaTableRowResultAsSplitRegion(final HRegionInfo hri, final ServerName sn)
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java Fri Sep 6 00:31:57 2013
@@ -108,7 +108,7 @@ public class TestCatalogTracker {
// 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 @@ public class TestCatalogTracker {
}
/**
- * 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 @@ public class TestCatalogTracker {
/**
* @return A mocked up Result that fakes a Get on a row in the
- * <code>.META.</code> table.
+ * <code>hbase:meta</code> table.
* @throws IOException
*/
private Result getMetaTableRowResult() throws IOException {
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaMigrationConvertingToPB.java Fri Sep 6 00:31:57 2013
@@ -61,7 +61,7 @@ import org.junit.experimental.categories
/**
* 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 @@ public class TestMetaMigrationConverting
* 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 @@ public class TestMetaMigrationConverting
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 @@ public class TestMetaMigrationConverting
}
/**
- * 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 @@ public class TestMetaMigrationConverting
}
}
- /** 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 @@ public class TestMetaMigrationConverting
}
/**
- * 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 @@ public class TestMetaMigrationConverting
}
/**
- * 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 @@ public class TestMetaMigrationConverting
}
/**
- * 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 @@ public class TestMetaMigrationConverting
}
/**
- * 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 {
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java Fri Sep 6 00:31:57 2013
@@ -92,7 +92,7 @@ public class TestMetaReaderEditor {
/**
* 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Fri Sep 6 00:31:57 2013
@@ -1610,7 +1610,7 @@ public class TestAdmin {
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();
@@ -1692,7 +1692,7 @@ public class TestAdmin {
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());
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java Fri Sep 6 00:31:57 2013
@@ -91,7 +91,7 @@ public class TestMetaScanner {
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);
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java Fri Sep 6 00:31:57 2013
@@ -113,7 +113,7 @@ public class TestSnapshotFromClient {
}
/**
- * Test snapshotting not allowed .META. and -ROOT-
+ * Test snapshotting not allowed hbase:meta and -ROOT-
* @throws Exception
*/
@Test (timeout=300000)
@@ -123,7 +123,7 @@ public class TestSnapshotFromClient {
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
}
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java Fri Sep 6 00:31:57 2013
@@ -268,7 +268,7 @@ public class TestHFileBlock {
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 @@ public class TestHFileBlock {
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 @@ public class TestHFileBlock {
static void writeEncodedBlock(Algorithm algo, DataBlockEncoding encoding,
DataOutputStream dos, final List<Integer> encodedSizes,
- final List<ByteBuffer> encodedBlocks, int blockId,
+ final List<ByteBuffer> encodedBlocks, int blockId,
boolean includesMemstoreTS, byte[] dummyHeader) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DoubleOutputStream doubleOutputStream =
@@ -478,7 +478,7 @@ public class TestHFileBlock {
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 @@ public class TestHFileBlock {
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 @@ public class TestHFileBlock {
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 @@ public class TestHFileBlock {
+ 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 @@ public class TestHFileBlock {
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 =
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java Fri Sep 6 00:31:57 2013
@@ -174,7 +174,7 @@ public class TestHFileBlockCompatibility
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 @@ public class TestHFileBlockCompatibility
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 @@ public class TestHFileBlockCompatibility
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 @@ public class TestHFileBlockCompatibility
/**
- * 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 @@ public class TestHFileBlockCompatibility
// 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 @@ public class TestHFileBlockCompatibility
}
/**
- * Creates a new HFileBlock.
+ * Creates a new HFileBlock.
*/
public HFileBlock getBlockForCaching() {
return new HFileBlock(blockType, getOnDiskSizeWithoutHeader(),
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java Fri Sep 6 00:31:57 2013
@@ -175,7 +175,7 @@ public class TestImportExport {
}
/**
- * Test export .META. table
+ * Test export hbase:meta table
*
* @throws Exception
*/
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java Fri Sep 6 00:31:57 2013
@@ -471,7 +471,7 @@ public class TestAssignmentManager {
/**
* 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 @@ public class TestAssignmentManager {
// 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Fri Sep 6 00:31:57 2013
@@ -1314,7 +1314,7 @@ public class TestDistributedLogSplitting
/**
* 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java Fri Sep 6 00:31:57 2013
@@ -214,7 +214,7 @@ public class TestMasterFailover {
List<HRegionInfo> 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 @@ public class TestMasterFailover {
List<HRegionInfo> 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 @@ public class TestMasterFailover {
}
// 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");
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java Fri Sep 6 00:31:57 2013
@@ -164,7 +164,7 @@ public class TestMasterStatusServlet {
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,
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java Fri Sep 6 00:31:57 2013
@@ -81,7 +81,7 @@ public class TestMasterTransitions {
/**
* 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 @@ public class TestMasterTransitions {
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 @@ public class TestMasterTransitions {
}
*/
/*
- * 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java Fri Sep 6 00:31:57 2013
@@ -225,7 +225,7 @@ public class TestRegionPlacement {
// 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 @@ public class TestRegionPlacement {
// 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 @@ public class TestRegionPlacement {
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 @@ public class TestRegionPlacement {
/**
* 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 @@ public class TestRegionPlacement {
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 @@ public class TestRegionPlacement {
List<ServerName> 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 @@ public class TestRegionPlacement {
/**
* 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java Fri Sep 6 00:31:57 2013
@@ -70,7 +70,7 @@ public class TestRestartCluster {
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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java Fri Sep 6 00:31:57 2013
@@ -184,10 +184,10 @@ public class TestRollingRestart {
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 @@ public class TestRollingRestart {
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 @@ public class TestRollingRestart {
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 @@ public class TestRollingRestart {
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 @@ public class TestRollingRestart {
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");
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java Fri Sep 6 00:31:57 2013
@@ -266,7 +266,7 @@ public class TestZKBasedOpenCloseRegion
}
/*
- * 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
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java Fri Sep 6 00:31:57 2013
@@ -360,7 +360,7 @@ public class TestEndToEndSplitTransactio
// ensure that we do not have any gaps
for (int i=0; i<startKeys.length; i++) {
assertArrayEquals(
- "Hole in .META. is detected. prevEndKey=" + Bytes.toStringBinary(prevEndKey)
+ "Hole in hbase:meta is detected. prevEndKey=" + Bytes.toStringBinary(prevEndKey)
+ " ,regionStartKey=" + Bytes.toStringBinary(startKeys[i]), prevEndKey,
startKeys[i]);
prevEndKey = endKeys[i];
@@ -408,7 +408,7 @@ public class TestEndToEndSplitTransactio
}
}
- /** Blocks until the region split is complete in META and region server opens the daughters */
+ /** Blocks until the region split is complete in hbase:meta and region server opens the daughters */
public static void blockUntilRegionSplit(Configuration conf, long timeout,
final byte[] regionName, boolean waitForDaughters)
throws IOException, InterruptedException {
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java Fri Sep 6 00:31:57 2013
@@ -61,7 +61,7 @@ public class TestPriorityRpc {
public void testQosFunctionForMeta() throws IOException {
qosFunction = regionServer.getQosFunction();
RequestHeader.Builder headerBuilder = RequestHeader.newBuilder();
- //create a rpc request that has references to META region and also
+ //create a rpc request that has references to hbase:meta region and also
//uses one of the known argument classes (known argument classes are
//listed in HRegionServer.QosFunction.knownArgumentClasses)
headerBuilder.setMethodName("foo");
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java Fri Sep 6 00:31:57 2013
@@ -190,7 +190,7 @@ public class TestRegionMergeTransaction
}
/**
- * Test merging regions which are merged regions and has reference in META all
+ * Test merging regions which are merged regions and has reference in hbase:meta all
* the same
*/
@Test
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java?rev=1520464&r1=1520463&r2=1520464&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java Fri Sep 6 00:31:57 2013
@@ -204,7 +204,7 @@ public class TestRegionMergeTransactionO
}
assertFalse(hrfs.hasReferences(tableDescritor));
- // run CatalogJanitor to clean merge references in META and archive the
+ // run CatalogJanitor to clean merge references in hbase:meta and archive the
// files of merging regions
int cleaned = admin.runCatalogScan();
assertTrue(cleaned > 0);