Repository: hbase
Updated Branches:
  refs/heads/master 464e7ce68 -> d1ca560ff


HBASE-11580 Failover handling for secondary region replicas - ADDENDUM for 
javadoc fixes


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d1ca560f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d1ca560f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d1ca560f

Branch: refs/heads/master
Commit: d1ca560ff72bd97faa94fce025bf126702bbdd1b
Parents: 464e7ce
Author: Enis Soztutar <e...@apache.org>
Authored: Wed Mar 4 14:21:52 2015 -0800
Committer: Enis Soztutar <e...@apache.org>
Committed: Wed Mar 4 14:22:07 2015 -0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/regionserver/HRegion.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d1ca560f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index a3672fb..78c4806 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1983,7 +1983,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver { //
   /**
    * Flushing all stores.
    *
-   * @see #internalFlushcache(Collection, MonitoredTask)
+   * @see #internalFlushcache(Collection, MonitoredTask, boolean)
    */
   private FlushResult internalFlushcache(MonitoredTask status)
       throws IOException {
@@ -1993,7 +1993,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver { //
   /**
    * Flushing given stores.
    *
-   * @see #internalFlushcache(WAL, long, Collection, MonitoredTask)
+   * @see #internalFlushcache(WAL, long, Collection, MonitoredTask, boolean)
    */
   private FlushResult internalFlushcache(final Collection<Store> storesToFlush,
       MonitoredTask status, boolean writeFlushWalMarker) throws IOException {
@@ -2238,7 +2238,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver { //
    * Writes a marker to WAL indicating a flush is requested but cannot be 
complete due to various
    * reasons. Ignores exceptions from WAL. Returns whether the write succeeded.
    * @param wal
-   * @return
+   * @return whether WAL write was successful
    */
   private boolean writeFlushRequestMarkerToWAL(WAL wal, boolean 
writeFlushWalMarker) {
     if (writeFlushWalMarker && wal != null && !writestate.readOnly) {

Reply via email to