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 2011/11/30 17:38:02 UTC
svn commit: r1208498 - in /hbase/branches/0.90: ./
src/main/java/org/apache/hadoop/hbase/
src/main/java/org/apache/hadoop/hbase/catalog/
src/main/java/org/apache/hadoop/hbase/client/
src/main/java/org/apache/hadoop/hbase/ipc/ src/main/java/org/apache/h...
Author: stack
Date: Wed Nov 30 16:38:01 2011
New Revision: 1208498
URL: http://svn.apache.org/viewvc?rev=1208498&view=rev
Log:
Backout hbase-4900 temporarily
Removed:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignCallable.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/UnAssignCallable.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/RegionOpeningState.java
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1208498&r1=1208497&r2=1208498&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Nov 30 16:38:01 2011
@@ -100,7 +100,6 @@ Release 0.90.5 - Unreleased
HBASE-4862 Splitting hlog and opening region concurrently may cause data loss
(Chunhui Shen)
HBASE-4773 HBaseAdmin may leak ZooKeeper connections (Xufeng)
- HBASE-4900 Fix javadoc warnings out on 0.90 branch
IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles)
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1208498&r1=1208497&r2=1208498&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/HConstants.java Wed Nov 30 16:38:01 2011
@@ -405,19 +405,19 @@ public final class HConstants {
public static int DEFAULT_HBASE_META_SCANNER_CACHING = 100;
/**
- * Parameter name for unique identifier for this Configuration
- * instance. If there are two or more Configuration instances that,
+ * Parameter name for unique identifier for this {@link Configuration}
+ * instance. If there are two or more {@link Configuration} instances that,
* for all intents and purposes, are the same except for their instance ids,
- * then they will not be able to share the same HConnection instance.
+ * then they will not be able to share the same {@link Connection} instance.
* On the other hand, even if the instance ids are the same, it could result
- * in non-shared HConnection instances if some of the other connection
+ * in non-shared {@link Connection} instances if some of the other connection
* parameters differ.
*/
public static String HBASE_CLIENT_INSTANCE_ID = "hbase.client.instance.id";
/**
- * If this parameter is set true then HConnectionManager will not share
- * HConnection instances with different Configuration instances.
+ * If this parameter is set true then {@link HConnectionManager} will not share
+ * {@link HConnection} instances with different {@link Configuration} instances.
*/
public static String HBASE_CONNECTION_PER_CONFIG = "hbase.connection.per.config";
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1208498&r1=1208497&r2=1208498&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java Wed Nov 30 16:38:01 2011
@@ -101,7 +101,7 @@ public class CatalogTracker {
* begin active tracking by executing {@link #start()} post construction.
* Does not timeout.
* @param zk
- * @param conf Configuration instance
+ * @param connection server connection
* @param abortable if fatal exception
* @throws IOException
*/
@@ -115,7 +115,7 @@ public class CatalogTracker {
* Constructs the catalog tracker. Find current state of catalog tables and
* begin active tracking by executing {@link #start()} post construction.
* @param zk
- * @param conf
+ * @param connection server connection
* @param abortable if fatal exception
* @param defaultTimeout Timeout to use. Pass zero for no timeout
* ({@link Object#wait(long)} when passed a <code>0</code> waits for ever).
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1208498&r1=1208497&r2=1208498&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Wed Nov 30 16:38:01 2011
@@ -278,7 +278,7 @@ public class HConnectionManager {
* of a {@link HConnection} instance based on the given {@link Configuration}.
*
* <p>
- * If you find yourself wanting to use a {@link HConnection} for a relatively
+ * If you find yourself wanting to use a {@link Connection} for a relatively
* short duration of time, and do not want to deal with the hassle of creating
* and cleaning up that resource, then you should consider using this
* convenience class.
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java?rev=1208498&r1=1208497&r2=1208498&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java Wed Nov 30 16:38:01 2011
@@ -316,6 +316,9 @@ public interface HRegionInterface extend
*
* @param region
* region to open
+ * @param versionOfOfflineNode
+ * the version of znode to compare when RS transitions the znode from
+ * OFFLINE state.
* @return RegionOpeningState
* OPENED - if region open request was successful.
* ALREADY_OPENED - if the region was already opened.
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=1208498&r1=1208497&r2=1208498&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Wed Nov 30 16:38:01 2011
@@ -140,6 +140,7 @@ public class FSUtils {
/**
* Check whether dfs is in safemode.
* @param conf
+ * @return true if dfs is in safemode.
* @throws IOException
*/
public static void checkDfsSafeMode(final Configuration conf)