[09/50] [abbrv] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-28 Thread zhouxj 
GEODE-3175 backward-compatibility tests fail with bad classpath

Attempt restart of a VM if it is unavailable.


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

Branch: refs/heads/feature/GEM-1483
Commit: e7515f595cb084d9f17da6f7ff8e567cf884
Parents: 0e6dce7
Author: Bruce Schuchardt 
Authored: Thu Jul 13 13:40:53 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 25 08:19:48 2017 -0700

--
 .../src/test/java/org/apache/geode/test/dunit/Host.java   |  4 +++-
 .../src/test/java/org/apache/geode/test/dunit/VM.java | 10 ++
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/e7515f59/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
index b38b3c7..4cb6992 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
@@ -163,7 +163,9 @@ public abstract class Host implements Serializable {
   throw new IllegalArgumentException(s);
 
 } else {
-  return (VM) vms.get(n);
+  VM vm = (VM) vms.get(n);
+  vm.makeAvailable();
+  return vm;
 }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e7515f59/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
index 0b188ae..f011330 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
@@ -60,6 +60,16 @@ public class VM implements Serializable {
   }
 
   /**
+   * restart an unavailable VM
+   */
+  public synchronized void makeAvailable() {
+if (!this.available) {
+  this.available = true;
+  bounce();
+}
+  }
+
+  /**
* Returns the total number of {@code VM}s on all {@code Host}s (note that 
DUnit currently only
* supports one {@code Host}).
*/

[08/50] [abbrv] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-28 Thread zhouxj 
GEODE-3175 backward-compatibility tests fail with bad classpath

Checking in changes on a feature branch that remove current-version
product classes from the classpaths of JVMs running old versions
of Geode.


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

Branch: refs/heads/feature/GEM-1483
Commit: 0e6dce76cb97cf3ac5f20eaaeeb130a4babd4212
Parents: b7db727
Author: Bruce Schuchardt 
Authored: Thu Jul 13 10:49:02 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 25 08:19:47 2017 -0700

