geode git commit: GEODE-2193 a member is kicked out immediately after joining

2016-12-09 Thread bschuchardt
Repository: geode
Updated Branches:
  refs/heads/develop ac3a82241 -> ef86239f8


GEODE-2193 a member is kicked out immediately after joining

The problem is happening because we send a shutdown message, initiating
election of a new coordinator, but the old ViewCreator is allowed to
send out a view announcing a new member.  The new coordinator manages
to send out a new view before the old ViewCreator sends out the new
member's view.  Other members ignore the old ViewCreator's view
because its view ID is old.  Then the reject the new member because
it has an old view ID and it isn't in their membership view.

initial view ID is x

new coordinator prepares view x+10
old coordinator prepares view x+1
other members install x+10, reject view x+1
new member joins in view x+1 when it receives view-prepare message
new member is rejected by other members because x+1 < x+10


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ef86239f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ef86239f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ef86239f

Branch: refs/heads/develop
Commit: ef86239f872c12c0aad38d5ae3044e22fd5e87af
Parents: ac3a822
Author: Bruce Schuchardt 
Authored: Fri Dec 9 14:01:46 2016 -0800
Committer: Bruce Schuchardt 
Committed: Fri Dec 9 14:01:46 2016 -0800

--
 .../membership/gms/membership/GMSJoinLeave.java | 86 
 .../gms/messages/JoinResponseMessage.java   |  7 ++
 .../geode/distributed/LocatorJUnitTest.java |  3 +
 .../gms/membership/GMSJoinLeaveJUnitTest.java   | 67 +--
 4 files changed, 119 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/ef86239f/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 6d782b1..4ee3011 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -803,13 +803,6 @@ public class GMSJoinLeave implements JoinLeave, 
MessageHandler {
 return newView;
   }
 
-  private void sendJoinResponses(NetView newView, 
List newMbrs) {
-for (InternalDistributedMember mbr : newMbrs) {
-  JoinResponseMessage response = new JoinResponseMessage(mbr, newView, 0);
-  services.getMessenger().send(response);
-}
-  }
-
   private void sendRemoveMessages(List removals, 
List reasons,
   Set oldIds) {
 Iterator reason = reasons.iterator();
@@ -826,11 +819,19 @@ public class GMSJoinLeave implements JoinLeave, 
MessageHandler {
 
   boolean prepareView(NetView view, List newMembers)
   throws InterruptedException {
+if (services.getCancelCriterion().isCancelInProgress()
+|| services.getManager().shutdownInProgress()) {
+  throw new InterruptedException("shutting down");
+}
 return sendView(view, true, this.prepareProcessor);
   }
 
   void sendView(NetView view, List newMembers)
   throws InterruptedException {
+if (services.getCancelCriterion().isCancelInProgress()
+|| services.getManager().shutdownInProgress()) {
+  throw new InterruptedException("shutting down");
+}
 sendView(view, false, this.viewProcessor);
   }
 
@@ -1401,7 +1402,9 @@ public class GMSJoinLeave implements JoinLeave, 
MessageHandler {
   for (Iterator it = viewRequests.iterator(); 
it.hasNext();) {
 DistributionMessage m = it.next();
 if (m instanceof JoinRequestMessage) {
-  it.remove();
+  if (currentView.contains(((JoinRequestMessage) 
m).getMemberID())) {
+it.remove();
+  }
 } else if (m instanceof LeaveRequestMessage) {
   if (!currentView.contains(((LeaveRequestMessage) 
m).getMemberID())) {
 it.remove();
@@ -1500,6 +1503,11 @@ public class GMSJoinLeave implements JoinLeave, 
MessageHandler {
 if (viewCreator != null && !viewCreator.isShutdown()) {
   logger.debug("Shutting down ViewCreator");
   viewCreator.shutdown();
+  try {
+viewCreator.join(1000);
+  } catch (InterruptedException e) {
+Thread.currentThread().interrupt();
+  }
 }
   }
 
@@ -1641,8 +1649,6 @@ public class GMSJoinLeave implements JoinLeave, 
MessageHandler {
 services.getMessenger().addHandler(ViewAckMessage.class, this);
 

geode git commit: Update website release references to remove incubator

2016-12-09 Thread abaker
Repository: geode
Updated Branches:
  refs/heads/develop 09184881a -> ac3a82241


Update website release references to remove incubator

The release location has changed due to TLP. After the next release,
we should also update the archives location on the release page.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ac3a8224
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ac3a8224
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ac3a8224

Branch: refs/heads/develop
Commit: ac3a8224170c48358dba706d4704058eaf53608f
Parents: 0918488
Author: Anthony Baker 
Authored: Fri Dec 9 12:47:56 2016 -0800
Committer: Anthony Baker 
Committed: Fri Dec 9 12:49:34 2016 -0800

--
 geode-site/website/content/releases/index.html | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/ac3a8224/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index de0335d..8947839 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -39,10 +39,10 @@ under the License. -->
 
 
  Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.asc;>PGP
 ]
+  [ http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.sha256;>SHA-256,
+  https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.asc;>PGP
 ] -
+  [http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.sha256;>SHA-256,
+  https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.asc;>PGP
 ]
   
 
   Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
@@ -51,11 +51,11 @@ under the License. -->
 
 
  Source
-   [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.asc;>PGP
+   [ http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.sha256;>SHA-256,
+   https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.asc;>PGP
 ] -
-   [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.asc;>PGP
+   [http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.sha256;>SHA-256,
+   https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.asc;>PGP
]
  
 
@@ -98,10 +98,10 @@ under the License. -->
 

geode git commit: Update website release references to remove incubator

2016-12-09 Thread abaker
Repository: geode
Updated Branches:
  refs/heads/asf-site 53896567b -> a08e92e91


Update website release references to remove incubator

The release location has changed due to TLP. After the next release,
we should also update the archives location on the release page.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a08e92e9
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a08e92e9
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a08e92e9

Branch: refs/heads/asf-site
Commit: a08e92e919b92dfd4a74a3043dbb451a768849be
Parents: 5389656
Author: Anthony Baker 
Authored: Fri Dec 9 13:13:50 2016 -0800
Committer: Anthony Baker 
Committed: Fri Dec 9 13:13:50 2016 -0800

--
 releases/index.html | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/a08e92e9/releases/index.html
--
diff --git a/releases/index.html b/releases/index.html
index 48bd549..47e0cb2 100644
--- a/releases/index.html
+++ b/releases/index.html
@@ -135,10 +135,10 @@ under the License. -->
 
 
  Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.asc;>PGP
 ]
+  [ http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.sha256;>SHA-256,
+  https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.asc;>PGP
 ] -
+  [http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.sha256;>SHA-256,
+  https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.asc;>PGP
 ]
   
 
   Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
@@ -147,11 +147,11 @@ under the License. -->
 
 
  Source
-   [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.asc;>PGP
+   [ http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.sha256;>SHA-256,
+   https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.asc;>PGP
 ] -
-   [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.asc;>PGP
+   [http://apache.org/dyn/closer.cgi/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.sha256;>SHA-256,
+   https://dist.apache.org/repos/dist/release/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.asc;>PGP
]
  
 
@@ -194,10 +194,10 @@ under the License. -->
Project releases are approved by vote 
of the Apache Geode Project Management Committee (PMC). Support for a release 
is