You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/06/06 23:18:55 UTC
incubator-geode git commit: GEODE-1372 Added auto reconnect test with
UDP Encryption.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1372 7737c85d7 -> 48566a986
GEODE-1372 Added auto reconnect test with UDP Encryption.
Now we clear cache copy of ciphers when we reset member key
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/48566a98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/48566a98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/48566a98
Branch: refs/heads/feature/GEODE-1372
Commit: 48566a986c2cfa8b7b93cd6813e32bcce4108e43
Parents: 7737c85
Author: Hitesh Khamesra <hi...@yahoo.com>
Authored: Mon Jun 6 16:17:18 2016 -0700
Committer: Hitesh Khamesra <hi...@yahoo.com>
Committed: Mon Jun 6 16:17:18 2016 -0700
----------------------------------------------------------------------
.../membership/gms/messenger/GMSEncrypt.java | 7 +++++++
.../gemfire/cache30/ReconnectDUnitTest.java | 4 ++++
.../cache30/ReconnectWithUDPSecurityDUnitTest.java | 17 +++++++++++++++++
.../gms/messenger/GMSEncryptJUnitTest.java | 1 -
4 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/48566a98/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java
index b831d44..5fcf8d7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java
@@ -160,6 +160,13 @@ public class GMSEncrypt implements Cloneable {
try {
//createPeerEncryptor(mbr, publickey);
memberToPeerEncryptor.put(mbr, publickey);
+ synchronized (copyOfPeerEncryptors) {
+ //remove all the existing keys..
+ for(Map m : copyOfPeerEncryptors) {
+ if(m != null)
+ m.remove(mbr);
+ }
+ }
}catch(Exception e) {
throw new RuntimeException("Unable to create peer encryptor " + mbr, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/48566a98/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index ca2c17b..0bfde25 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -117,6 +117,7 @@ public class ReconnectDUnitTest extends CacheTestCase
dsProperties.put(DistributionConfig.MCAST_PORT_NAME, "0");
dsProperties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
dsProperties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+ addDSProps(dsProperties);
}
return dsProperties;
}
@@ -1259,4 +1260,7 @@ public class ReconnectDUnitTest extends CacheTestCase
}
}
+
+ protected void addDSProps(Properties p) {
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/48566a98/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
new file mode 100755
index 0000000..d61abe6
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java
@@ -0,0 +1,17 @@
+package com.gemstone.gemfire.cache30;
+
+import java.util.Properties;
+
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+
+public class ReconnectWithUDPSecurityDUnitTest extends ReconnectDUnitTest{
+
+ public ReconnectWithUDPSecurityDUnitTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void addDSProps(Properties p) {
+ p.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128");
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/48566a98/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
index 9e43623..9cd6da6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
@@ -262,7 +262,6 @@ public class GMSEncryptJUnitTest {
initMocks(algo);
final GMSEncrypt gmsEncrypt1 = new GMSEncrypt(services, mockMembers[1]); // this will be the sender
- Thread.currentThread().sleep(100);
gmsEncrypt1.initClusterSecretKey();
final GMSEncrypt gmsEncrypt2 = new GMSEncrypt(services, mockMembers[2]); // this will be the sender