date:20160720

incubator-geode git commit: fix 100ms delay in stopping tombstone sweeper

2016-07-20 Thread dschneider

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1420 [created] 447f442a6


fix 100ms delay in stopping tombstone sweeper


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

Branch: refs/heads/feature/GEODE-1420
Commit: 447f442a6a16ac3c7b24f06dbce95e5bd361a9e0
Parents: 50aedb1
Author: Darrel Schneider 
Authored: Wed Jul 20 16:39:00 2016 -0700
Committer: Darrel Schneider 
Committed: Wed Jul 20 16:39:00 2016 -0700

--
 .../com/gemstone/gemfire/internal/cache/TombstoneService.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/447f442a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
index 192e24d..2241b33 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
@@ -787,9 +787,9 @@ public class TombstoneService {
   this.sweeperThread.start();
 }
 
-synchronized void stop() {
-  this.isStopped = true;
-  if (this.sweeperThread != null) {
+void stop() {
+  synchronized (this) {
+this.isStopped = true;
 notifyAll();
   }
   try {
@@ -797,7 +797,6 @@ public class TombstoneService {
   } catch (InterruptedException e) {
 Thread.currentThread().interrupt();
   }
-  getQueue().clear();
 }
 
 private void lockQueueHead() {

[2/2] incubator-geode git commit: GEODE-1647: Add Integrated Security to Peer Authentication

2016-07-20 Thread jinmeiliao

GEODE-1647: Add Integrated Security to Peer Authentication

* This closes #210


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

Branch: refs/heads/develop
Commit: 16b73564f638aea652842dd071d01e1e3d5ad204
Parents: 7c2e219
Author: gmeilen 
Authored: Mon Jul 18 13:13:11 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Jul 20 16:04:31 2016 -0700

--
 .../membership/gms/auth/GMSAuthenticator.java   |  79 +-
 .../gms/interfaces/Authenticator.java   |   6 +-
 .../membership/gms/membership/GMSJoinLeave.java |   2 +-
 .../cache/tier/sockets/AcceptorImpl.java|   2 +-
 .../internal/cache/tier/sockets/HandShake.java  |   6 +-
 .../gemfire/internal/i18n/LocalizedStrings.java |   4 +-
 .../internal/security/GeodeSecurityUtil.java|  45 +++---
 .../templates/SampleSecurityManager.java|   5 +
 .../internal/DistributionConfigJUnitTest.java   |   2 +-
 .../gms/auth/GMSAuthenticatorJUnitTest.java |  37 +++--
 .../gms/membership/GMSJoinLeaveJUnitTest.java   |   2 +-
 .../cli/commands/CliCommandTestBase.java|   2 +-
 .../security/AccessControlMBeanJUnitTest.java   |   3 +-
 ...CacheServerMBeanAuthenticationJUnitTest.java |   4 +-
 .../CacheServerMBeanAuthorizationJUnitTest.java |   3 +-
 .../security/CliCommandsSecurityTest.java   |   6 +-
 .../security/DataCommandsSecurityTest.java  |   3 +-
 .../DiskStoreMXBeanSecurityJUnitTest.java   |   3 +-
 .../GatewayReceiverMBeanSecurityTest.java   |   3 +-
 .../GatewaySenderMBeanSecurityTest.java |   3 +-
 .../GeodeSecurityUtilCustomRealmJUnitTest.java  |   4 +-
 .../security/GfshCommandsPostProcessorTest.java |   3 +-
 .../security/GfshCommandsSecurityTest.java  |   3 +-
 .../internal/security/JSONAuthorization.java|  48 --
 .../JsonAuthorizationCacheStartRule.java|   1 +
 .../LockServiceMBeanAuthorizationJUnitTest.java |   3 +-
 .../security/MBeanSecurityJUnitTest.java|   3 +-
 .../ManagerMBeanAuthorizationJUnitTest.java |   3 +-
 .../security/MemberMBeanSecurityJUnitTest.java  |   3 +-
 .../internal/security/MultiUserDUnitTest.java   |   4 +-
 ...ractIntegratedClientAuthDistributedTest.java |   4 +-
 ...edSecurityCacheLifecycleDistributedTest.java |  19 +--
 ...edSecurityCacheLifecycleIntegrationTest.java |  27 +---
 ...tegratedSecurityPeerAuthDistributedTest.java | 146 +++
 .../gemfire/security/JSONAuthorization.java |  54 +++
 .../gemfire/security/SpySecurityManager.java|  43 ++
 .../com/gemstone/gemfire/security/peerAuth.json |  36 +
 .../gemfire/tools/pulse/tests/Server.java   |   2 +-
 38 files changed, 430 insertions(+), 196 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/16b73564/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index f16a722..cf99ea2 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -19,19 +19,15 @@ package 
com.gemstone.gemfire.distributed.internal.membership.gms.auth;
 import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.*;
 
-import java.lang.reflect.Method;
 import java.security.Principal;
 import java.util.Properties;
-import java.util.Set;
 
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import 
com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.distributed.internal.membership.NetView;
 import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
 import 
com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Authenticator;
-import com.gemstone.gemfire.internal.ClassLoadUtil;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
@@ -44,15 +40,13 @@ import

[1/2] incubator-geode git commit: GEODE-1647: add more unit test

2016-07-20 Thread jinmeiliao

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 7c2e21933 -> 50aedb1fc


GEODE-1647: add more unit test


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

Branch: refs/heads/develop
Commit: 50aedb1fc025f10219f2067967eafddab32d02c5
Parents: 16b7356
Author: Jinmei Liao 
Authored: Wed Jul 20 09:42:24 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Jul 20 16:04:31 2016 -0700

--
 .../security/GeodeSecurityUtilTest.java | 57 
 1 file changed, 57 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/50aedb1f/geode-core/src/test/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtilTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtilTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtilTest.java
index a26f06a..272b04f 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtilTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtilTest.java
@@ -17,9 +17,13 @@
 package com.gemstone.gemfire.internal.security;
 
 
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.assertj.core.api.Java6Assertions.*;
 import static org.junit.Assert.*;
 
+import java.util.Properties;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -28,6 +32,12 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class GeodeSecurityUtilTest {
+  Properties properties;
+  @Before
+  public void before(){
+properties = new Properties();
+GeodeSecurityUtil.initSecurity(properties);
+  }
 
   @Test
   public void testGetObjectFromConstructor(){
@@ -61,6 +71,53 @@ public class GeodeSecurityUtilTest {
   .isInstanceOf(GemFireSecurityException.class);
   }
 
+  @Test
+  public void testInitialSecurityFlags() {
+// initial state of GeodeSecurityUtil
+assertFalse(GeodeSecurityUtil.isClientSecurityRequired());
+assertFalse(GeodeSecurityUtil.isIntegratedSecurity());
+assertFalse(GeodeSecurityUtil.isPeerSecurityRequired());
+  }
+
+  @Test
+  public void testInitWithSecurityManager() {
+properties.setProperty(SECURITY_MANAGER, 
"org.apache.geode.security.templates.SampleSecurityManager");
+GeodeSecurityUtil.initSecurity(properties);
+assertTrue(GeodeSecurityUtil.isClientSecurityRequired());
+assertTrue(GeodeSecurityUtil.isIntegratedSecurity());
+assertTrue(GeodeSecurityUtil.isPeerSecurityRequired());
+  }
+
+  @Test
+  public void testInitWithClientAuthenticator()
+  {
+properties.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "org.abc.test");
+GeodeSecurityUtil.initSecurity(properties);
+assertTrue(GeodeSecurityUtil.isClientSecurityRequired());
+assertFalse(GeodeSecurityUtil.isIntegratedSecurity());
+assertFalse(GeodeSecurityUtil.isPeerSecurityRequired());
+  }
+
+  @Test
+  public void testInitWithPeerAuthenticator()
+  {
+properties.setProperty(SECURITY_PEER_AUTHENTICATOR, "org.abc.test");
+GeodeSecurityUtil.initSecurity(properties);
+assertFalse(GeodeSecurityUtil.isClientSecurityRequired());
+assertFalse(GeodeSecurityUtil.isIntegratedSecurity());
+assertTrue(GeodeSecurityUtil.isPeerSecurityRequired());
+  }
+
+  @Test
+  public void testInitWithShiroAuthenticator()
+  {
+properties.setProperty(SECURITY_SHIRO_INIT, "shiro.ini");
+GeodeSecurityUtil.initSecurity(properties);
+assertTrue(GeodeSecurityUtil.isClientSecurityRequired());
+assertTrue(GeodeSecurityUtil.isIntegratedSecurity());
+assertTrue(GeodeSecurityUtil.isPeerSecurityRequired());
+  }
+
   private static class Factories{
 public static String getString(){
   return new String();

incubator-geode git commit: GEODE-1655: CI Failure in AutoConnectionSourceDUnitTest.testClientMembershipListener

2016-07-20 Thread bschuchardt

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 603bae8cf -> 7c2e21933


GEODE-1655: CI Failure in 
AutoConnectionSourceDUnitTest.testClientMembershipListener

Clients may get a memberLeft event instead of a memberCrashed event when
a server is shut down.  I've adjusted the test's expectations and added
some logging in the membership listener to note which events it receives.


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

Branch: refs/heads/develop
Commit: 7c2e21933ecce1602e27e0b74f439fa94ceb8b52
Parents: 603bae8
Author: Bruce Schuchardt 
Authored: Wed Jul 20 15:05:45 2016 -0700
Committer: Bruce Schuchardt 
Committed: Wed Jul 20 15:08:21 2016 -0700

--
 .../internal/AutoConnectionSourceDUnitTest.java | 65 +---
 1 file changed, 28 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c2e2193/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index 87ee0bc..3f8f488 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -16,36 +16,25 @@
  */
 package com.gemstone.gemfire.cache.client.internal;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.client.NoAvailableLocatorsException;
-import com.gemstone.gemfire.cache.client.NoAvailableServersException;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.management.membership.ClientMembership;
-import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
-import 
com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapter;
-import com.gemstone.gemfire.test.dunit.*;
-import org.junit.Assert;
+import java.io.*;
+import java.net.*;
+import java.util.*;
 
-import java.io.Serializable;
-import java.net.BindException;
-import java.net.InetSocketAddress;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
+import org.junit.Assert;
+import org.junit.*;
+import org.junit.experimental.categories.*;
+
+import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.cache.client.*;
+import com.gemstone.gemfire.cache.server.*;
+import com.gemstone.gemfire.distributed.internal.*;
+import com.gemstone.gemfire.internal.*;
+import com.gemstone.gemfire.internal.cache.*;
+import com.gemstone.gemfire.management.membership.*;
+import com.gemstone.gemfire.test.dunit.*;
+import com.gemstone.gemfire.test.junit.categories.*;
 
 /**
  * Tests cases that are particular for the auto connection source
@@ -387,9 +376,8 @@ public class AutoConnectionSourceDUnitTest extends 
LocatorTestBase {
 resetBridgeListener(bridge1VM);
 waitForCrash(clientVM);
 clientListener = getBridgeListener(clientVM);
-Assert.assertEquals(1, clientListener.getCrashes());
-Assert.assertEquals(0, clientListener.getDepartures());
 Assert.assertEquals(0, clientListener.getJoins());
+Assert.assertEquals(1, 
clientListener.getDepartures()+clientListener.getCrashes());
 resetBridgeListener(clientVM);
 
 //stop the client and make sure the bridge server notices
@@ -479,9 +467,8 @@ public class AutoConnectionSourceDUnitTest extends 
LocatorTestBase {
   }
   if (expectedEndpointPorts.size() == actualEndpointPorts.size()) {
 break;
-  } else {
-Wait.pause(100);
   }
+  Wait.pause(100);
 } while (retryCount-- > 0);
 Assert.assertEquals(expectedEndpointPorts, actualEndpointPorts);

[incubator-geode] Git Push Summary

2016-07-20 Thread klund

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1673-PR-212 [created] 603bae8cf

incubator-geode git commit: fix 100ms delay in stopping tombstone sweeper

[2/2] incubator-geode git commit: GEODE-1647: Add Integrated Security to Peer Authentication

[1/2] incubator-geode git commit: GEODE-1647: add more unit test

incubator-geode git commit: GEODE-1655: CI Failure in AutoConnectionSourceDUnitTest.testClientMembershipListener

[incubator-geode] Git Push Summary

5 matches

Site Navigation

Mail list logo

Footer information