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 AC517200CB6 for ; Thu, 29 Jun 2017 18:34:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AB0BA160BED; Thu, 29 Jun 2017 16:34:11 +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 F2F7D160BC6 for ; Thu, 29 Jun 2017 18:34:10 +0200 (CEST) Received: (qmail 62857 invoked by uid 500); 29 Jun 2017 16:34:10 -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 62848 invoked by uid 99); 29 Jun 2017 16:34:10 -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; Thu, 29 Jun 2017 16:34:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0E297DFBDA; Thu, 29 Jun 2017 16:34:10 +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: <7cb5dc4442d4495c9c92f76c6d5a9947@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-HBASE-18290 Fix TestAddColumnFamilyProcedure and TestDeleteTableProcedure Date: Thu, 29 Jun 2017 16:34:10 +0000 (UTC) archived-at: Thu, 29 Jun 2017 16:34:11 -0000 Repository: hbase Updated Branches: refs/heads/branch-2 7e7917ed6 -> 3dcb03947 HBASE-HBASE-18290 Fix TestAddColumnFamilyProcedure and TestDeleteTableProcedure Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3dcb0394 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3dcb0394 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3dcb0394 Branch: refs/heads/branch-2 Commit: 3dcb03947ce9cb1825167784992e689a23847351 Parents: 7e7917e Author: Michael Stack Authored: Wed Jun 28 15:23:00 2017 -0700 Committer: Michael Stack Committed: Thu Jun 29 09:34:02 2017 -0700 ---------------------------------------------------------------------- .../hbase/procedure2/store/wal/ProcedureWALFormatReader.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3dcb0394/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 c1b1439..e528c73 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,8 +483,12 @@ public class ProcedureWALFormatReader { */ private static boolean isIncreasing(ProcedureProtos.Procedure current, ProcedureProtos.Procedure candidate) { - boolean increasing = current.getStackIdCount() <= candidate.getStackIdCount() && - current.getLastUpdate() <= candidate.getLastUpdate(); + // Check that the procedures we see are 'increasing'. We used to compare + // procedure id first and then update time but it can legitimately go backwards if the + // procedure is failed or rolled back so that was unreliable. Was going to compare + // state but lets see if comparing update time enough (unfortunately this issue only + // seen under load...) + boolean increasing = current.getLastUpdate() <= candidate.getLastUpdate(); if (!increasing) { LOG.warn("NOT INCREASING! current=" + current + ", candidate=" + candidate); }