Repository: hbase Updated Branches: refs/heads/0.98 23a4181d1 -> ee32706c5
Revert "HBASE-11868 Data loss in hlog when the hdfs is unavailable (Liu Shaohui)" This reverts commit fd10bde5af20d6db96207cc2e29b779e117acf19. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ee32706c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ee32706c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ee32706c Branch: refs/heads/0.98 Commit: ee32706c5d93fb3de6f4aba09174d34ca3879f6d Parents: 23a4181 Author: Andrew Purtell <[email protected]> Authored: Tue Sep 2 18:32:25 2014 -0700 Committer: Andrew Purtell <[email protected]> Committed: Tue Sep 2 18:32:25 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ee32706c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index ee22bb4..594002d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -1350,16 +1350,17 @@ class FSHLog implements HLog, Syncable { while (this.syncedTillHere.get() < txid) { try { this.syncedTillHere.wait(); + + if (txid <= this.failedTxid.get()) { + assert asyncIOE != null : + "current txid is among(under) failed txids, but asyncIOE is null!"; + throw asyncIOE; + } } catch (InterruptedException e) { LOG.debug("interrupted while waiting for notification from AsyncNotifier"); } } } - if (txid <= this.failedTxid.get()) { - assert asyncIOE != null : - "current txid is among(under) failed txids, but asyncIOE is null!"; - throw asyncIOE; - } } @Override
