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 2009/07/22 16:06:37 UTC
svn commit: r796731 - in
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util: FSUtils.java
MetaUtils.java Migrate.java
Author: stack
Date: Wed Jul 22 14:06:36 2009
New Revision: 796731
URL: http://svn.apache.org/viewvc?rev=796731&view=rev
Log:
HBASE-1215 migration part 7; javadoc and extra setVersion utility
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=796731&r1=796730&r2=796731&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java Wed Jul 22 14:06:36 2009
@@ -193,11 +193,24 @@
*/
public static void setVersion(FileSystem fs, Path rootdir)
throws IOException {
+ setVersion(fs, rootdir, HConstants.FILE_SYSTEM_VERSION);
+ }
+
+ /**
+ * Sets version of file system
+ *
+ * @param fs
+ * @param rootdir
+ * @param version
+ * @throws IOException
+ */
+ public static void setVersion(FileSystem fs, Path rootdir, String version)
+ throws IOException {
FSDataOutputStream s =
fs.create(new Path(rootdir, HConstants.VERSION_FILE_NAME));
- s.writeUTF(HConstants.FILE_SYSTEM_VERSION);
+ s.writeUTF(version);
s.close();
- LOG.debug("Created version file to: " + rootdir.toString());
+ LOG.debug("Created version file at " + rootdir.toString() + " set its version at:" + version);
}
/**
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java?rev=796731&r1=796730&r2=796731&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java Wed Jul 22 14:06:36 2009
@@ -42,8 +42,6 @@
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.io.BatchUpdate;
-import org.apache.hadoop.hbase.io.Cell;
import org.apache.hadoop.hbase.regionserver.HLog;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
@@ -124,7 +122,7 @@
HRegion meta = metaRegions.get(metaInfo.getRegionName());
if (meta == null) {
meta = openMetaRegion(metaInfo);
- LOG.info("META OPEN " + meta.toString());
+ LOG.info("OPENING META " + meta.toString());
this.metaRegions.put(metaInfo.getRegionName(), meta);
}
return meta;
@@ -147,7 +145,7 @@
}
try {
for (HRegion r: metaRegions.values()) {
- LOG.info("META CLOSE " + r.toString());
+ LOG.info("CLOSING META " + r.toString());
r.close();
}
} catch (IOException e) {
@@ -230,6 +228,9 @@
* TODO: Use Visitor rather than Listener pattern. Allow multiple Visitors.
* Use this everywhere we scan meta regions: e.g. in metascanners, in close
* handling, etc. Have it pass in the whole row, not just HRegionInfo.
+ * <p>Use for reading meta only. Does not close region when done.
+ * Use {@link #getMetaRegion(HRegionInfo)} instead if writing. Adds
+ * meta region to list that will get a close on {@link #shutdown()}.
*
* @param metaRegionInfo HRegionInfo for meta region
* @param listener method to be called for each meta region found
@@ -255,8 +256,7 @@
Scan scan = new Scan();
scan.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);
- InternalScanner metaScanner =
- m.getScanner(scan);
+ InternalScanner metaScanner = m.getScanner(scan);
try {
List<KeyValue> results = new ArrayList<KeyValue>();
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java?rev=796731&r1=796730&r2=796731&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java Wed Jul 22 14:06:36 2009
@@ -244,7 +244,6 @@
throw new IOException(msg);
}
}
- // TOOD: Verify all has been brought over from old to new layout.
final MetaUtils utils = new MetaUtils(this.conf);
final List<HRegionInfo> metas = new ArrayList<HRegionInfo>();
try {
@@ -264,14 +263,14 @@
});
// Scan meta.
for (HRegionInfo hri: metas) {
- final HRegionInfo metahri = hri;
- utils.scanMetaRegion(hri, new MetaUtils.ScannerListener() {
+ final HRegion h = utils.getMetaRegion(hri);
+ utils.scanMetaRegion(h, new MetaUtils.ScannerListener() {
public boolean processRow(HRegionInfo info) throws IOException {
if (check && !migrationNeeded) {
migrationNeeded = true;
return false;
}
- rewriteHRegionInfo(utils.getMetaRegion(metahri), info);
+ rewriteHRegionInfo(h, info);
return true;
}
});
@@ -341,7 +340,7 @@
}
/**
- * Rewrite the passed mapfile
+ * Rewrite the passed 0.19 mapfile as a 0.20 file.
* @param fs
* @param mf
* @throws IOExcepion