Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7A47D200CAD for ; Wed, 14 Jun 2017 06:59:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 790C2160BE9; Wed, 14 Jun 2017 04:59:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BDB3A160BDC for ; Wed, 14 Jun 2017 06:59:22 +0200 (CEST) Received: (qmail 17321 invoked by uid 500); 14 Jun 2017 04:59:21 -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 17312 invoked by uid 99); 14 Jun 2017 04:59:21 -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; Wed, 14 Jun 2017 04:59:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A79F6DFAF1; Wed, 14 Jun 2017 04:59:21 +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 Message-Id: <3b89c09f48574bfe8e9ccce49f1cd50e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18216 [AMv2] Workaround for HBASE-18152, corrupt procedure WAL; ADDENDUM Date: Wed, 14 Jun 2017 04:59:21 +0000 (UTC) archived-at: Wed, 14 Jun 2017 04:59:23 -0000 Repository: hbase Updated Branches: refs/heads/master 0b43353bf -> 550b6c585 HBASE-18216 [AMv2] Workaround for HBASE-18152, corrupt procedure WAL; ADDENDUM Forgot this change found testing. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/550b6c58 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/550b6c58 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/550b6c58 Branch: refs/heads/master Commit: 550b6c585e0390bc80516e64df8bd1a3a6e10e23 Parents: 0b43353 Author: Michael Stack Authored: Tue Jun 13 21:58:48 2017 -0700 Committer: Michael Stack Committed: Tue Jun 13 21:58:48 2017 -0700 ---------------------------------------------------------------------- .../hbase/procedure2/store/wal/ProcedureWALFormatReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/550b6c58/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java index 4d644f7..c1b1439 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java @@ -483,7 +483,7 @@ public class ProcedureWALFormatReader { */ private static boolean isIncreasing(ProcedureProtos.Procedure current, ProcedureProtos.Procedure candidate) { - boolean increasing = current.getStackIdCount() < candidate.getStackIdCount() && + boolean increasing = current.getStackIdCount() <= candidate.getStackIdCount() && current.getLastUpdate() <= candidate.getLastUpdate(); if (!increasing) { LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate); @@ -868,4 +868,4 @@ public class ProcedureWALFormatReader { return (int)(Procedure.getProcIdHashCode(procId) % procedureMap.length); } } -} \ No newline at end of file +}