Return-Path: 
 <commits-return-29213-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
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 C44BE18886
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue, 24 Nov 2015 07:42:43 +0000 (UTC)
Received: (qmail 43855 invoked by uid 500); 24 Nov 2015 07:42:43 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 43725 invoked by uid 500); 24 Nov 2015 07:42:43 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 43655 invoked by uid 99); 24 Nov 2015 07:42:43 -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; Tue, 24 Nov 2015 07:42:43 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 51865E015B; Tue, 24 Nov 2015 07:42:43 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mbertozzi@apache.org
To: commits@hbase.apache.org
Date: Tue, 24 Nov 2015 07:42:45 -0000
Message-Id: <9c8917dc988e45259236b3e910b7162f@git.apache.org>
In-Reply-To: <1b65095936984010a532fe1680555b84@git.apache.org>
References: <1b65095936984010a532fe1680555b84@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/4] hbase git commit: HBASE-14843 TestWALProcedureStore.testLoad is
 flakey (addendum)

HBASE-14843 TestWALProcedureStore.testLoad is flakey (addendum)


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

Branch: refs/heads/branch-1.2
Commit: 7d2648a1325371462f87e3e560f55bc7fe9a2913
Parents: 68f8f87
Author: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Authored: Mon Nov 23 23:35:10 2015 -0800
Committer: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Committed: Mon Nov 23 23:36:24 2015 -0800

----------------------------------------------------------------------
 .../hbase/procedure2/store/wal/WALProcedureStore.java   | 12 +++++++-----
 .../procedure2/store/wal/TestWALProcedureStore.java     |  5 ++++-
 2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/7d2648a1/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index f7193f8..d73cb4f 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -111,13 +111,14 @@ public class WALProcedureStore extends ProcedureStoreBase {
   private final FileSystem fs;
   private final Path logDir;
 
-  private AtomicBoolean loading = new AtomicBoolean(true);
-  private AtomicBoolean inSync = new AtomicBoolean(false);
-  private AtomicReference<Throwable> syncException = new AtomicReference<>();
+  private final AtomicReference<Throwable> syncException = new AtomicReference<Throwable>();
+  private final AtomicBoolean loading = new AtomicBoolean(true);
+  private final AtomicBoolean inSync = new AtomicBoolean(false);
+  private final AtomicLong totalSynced = new AtomicLong(0);
+  private final AtomicLong lastRollTs = new AtomicLong(0);
+
   private LinkedTransferQueue<ByteSlot> slotsCache = null;
   private Set<ProcedureWALFile> corruptedLogs = null;
-  private AtomicLong totalSynced = new AtomicLong(0);
-  private AtomicLong lastRollTs = new AtomicLong(0);
   private FSDataOutputStream stream = null;
   private long flushLogId = 0;
   private int slotIndex = 0;
@@ -148,6 +149,7 @@ public class WALProcedureStore extends ProcedureStoreBase {
     }
 
     // Init buffer slots
+    loading.set(true);
     slots = new ByteSlot[numSlots];
     slotsCache = new LinkedTransferQueue();
     while (slotsCache.size() < numSlots) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/7d2648a1/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 5a96da4..1265f3f 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -84,6 +84,7 @@ public class TestWALProcedureStore {
     procStore = ProcedureTestingUtility.createWalStore(htu.getConfiguration(), fs, logDir);
     procStore.start(PROCEDURE_STORE_SLOTS);
     procStore.recoverLease();
+    procStore.load(new LoadCounter());
   }
 
   @After
@@ -435,7 +436,9 @@ public class TestWALProcedureStore {
     InputStream in = fs.open(logFile.getPath());
     OutputStream out =  fs.create(tmpPath);
     IOUtils.copyBytes(in, out, logFile.getLen() - dropBytes, true);
-    fs.rename(tmpPath, logFile.getPath());
+    if (!fs.rename(tmpPath, logFile.getPath())) {
+      throw new IOException("Unable to rename");
+    }
   }
 
   private void verifyProcIdsOnRestart(final Set<Long> procIds) throws Exception {