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 2A7AD200CC4 for ; Thu, 29 Jun 2017 01:02:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 29ABD160BFC; Wed, 28 Jun 2017 23:02:04 +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 70EE4160BF7 for ; Thu, 29 Jun 2017 01:02:03 +0200 (CEST) Received: (qmail 5842 invoked by uid 500); 28 Jun 2017 23:02:02 -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 5831 invoked by uid 99); 28 Jun 2017 23:02:02 -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, 28 Jun 2017 23:02:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7DDB6DFA84; Wed, 28 Jun 2017 23:02:02 +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: <5c140cf8ce314be3aa88b2e74d676c30@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18278 Enable and Fix for unit test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta Date: Wed, 28 Jun 2017 23:02:02 +0000 (UTC) archived-at: Wed, 28 Jun 2017 23:02:04 -0000 Repository: hbase Updated Branches: refs/heads/master a19e5673d -> 038d7e898 HBASE-18278 Enable and Fix for unit test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/038d7e89 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/038d7e89 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/038d7e89 Branch: refs/heads/master Commit: 038d7e89845c22e9fa3e9d3b770672686def2ea5 Parents: a19e567 Author: Umesh Agashe Authored: Mon Jun 26 15:10:19 2017 -0700 Committer: Michael Stack Committed: Wed Jun 28 16:01:55 2017 -0700 ---------------------------------------------------------------------- .../hbase/master/procedure/MasterProcedureTestingUtility.java | 1 + .../hadoop/hbase/master/procedure/TestServerCrashProcedure.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/038d7e89/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java index 99dcf1d..d8a69a6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java @@ -81,6 +81,7 @@ public class MasterProcedureTestingUtility { env.getMasterServices().getServerManager().removeRegion(regionState.getRegion()); } am.stop(); + master.setServerCrashProcessingEnabled(false); master.setInitialized(false); return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/038d7e89/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java index b64905e..e2d894f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java @@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MasterTests; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -87,7 +86,6 @@ public class TestServerCrashProcedure { } @Test(timeout=60000) - @Ignore // Fix for AMv2 public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception { testRecoveryAndDoubleExecution(true); }