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 00572200CFC for ; Wed, 23 Aug 2017 22:55:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F3305169AEC; Wed, 23 Aug 2017 20:55: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 584A2169ADF for ; Wed, 23 Aug 2017 22:55:11 +0200 (CEST) Received: (qmail 60956 invoked by uid 500); 23 Aug 2017 20:55:10 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 59482 invoked by uid 99); 23 Aug 2017 20:55:06 -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, 23 Aug 2017 20:55:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0015EF5EEC; Wed, 23 Aug 2017 20:55:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: udo@apache.org To: commits@geode.apache.org Date: Wed, 23 Aug 2017 20:55:18 -0000 Message-Id: In-Reply-To: <7f346d4ac7e34bb2863979262b1278cc@git.apache.org> References: <7f346d4ac7e34bb2863979262b1278cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/25] geode git commit: GEODE-2859: minor cleanup archived-at: Wed, 23 Aug 2017 20:55:12 -0000 GEODE-2859: minor cleanup Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a0ad5689 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a0ad5689 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a0ad5689 Branch: refs/heads/feature/GEODE-3503 Commit: a0ad56896a8ed183f1e1db0ddc24e6857640de58 Parents: c95b32e Author: Kirk Lund Authored: Tue Aug 22 14:41:32 2017 -0700 Committer: Kirk Lund Committed: Tue Aug 22 15:37:35 2017 -0700 ---------------------------------------------------------------------- .../cli/commands/ShowDeadlockDUnitTest.java | 31 +++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/a0ad5689/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java index cd68350..ca2a043 100755 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.HashSet; -import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -41,7 +40,9 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache30.CacheTestCase; import org.apache.geode.distributed.internal.deadlock.GemFireDeadlockDetector; +import org.apache.geode.distributed.internal.deadlock.GemFireDeadlockDetectorDUnitTest; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.management.cli.CommandStatement; import org.apache.geode.management.cli.Result; @@ -52,24 +53,21 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.SerializableCallable; import org.apache.geode.test.dunit.VM; -import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder; /** - * This DUnit tests uses same code as GemFireDeadlockDetectorDUnitTest and uses the command - * processor for executing the "show deadlock" command + * Distributed tests for show deadlock command in {@link MiscellaneousCommands}. + * + * @see GemFireDeadlockDetectorDUnitTest */ @Category(DistributedTest.class) -public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { +public class ShowDeadlockDUnitTest extends CacheTestCase { + private static final Set stuckThreads = Collections.synchronizedSet(new HashSet()); - private static final Lock lock = new ReentrantLock(); - private static final Map EMPTY_ENV = Collections.emptyMap(); - - @Rule - public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder(); + private static final Lock lock = new ReentrantLock(); private transient VM vm0; private transient VM vm1; @@ -77,6 +75,9 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { private transient InternalDistributedMember member0; private transient InternalDistributedMember member1; + @Rule + public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder(); + @Before public void setup() { Host host = Host.getHost(0); @@ -123,7 +124,6 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { assertTrue(outputFile.exists()); } - @Test public void testDistributedDeadlockWithFunction() throws Exception { // Have two threads lock locks on different members in different orders. @@ -155,7 +155,6 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { }); } - private void createCache(Properties props) { getSystem(props); getCache(); @@ -174,6 +173,7 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { private InternalDistributedMember createCache(VM vm) { return (InternalDistributedMember) vm.invoke(new SerializableCallable() { + @Override public Object call() { getCache(); return getSystem().getDistributedMember(); @@ -193,20 +193,23 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { private static class TestFunction implements Function { private static final int LOCK_WAIT_TIME = 1000; + @Override public boolean hasResult() { return true; } + @Override public void execute(FunctionContext context) { try { stuckThreads.add(Thread.currentThread()); lock.tryLock(LOCK_WAIT_TIME, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // ingore + } catch (InterruptedException ignored) { + // ignored } context.getResultSender().lastResult(null); } + @Override public boolean isHA() { return false; }