You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@geode.apache.org by GitBox <gi...@apache.org> on 2021/03/04 17:10:37 UTC

[GitHub] [geode] kamilla1201 opened a new pull request #6089: GEODE-8972

kamilla1201 opened a new pull request #6089:
URL: https://github.com/apache/geode/pull/6089


   (cherry picked from commit 83e2ee1f167e62721bc4998f834776b49b946b31)
   
   Thank you for submitting a contribution to Apache Geode.
   
   In order to streamline the review of the contribution we ask you
   to ensure the following steps have been taken:
   
   ### For all changes:
   - [ ] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
   
   - [ ] Has your PR been rebased against the latest commit within the target branch (typically `develop`)?
   
   - [ ] Is your initial contribution a single, squashed commit?
   
   - [ ] Does `gradlew build` run cleanly?
   
   - [ ] Have you written or updated unit tests to verify your changes?
   
   - [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
   
   ### Note:
   Please ensure that once the PR is submitted, check Concourse for build issues and
   submit an update to your PR as soon as possible. If you need help, please send an
   email to dev@geode.apache.org.
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [geode] bschuchardt commented on a change in pull request #6089: GEODE-8972: remove shunnedMembers collection from GMSMembership

Posted by GitBox <gi...@apache.org>.
bschuchardt commented on a change in pull request #6089:
URL: https://github.com/apache/geode/pull/6089#discussion_r588509623



##########
File path: geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMembership.java
##########
@@ -1443,33 +1379,18 @@ private void destroyMember(final ID member, final String reason) {
    *
    * @param m the member in question
    *
-   *        This also checks the time the given member was shunned, and has the side effect of
-   *        removing the member from the list if it was shunned too far in the past.
-   *
    * @return true if the given member is a zombie
    */
   @Override
   public boolean isShunned(ID m) {
-    if (!shunnedMembers.containsKey(m)) {
-      return false;
-    }
-
-    // Make sure that the entry isn't stale...
-    long shunTime = shunnedMembers.get(m).longValue();
-    long now = System.currentTimeMillis();
-    if (shunTime + SHUNNED_SUNSET * 1000L > now) {
-      return true;
-    }
-
-    // Oh, it _is_ stale. Remove it while we're here.
-    endShun(m);
-    return false;
+    final MembershipView<ID> view = latestView;
+    return m.getVmViewId() <= view.getViewId() && !view.contains(m);
   }
 
   private boolean isShunnedOrNew(final ID m) {
     latestViewReadLock.lock();
     try {
-      return shunnedMembers.containsKey(m) || isNew(m);
+      return isShunned(m) || isNew(m);

Review comment:
       I think this could be made more efficient, and that it would be worthwhile to do so since this is called unconditionally from dispatchMessage().  The method isShunned() will normally return true because the sender is usually in the current membership view.  If this is the case we don't need to obtain the readlock because the view is now immutable.
   ```
   MembershipView view = latestView;
   if (m.getVmViewId() <=  view.getViewId() && view.contains(m)) {
     return false;
   }
   latestViewReadLock.lock();
   try {
     return isShunned(m) || isNew(m);
   } finally {
   ...
   ```




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [geode] bschuchardt merged pull request #6089: GEODE-8972: remove shunnedMembers collection from GMSMembership

Posted by GitBox <gi...@apache.org>.
bschuchardt merged pull request #6089:
URL: https://github.com/apache/geode/pull/6089


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org