Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EBF5610425 for ; Fri, 4 Sep 2015 04:33:36 +0000 (UTC) Received: (qmail 75508 invoked by uid 500); 4 Sep 2015 04:33:36 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 75460 invoked by uid 500); 4 Sep 2015 04:33:36 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 75450 invoked by uid 99); 4 Sep 2015 04:33:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2015 04:33:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 830A3E7EC3; Fri, 4 Sep 2015 04:33:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Date: Fri, 04 Sep 2015 04:33:36 -0000 Message-Id: <3b51fb1555954799a9085b9a1ae66d78@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hbase git commit: HBASE-14317 Stuck FSHLog: bad disk (HDFS-8960) and can't roll WAL Repository: hbase Updated Branches: refs/heads/master 2481b7f76 -> 661faf6fe http://git-wip-us.apache.org/repos/asf/hbase/blob/661faf6f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java index 651f7b2..9ecd408 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java @@ -90,10 +90,6 @@ public class TestLogRolling { private MiniHBaseCluster cluster; private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - /** - * constructor - * @throws Exception - */ public TestLogRolling() { this.server = null; this.tableName = null; @@ -529,7 +525,16 @@ public class TestLogRolling { // flush all regions for (Region r: server.getOnlineRegionsLocalContext()) { - r.flush(true); + try { + r.flush(true); + } catch (Exception e) { + // This try/catch was added by HBASE-14317. It is needed + // because this issue tightened up the semantic such that + // a failed append could not be followed by a successful + // sync. What is coming out here is a failed sync, a sync + // that used to 'pass'. + LOG.info(e); + } } ResultScanner scanner = table.getScanner(new Scan());