--
 .../java/org/apache/geode/internal/Version.java | 13 +
 .../tier/sockets/ServerHandShakeProcessor.java  |  3 +-
 .../geode/test/dunit/standalone/ChildVM.java|  8 ++-
 .../test/dunit/standalone/ProcessManager.java   | 60 +++-
 4 files changed, 43 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/0e6dce76/geode-core/src/main/java/org/apache/geode/internal/Version.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java 
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 3064c4c..39e3a3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -180,11 +180,14 @@ public class Version implements Comparable {
   public static final Version GFE_90 =
   new Version("GFE", "9.0", (byte) 9, (byte) 0, (byte) 0, (byte) 0, 
GFE_90_ORDINAL);
 
+  // prior to v1.2.0 GEODE_110 was named GFE_91. This was used for both the 
rel/v1.1.0
+  // and rel/v1.1.1 releases
   private static final byte GEODE_110_ORDINAL = 50;
 
   public static final Version GEODE_110 =
   new Version("GEODE", "1.1.0", (byte) 1, (byte) 1, (byte) 0, (byte) 0, 
GEODE_110_ORDINAL);
 
+  // This ordinal was never used
   private static final byte GEODE_111_ORDINAL = 55;
 
   public static final Version GEODE_111 =
@@ -206,8 +209,6 @@ public class Version implements Comparable {
*/
   public static final short CURRENT_ORDINAL = CURRENT.ordinal();
 
-  public static final short NOT_SUPPORTED_ORDINAL = 59;
-
   /**
* version ordinal for test Backward compatibility.
*/
@@ -246,14 +247,6 @@ public class Version implements Comparable {
   /** Return the Version represented by specified ordinal */
   public static Version fromOrdinal(short ordinal, boolean forGFEClients)
   throws UnsupportedVersionException {
-// Un-version client(client's prior to release 5.7) doesn't send version
-// byte in the handshake. So the next byte in the handshake has value 59 
and
-// is interpreted as version byte. We are not supporting version 59 to
-// distinguish version client from unversion. Please use version ordinal 60
-// after 58 if required.
-if (ordinal == NOT_SUPPORTED_ORDINAL) {
-  throw new UnsupportedVersionException("Un-versioned clients are not 
supported. ");
-}
 if (ordinal == TOKEN_ORDINAL) {
   return TOKEN;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/0e6dce76/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 8b89694..47e6f3d 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -374,8 +374,7 @@ public class ServerHandShakeProcessor {
 clientVersion = Version.fromOrdinal(clientVersionOrdinal, true);
   } catch (UnsupportedVersionException uve) {
 // Allows higher version of wan site to connect to server
-if (connection.getCommunicationMode() == Acceptor.GATEWAY_TO_GATEWAY
-&& !(clientVersionOrdinal == Version.NOT_SUPPORTED_ORDINAL)) {
+if (connection.getCommunicationMode() == Acceptor.GATEWAY_TO_GATEWAY) {
   return Acceptor.VERSION;
 } else {
   SocketAddress sa = socket.getRemoteSocketAddress();

http://git-wip-us.apache.org/repos/asf/geode/blob/0e6dce76/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
--
diff --git

[1/2] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-25 Thread bschuchardt 
Repository: geode
Updated Branches:
  refs/heads/develop b7db727ad -> e7515f595


GEODE-3175 backward-compatibility tests fail with bad classpath

Checking in changes on a feature branch that remove current-version
product classes from the classpaths of JVMs running old versions
of Geode.


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

Branch: refs/heads/develop
Commit: 0e6dce76cb97cf3ac5f20eaaeeb130a4babd4212
Parents: b7db727
Author: Bruce Schuchardt 
Authored: Thu Jul 13 10:49:02 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 25 08:19:47 2017 -0700

--
 .../java/org/apache/geode/internal/Version.java | 13 +
 .../tier/sockets/ServerHandShakeProcessor.java  |  3 +-
 .../geode/test/dunit/standalone/ChildVM.java|  8 ++-
 .../test/dunit/standalone/ProcessManager.java   | 60 +++-
 4 files changed, 43 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/0e6dce76/geode-core/src/main/java/org/apache/geode/internal/Version.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java 
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 3064c4c..39e3a3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -180,11 +180,14 @@ public class Version implements Comparable {
   public static final Version GFE_90 =
   new Version("GFE", "9.0", (byte) 9, (byte) 0, (byte) 0, (byte) 0, 
GFE_90_ORDINAL);
 
+  // prior to v1.2.0 GEODE_110 was named GFE_91. This was used for both the 
rel/v1.1.0
+  // and rel/v1.1.1 releases
   private static final byte GEODE_110_ORDINAL = 50;
 
   public static final Version GEODE_110 =
   new Version("GEODE", "1.1.0", (byte) 1, (byte) 1, (byte) 0, (byte) 0, 
GEODE_110_ORDINAL);
 
+  // This ordinal was never used
   private static final byte GEODE_111_ORDINAL = 55;
 
   public static final Version GEODE_111 =
@@ -206,8 +209,6 @@ public class Version implements Comparable {
*/
   public static final short CURRENT_ORDINAL = CURRENT.ordinal();
 
-  public static final short NOT_SUPPORTED_ORDINAL = 59;
-
   /**
* version ordinal for test Backward compatibility.
*/
@@ -246,14 +247,6 @@ public class Version implements Comparable {
   /** Return the Version represented by specified ordinal */
   public static Version fromOrdinal(short ordinal, boolean forGFEClients)
   throws UnsupportedVersionException {
-// Un-version client(client's prior to release 5.7) doesn't send version
-// byte in the handshake. So the next byte in the handshake has value 59 
and
-// is interpreted as version byte. We are not supporting version 59 to
-// distinguish version client from unversion. Please use version ordinal 60
-// after 58 if required.
-if (ordinal == NOT_SUPPORTED_ORDINAL) {
-  throw new UnsupportedVersionException("Un-versioned clients are not 
supported. ");
-}
 if (ordinal == TOKEN_ORDINAL) {
   return TOKEN;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/0e6dce76/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 8b89694..47e6f3d 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -374,8 +374,7 @@ public class ServerHandShakeProcessor {
 clientVersion = Version.fromOrdinal(clientVersionOrdinal, true);
   } catch (UnsupportedVersionException uve) {
 // Allows higher version of wan site to connect to server
-if (connection.getCommunicationMode() == Acceptor.GATEWAY_TO_GATEWAY
-&& !(clientVersionOrdinal == Version.NOT_SUPPORTED_ORDINAL)) {
+if (connection.getCommunicationMode() == Acceptor.GATEWAY_TO_GATEWAY) {
   return Acceptor.VERSION;
 } else {
   SocketAddress sa = socket.getRemoteSocketAddress();

http://git-wip-us.apache.org/repos/asf/geode/blob/0e6dce76/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java

[2/2] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-25 Thread bschuchardt 
GEODE-3175 backward-compatibility tests fail with bad classpath

Attempt restart of a VM if it is unavailable.


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

Branch: refs/heads/develop
Commit: e7515f595cb084d9f17da6f7ff8e567cf884
Parents: 0e6dce7
Author: Bruce Schuchardt 
Authored: Thu Jul 13 13:40:53 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 25 08:19:48 2017 -0700

--
 .../src/test/java/org/apache/geode/test/dunit/Host.java   |  4 +++-
 .../src/test/java/org/apache/geode/test/dunit/VM.java | 10 ++
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/e7515f59/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
index b38b3c7..4cb6992 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
@@ -163,7 +163,9 @@ public abstract class Host implements Serializable {
   throw new IllegalArgumentException(s);
 
 } else {
-  return (VM) vms.get(n);
+  VM vm = (VM) vms.get(n);
+  vm.makeAvailable();
+  return vm;
 }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e7515f59/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
index 0b188ae..f011330 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
@@ -60,6 +60,16 @@ public class VM implements Serializable {
   }
 
   /**
+   * restart an unavailable VM
+   */
+  public synchronized void makeAvailable() {
+if (!this.available) {
+  this.available = true;
+  bounce();
+}
+  }
+
+  /**
* Returns the total number of {@code VM}s on all {@code Host}s (note that 
DUnit currently only
* supports one {@code Host}).
*/

[03/51] [abbrv] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-19 Thread ladyvader 
GEODE-3175 backward-compatibility tests fail with bad classpath

temporarily backing out removal of current-version class files and
resources to observe build behavior.


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

Branch: refs/heads/feature/GEODE-3113
Commit: e02be316e17fbc539e94d8379a6bef31a0fd1fc5
Parents: 6e86762
Author: Bruce Schuchardt 
Authored: Tue Jul 11 08:38:40 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 11 08:40:14 2017 -0700

--
 .../test/dunit/standalone/ProcessManager.java   | 37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/e02be316/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index 9e62484..98b27a6 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -178,24 +178,25 @@ public class ProcessManager {
   classPath = dunitClasspath;
 } else {
   // remove current-version product classes and resources from the 
classpath
-  String buildDir = separator + "geode-core" + separator + "build" + 
separator;
-
-  String mainClasses = buildDir + "classes" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
-
-  String mainResources = buildDir + "resources" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainResources);
-
-  String generatedResources = buildDir + "generated-resources" + separator 
+ "main";
-  dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
-
-  buildDir = separator + "geode-common" + separator + "build" + separator 
+ "classes"
-  + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
-
-  buildDir = separator + "geode-json" + separator + "build" + separator + 
"classes" + separator
-  + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  // String buildDir = separator + "geode-core" + separator + "build" + 
separator;
+  //
+  // String mainClasses = buildDir + "classes" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
+  //
+  // String mainResources = buildDir + "resources" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainResources);
+  //
+  // String generatedResources = buildDir + "generated-resources" + 
separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
+  //
+  // buildDir = separator + "geode-common" + separator + "build" + 
separator + "classes"
+  // + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  //
+  // buildDir = separator + "geode-json" + separator + "build" + separator 
+ "classes" +
+  // separator
+  // + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
 
   classPath = versionManager.getClasspath(version) + File.pathSeparator + 
dunitClasspath;
 }

[57/58] [abbrv] geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-17 Thread abaker 
GEODE-3175 backward-compatibility tests fail with bad classpath

temporarily backing out removal of current-version class files and
resources to observe build behavior.


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

Branch: refs/heads/master
Commit: 964f2749065ce9c6898fd27983b43f1bd9fc77d0
Parents: 2cf335c
Author: Bruce Schuchardt 
Authored: Tue Jul 11 09:31:40 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 11 09:31:40 2017 -0700

--
 .../test/dunit/standalone/ProcessManager.java   | 37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/964f2749/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index 9e62484..98b27a6 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -178,24 +178,25 @@ public class ProcessManager {
   classPath = dunitClasspath;
 } else {
   // remove current-version product classes and resources from the 
classpath
-  String buildDir = separator + "geode-core" + separator + "build" + 
separator;
-
-  String mainClasses = buildDir + "classes" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
-
-  String mainResources = buildDir + "resources" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainResources);
-
-  String generatedResources = buildDir + "generated-resources" + separator 
+ "main";
-  dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
-
-  buildDir = separator + "geode-common" + separator + "build" + separator 
+ "classes"
-  + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
-
-  buildDir = separator + "geode-json" + separator + "build" + separator + 
"classes" + separator
-  + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  // String buildDir = separator + "geode-core" + separator + "build" + 
separator;
+  //
+  // String mainClasses = buildDir + "classes" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
+  //
+  // String mainResources = buildDir + "resources" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainResources);
+  //
+  // String generatedResources = buildDir + "generated-resources" + 
separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
+  //
+  // buildDir = separator + "geode-common" + separator + "build" + 
separator + "classes"
+  // + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  //
+  // buildDir = separator + "geode-json" + separator + "build" + separator 
+ "classes" +
+  // separator
+  // + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
 
   classPath = versionManager.getClasspath(version) + File.pathSeparator + 
dunitClasspath;
 }

geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-13 Thread bschuchardt 
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3175 66f226823 -> f6ff39145


GEODE-3175 backward-compatibility tests fail with bad classpath

Attempt restart of a VM if it is unavailable.


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

Branch: refs/heads/feature/GEODE-3175
Commit: f6ff39145d5ed83e5729f82ab1c6681c9ae14aa8
Parents: 66f2268
Author: Bruce Schuchardt 
Authored: Thu Jul 13 13:40:53 2017 -0700
Committer: Bruce Schuchardt 
Committed: Thu Jul 13 13:45:53 2017 -0700

--
 .../src/test/java/org/apache/geode/test/dunit/Host.java   |  4 +++-
 .../src/test/java/org/apache/geode/test/dunit/VM.java | 10 ++
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/f6ff3914/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
index b38b3c7..4cb6992 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
@@ -163,7 +163,9 @@ public abstract class Host implements Serializable {
   throw new IllegalArgumentException(s);
 
 } else {
-  return (VM) vms.get(n);
+  VM vm = (VM) vms.get(n);
+  vm.makeAvailable();
+  return vm;
 }
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f6ff3914/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
index 0b188ae..f011330 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
@@ -60,6 +60,16 @@ public class VM implements Serializable {
   }
 
   /**
+   * restart an unavailable VM
+   */
+  public synchronized void makeAvailable() {
+if (!this.available) {
+  this.available = true;
+  bounce();
+}
+  }
+
+  /**
* Returns the total number of {@code VM}s on all {@code Host}s (note that 
DUnit currently only
* supports one {@code Host}).
*/

geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-13 Thread bschuchardt 
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3175 [created] 66f226823


GEODE-3175 backward-compatibility tests fail with bad classpath

Checking in changes on a feature branch that remove current-version
product classes from the classpaths of JVMs running old versions
of Geode.


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

Branch: refs/heads/feature/GEODE-3175
Commit: 66f2268230ef19be9ad9c6cc61eba9b9a0eb8542
Parents: 659654a
Author: Bruce Schuchardt 
Authored: Thu Jul 13 10:49:02 2017 -0700
Committer: Bruce Schuchardt 
Committed: Thu Jul 13 10:49:02 2017 -0700

--
 .../java/org/apache/geode/internal/Version.java | 13 +
 .../tier/sockets/ServerHandShakeProcessor.java  |  3 +-
 .../geode/test/dunit/standalone/ChildVM.java|  8 ++-
 .../test/dunit/standalone/ProcessManager.java   | 60 +++-
 4 files changed, 43 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/66f22682/geode-core/src/main/java/org/apache/geode/internal/Version.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java 
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 3064c4c..39e3a3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -180,11 +180,14 @@ public class Version implements Comparable {
   public static final Version GFE_90 =
   new Version("GFE", "9.0", (byte) 9, (byte) 0, (byte) 0, (byte) 0, 
GFE_90_ORDINAL);
 
+  // prior to v1.2.0 GEODE_110 was named GFE_91. This was used for both the 
rel/v1.1.0
+  // and rel/v1.1.1 releases
   private static final byte GEODE_110_ORDINAL = 50;
 
   public static final Version GEODE_110 =
   new Version("GEODE", "1.1.0", (byte) 1, (byte) 1, (byte) 0, (byte) 0, 
GEODE_110_ORDINAL);
 
+  // This ordinal was never used
   private static final byte GEODE_111_ORDINAL = 55;
 
   public static final Version GEODE_111 =
@@ -206,8 +209,6 @@ public class Version implements Comparable {
*/
   public static final short CURRENT_ORDINAL = CURRENT.ordinal();
 
-  public static final short NOT_SUPPORTED_ORDINAL = 59;
-
   /**
* version ordinal for test Backward compatibility.
*/
@@ -246,14 +247,6 @@ public class Version implements Comparable {
   /** Return the Version represented by specified ordinal */
   public static Version fromOrdinal(short ordinal, boolean forGFEClients)
   throws UnsupportedVersionException {
-// Un-version client(client's prior to release 5.7) doesn't send version
-// byte in the handshake. So the next byte in the handshake has value 59 
and
-// is interpreted as version byte. We are not supporting version 59 to
-// distinguish version client from unversion. Please use version ordinal 60
-// after 58 if required.
-if (ordinal == NOT_SUPPORTED_ORDINAL) {
-  throw new UnsupportedVersionException("Un-versioned clients are not 
supported. ");
-}
 if (ordinal == TOKEN_ORDINAL) {
   return TOKEN;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/66f22682/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 8b89694..47e6f3d 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -374,8 +374,7 @@ public class ServerHandShakeProcessor {
 clientVersion = Version.fromOrdinal(clientVersionOrdinal, true);
   } catch (UnsupportedVersionException uve) {
 // Allows higher version of wan site to connect to server
-if (connection.getCommunicationMode() == Acceptor.GATEWAY_TO_GATEWAY
-&& !(clientVersionOrdinal == Version.NOT_SUPPORTED_ORDINAL)) {
+if (connection.getCommunicationMode() == Acceptor.GATEWAY_TO_GATEWAY) {
   return Acceptor.VERSION;
 } else {
   SocketAddress sa = socket.getRemoteSocketAddress();

http://git-wip-us.apache.org/repos/asf/geode/blob/66f22682/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java

geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-11 Thread bschuchardt 
Repository: geode
Updated Branches:
  refs/heads/release/1.2.0 2cf335c11 -> 964f27490


GEODE-3175 backward-compatibility tests fail with bad classpath

temporarily backing out removal of current-version class files and
resources to observe build behavior.


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

Branch: refs/heads/release/1.2.0
Commit: 964f2749065ce9c6898fd27983b43f1bd9fc77d0
Parents: 2cf335c
Author: Bruce Schuchardt 
Authored: Tue Jul 11 09:31:40 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 11 09:31:40 2017 -0700

--
 .../test/dunit/standalone/ProcessManager.java   | 37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/964f2749/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index 9e62484..98b27a6 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -178,24 +178,25 @@ public class ProcessManager {
   classPath = dunitClasspath;
 } else {
   // remove current-version product classes and resources from the 
classpath
-  String buildDir = separator + "geode-core" + separator + "build" + 
separator;
-
-  String mainClasses = buildDir + "classes" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
-
-  String mainResources = buildDir + "resources" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainResources);
-
-  String generatedResources = buildDir + "generated-resources" + separator 
+ "main";
-  dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
-
-  buildDir = separator + "geode-common" + separator + "build" + separator 
+ "classes"
-  + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
-
-  buildDir = separator + "geode-json" + separator + "build" + separator + 
"classes" + separator
-  + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  // String buildDir = separator + "geode-core" + separator + "build" + 
separator;
+  //
+  // String mainClasses = buildDir + "classes" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
+  //
+  // String mainResources = buildDir + "resources" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainResources);
+  //
+  // String generatedResources = buildDir + "generated-resources" + 
separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
+  //
+  // buildDir = separator + "geode-common" + separator + "build" + 
separator + "classes"
+  // + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  //
+  // buildDir = separator + "geode-json" + separator + "build" + separator 
+ "classes" +
+  // separator
+  // + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
 
   classPath = versionManager.getClasspath(version) + File.pathSeparator + 
dunitClasspath;
 }

geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-11 Thread bschuchardt 
Repository: geode
Updated Branches:
  refs/heads/develop 6e8676238 -> e02be316e


GEODE-3175 backward-compatibility tests fail with bad classpath

temporarily backing out removal of current-version class files and
resources to observe build behavior.


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

Branch: refs/heads/develop
Commit: e02be316e17fbc539e94d8379a6bef31a0fd1fc5
Parents: 6e86762
Author: Bruce Schuchardt 
Authored: Tue Jul 11 08:38:40 2017 -0700
Committer: Bruce Schuchardt 
Committed: Tue Jul 11 08:40:14 2017 -0700

--
 .../test/dunit/standalone/ProcessManager.java   | 37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/e02be316/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index 9e62484..98b27a6 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -178,24 +178,25 @@ public class ProcessManager {
   classPath = dunitClasspath;
 } else {
   // remove current-version product classes and resources from the 
classpath
-  String buildDir = separator + "geode-core" + separator + "build" + 
separator;
-
-  String mainClasses = buildDir + "classes" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
-
-  String mainResources = buildDir + "resources" + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, mainResources);
-
-  String generatedResources = buildDir + "generated-resources" + separator 
+ "main";
-  dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
-
-  buildDir = separator + "geode-common" + separator + "build" + separator 
+ "classes"
-  + separator + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
-
-  buildDir = separator + "geode-json" + separator + "build" + separator + 
"classes" + separator
-  + "main";
-  dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  // String buildDir = separator + "geode-core" + separator + "build" + 
separator;
+  //
+  // String mainClasses = buildDir + "classes" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainClasses);
+  //
+  // String mainResources = buildDir + "resources" + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, mainResources);
+  //
+  // String generatedResources = buildDir + "generated-resources" + 
separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, generatedResources);
+  //
+  // buildDir = separator + "geode-common" + separator + "build" + 
separator + "classes"
+  // + separator + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
+  //
+  // buildDir = separator + "geode-json" + separator + "build" + separator 
+ "classes" +
+  // separator
+  // + "main";
+  // dunitClasspath = removeFromPath(dunitClasspath, buildDir);
 
   classPath = versionManager.getClasspath(version) + File.pathSeparator + 
dunitClasspath;
 }

geode git commit: GEODE-3175 backward-compatibility tests fail with bad classpath

2017-07-10 Thread bschuchardt 
Repository: geode
Updated Branches:
  refs/heads/develop 03503ce7e -> 5c434bc3a


GEODE-3175 backward-compatibility tests fail with bad classpath

Added a printout of the versions loaded by VersionManager when it
initializes.  This will help us figure out why the test runs are failing.


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

Branch: refs/heads/develop
Commit: 5c434bc3adb5e329a8bfc809395171d4e1aff524
Parents: 03503ce
Author: Bruce Schuchardt 
Authored: Mon Jul 10 10:50:11 2017 -0700
Committer: Bruce Schuchardt 
Committed: Mon Jul 10 10:50:11 2017 -0700

--
 .../org/apache/geode/test/dunit/standalone/VersionManager.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/5c434bc3/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
index 8eefa01..739b690 100755
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
@@ -45,6 +45,8 @@ public class VersionManager {
 instance = new VersionManager();
 final String fileName = "geodeOldVersionClasspaths.txt";
 instance.findVersions(fileName);
+System.out
+.println("VersionManager has loaded the following classpaths:\n" + 
instance.classPaths);
   }
 
   public static VersionManager getInstance() {