hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerry...@apache.org
Subject hbase git commit: HBASE-14256 Flush task message may be confusing when region is recovered (Gabor Liptak)
Date Thu, 24 Mar 2016 17:15:14 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 9725a5bd7 -> 1be381e7d


HBASE-14256 Flush task message may be confusing when region is recovered (Gabor Liptak)


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

Branch: refs/heads/branch-1.2
Commit: 1be381e7d98545d8745ffac7c6df22d486f31e01
Parents: 9725a5b
Author: Jerry He <jerryjch@apache.org>
Authored: Thu Mar 24 10:01:53 2016 -0700
Committer: Jerry He <jerryjch@apache.org>
Committed: Thu Mar 24 10:13:28 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/1be381e7/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 da155fb..18024d9 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
@@ -1189,11 +1189,12 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver,
Regi
       // force a flush only if region replication is set up for this region. Otherwise no
need.
       boolean forceFlush = getTableDesc().getRegionReplication() > 1;
 
-      // force a flush first
-      MonitoredTask status = TaskMonitor.get().createStatus(
-        "Flushing region " + this + " because recovery is finished");
+      MonitoredTask status = TaskMonitor.get().createStatus("Recovering region " + this);
+
       try {
+        // force a flush first
         if (forceFlush) {
+          status.setStatus("Flushing region " + this + " because recovery is finished");
           internalFlushcache(status);
         }
 
@@ -1209,13 +1210,13 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver,
Regi
           // We cannot rethrow this exception since we are being called from the zk thread.
The
           // region has already opened. In this case we log the error, but continue
           LOG.warn(getRegionInfo().getEncodedName() + " : was not able to write region opening
"
-              + "event to WAL, continueing", e);
+              + "event to WAL, continuing", e);
         }
       } catch (IOException ioe) {
         // Distributed log replay semantics does not necessarily require a flush, since the
replayed
         // data is already written again in the WAL. So failed flush should be fine.
         LOG.warn(getRegionInfo().getEncodedName() + " : was not able to flush "
-            + "event to WAL, continueing", ioe);
+            + "event to WAL, continuing", ioe);
       } finally {
         status.cleanup();
       }


Mime
View raw message