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 F37C3200C23 for ; Wed, 22 Feb 2017 18:27:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id F2438160B87; Wed, 22 Feb 2017 17:27:27 +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 B63E0160B90 for ; Wed, 22 Feb 2017 18:27:26 +0100 (CET) Received: (qmail 26372 invoked by uid 500); 22 Feb 2017 17:27:19 -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 24999 invoked by uid 99); 22 Feb 2017 17:27:17 -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, 22 Feb 2017 17:27:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75BFCDFF4E; Wed, 22 Feb 2017 17:27:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Wed, 22 Feb 2017 17:28:09 -0000 Message-Id: In-Reply-To: <7a72734ae3e04c0c8044579cce5255aa@git.apache.org> References: <7a72734ae3e04c0c8044579cce5255aa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [56/57] [abbrv] geode git commit: GEODE-2497 surprise member not removed during startup archived-at: Wed, 22 Feb 2017 17:27:28 -0000 GEODE-2497 surprise member not removed during startup addressing Galen's comments on the pull request Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3474fa7a Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3474fa7a Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3474fa7a Branch: refs/heads/feature/GEODE-2460 Commit: 3474fa7ab4bccbe7a08f70e251ac778eebd6c453 Parents: 135bd77 Author: Bruce Schuchardt Authored: Tue Feb 21 16:36:39 2017 -0800 Committer: Bruce Schuchardt Committed: Tue Feb 21 16:36:39 2017 -0800 ---------------------------------------------------------------------- .../membership/gms/mgr/GMSMembershipManager.java | 6 +++--- .../internal/DistributionManagerDUnitTest.java | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/3474fa7a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java index 050e201..d0a0cbe 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java @@ -576,7 +576,7 @@ public class GMSMembershipManager implements MembershipManager, Manager { // expire surprise members, add others to view long oldestAllowed = System.currentTimeMillis() - this.surpriseMemberTimeout; for (Iterator> it = - surpriseMembers.entrySet().iterator(); it.hasNext();) { + surpriseMembers.entrySet().iterator(); it.hasNext();) { Map.Entry entry = it.next(); Long birthtime = entry.getValue(); if (birthtime.longValue() < oldestAllowed) { @@ -1150,7 +1150,7 @@ public class GMSMembershipManager implements MembershipManager, Manager { @Override public void memberSuspected(InternalDistributedMember initiator, - InternalDistributedMember suspect, String reason) { + InternalDistributedMember suspect, String reason) { SuspectMember s = new SuspectMember(initiator, suspect, reason); handleOrDeferSuspect(s); } @@ -1803,7 +1803,7 @@ public class GMSMembershipManager implements MembershipManager, Manager { } public Set send(InternalDistributedMember[] destinations, - DistributionMessage msg, DMStats theStats) throws NotSerializableException { + DistributionMessage msg, DMStats theStats) throws NotSerializableException { Set result; boolean allDestinations = msg.forAll(); http://git-wip-us.apache.org/repos/asf/geode/blob/3474fa7a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java index 5e3cf3e..08e3b87 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java @@ -77,7 +77,8 @@ public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase { public static DistributedSystem ds; @Rule - public DistributedRestoreSystemProperties restoreSystemProperties = new DistributedRestoreSystemProperties(); + public DistributedRestoreSystemProperties restoreSystemProperties = + new DistributedRestoreSystemProperties(); /** * Clears the exceptionInThread flag in the given distribution manager. @@ -174,8 +175,7 @@ public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase { // if the view number isn't being recorded correctly the test will pass but the // functionality is broken - Assert.assertTrue("expected view ID to be greater than zero", - mgr.getView().getViewId() > 0); + Assert.assertTrue("expected view ID to be greater than zero", mgr.getView().getViewId() > 0); int oldViewId = mbr.getVmViewId(); mbr.setVmViewId((int) mgr.getView().getViewId() - 1); @@ -200,11 +200,9 @@ public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase { MembershipManagerHelper.addSurpriseMember(sys, mbr, birthTime); assertTrue("Member was not a surprise member", mgr.isSurpriseMember(mbr)); - if (birthTime < (System.currentTimeMillis() - timeout)) { - return; // machine is too busy and we didn't get enough CPU to perform more assertions - } - assertTrue("Member was incorrectly removed from surprise member set", - mgr.isSurpriseMember(mbr)); +// if (birthTime < (System.currentTimeMillis() - timeout)) { +// return; // machine is too busy and we didn't get enough CPU to perform more assertions +// } Awaitility.await("waiting for member to be removed") .atMost((timeout / 3) + gracePeriod, TimeUnit.MILLISECONDS)