You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/08/22 15:28:51 UTC
svn commit: r1838647 - in /jackrabbit/oak/branches/1.6: ./
oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/
Author: mreutegg
Date: Wed Aug 22 15:28:51 2018
New Revision: 1838647
URL: http://svn.apache.org/viewvc?rev=1838647&view=rev
Log:
OAK-5750: Test failure: PojoSR run.osgi.SecurityProviderRegistrationTest
Merged revisions 1785161,1785172 from trunk
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 22 15:28:51 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260
,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830748,1831374,1832379,1832535,1833308,1834648-1834649,1834681,1835060,1837475,1837998
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119
,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830748,1831374,1832379,1832535,1833308,1834648-1834649,1834681,1835060,1837475,1837998
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1838647&r1=1838646&r2=1838647&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy (original)
+++ jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy Wed Aug 22 15:28:51 2018
@@ -27,11 +27,14 @@ import org.junit.Before
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import org.osgi.framework.BundleContext
+import org.osgi.framework.ServiceEvent
+import org.osgi.framework.ServiceListener
import org.osgi.framework.ServiceReference
import org.osgi.service.cm.ConfigurationAdmin
import org.osgi.util.tracker.ServiceTracker
import javax.jcr.*
+import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import static org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_HOME
@@ -154,4 +157,70 @@ abstract class AbstractRepositoryFactory
fail("RetryLoop failed, condition is false after " + timeoutSeconds + " seconds" + (message ?: (":" + message)));
}
+
+ /**
+ * Convenience method to be used in conjunction with {@link #awaitServiceEvent}. It creates a filter that matches
+ * the given {@code className} to one of the following properties: {@code objectClass}, {@code service.pid} or
+ * {@code service.factoryPid}.
+ *
+ * @param className The class name to match.
+ * @return The filter expression.
+ */
+ protected static String classNameFilter(String className) {
+ return "(|(objectClass=${className})(service.pid=${className})(service.factoryPid=${className}))"
+ }
+
+ /**
+ * Execute a change in a closure and wait for a ServiceEvent to happen. The method only returns once
+ * an appropriate event is matched. If no event matches within the specified timeout, an AssertionError
+ * is thrown. The error message describes any non-matching events that may have happened for debugging
+ * purposes.
+ *
+ * @param closure The closure that effects a change that should cause the expected ServiceEvent.
+ * @param serviceFilter A filter expression following the syntax of {@link org.osgi.framework.Filter} (default: (objectClass=*))
+ * @param eventTypes An integer bitmap of accepted ServiceEvent types (default: any).
+ * @param timeout A timeout value; the maximum time to wait for the service event. The unit depends on the {@code timeUnit} argument.
+ * @param timeUnit The unit for the timeout value.
+ */
+ protected void awaitServiceEvent(
+ Closure closure,
+ String serviceFilter = "(objectClass=*)",
+ int eventTypes = ServiceEvent.MODIFIED | ServiceEvent.REGISTERED | ServiceEvent.UNREGISTERING | ServiceEvent.MODIFIED_ENDMATCH,
+ long timeout = 1000,
+ TimeUnit timeUnit = TimeUnit.MILLISECONDS) {
+ def filter = registry.bundleContext.createFilter(serviceFilter)
+ def latch = new CountDownLatch(1)
+ def events = []
+ def listener = new ServiceListener() {
+ @Override
+ void serviceChanged(final ServiceEvent event) {
+ events.add([eventType: event.type, serviceProperties: asMap(event.serviceReference)])
+ if ((eventTypes & event.type) > 0 && filter.match(event.serviceReference)) {
+ latch.countDown()
+ }
+ }
+
+ private static asMap(final ServiceReference<?> serviceReference) {
+ def map = new HashMap<String, Object>()
+ serviceReference.getPropertyKeys().each { key ->
+ map.put(key, serviceReference.getProperty(key))
+ }
+ return map
+ }
+ }
+
+ try {
+ registry.addServiceListener(listener)
+
+ closure.run()
+
+ if (!latch.await(timeout, timeUnit)) {
+ throw new AssertionError("Exceeded timeout waiting for service event matching " +
+ "[eventTypes: ${eventTypes}, filter: ${serviceFilter}], " +
+ "got ${events.size()} non matching events: [${events}]")
+ }
+ } finally {
+ registry.removeServiceListener(listener)
+ }
+ }
}
Modified: jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1838647&r1=1838646&r2=1838647&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy Wed Aug 22 15:28:51 2018
@@ -40,6 +40,7 @@ import org.h2.jdbcx.JdbcDataSource
import org.junit.After
import org.junit.Ignore
import org.junit.Test
+import org.osgi.framework.ServiceEvent
import org.osgi.framework.ServiceReference
import org.osgi.framework.ServiceRegistration
@@ -128,16 +129,18 @@ class DocumentNodeStoreConfigTest extend
DocumentNodeStore ns = getServiceWithWait(NodeStore.class)
//3. Shut down ds
- srds.unregister();
-
- // Check for service to be unregistered after at most 5s, retrying every 500ms.
+ // Wait for service to be unregistered after at most 5s.
// Previously, we waited only 500ms; this was extended due to
// occasional test failures on Jenkins (see OAK-5612). If 5s
// are not sufficient, we should investigate some more.
- retry (5, 500, "NodeStore should be unregistered") {
- ServiceReference<NodeStore> sr = registry.getServiceReference(NodeStore.class.name)
- return sr == null
- }
+ awaitServiceEvent({
+ srds.unregister();
+ },
+ classNameFilter(NodeStore.class.name),
+ ServiceEvent.UNREGISTERING,
+ 5, TimeUnit.SECONDS
+ )
+ assert registry.getServiceReference(NodeStore.class.name) == null
//4. Restart ds, service should still be down
srds = registry.registerService(DataSource.class.name, ds, ['datasource.name': 'oak'] as Hashtable)
Modified: jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy?rev=1838647&r1=1838646&r2=1838647&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy (original)
+++ jackrabbit/oak/branches/1.6/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy Wed Aug 22 15:28:51 2018
@@ -34,9 +34,13 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider
import org.junit.Before
import org.junit.Test
+import org.osgi.framework.Filter
+import org.osgi.framework.ServiceEvent
+import org.osgi.framework.ServiceListener
import org.osgi.framework.ServiceReference
import org.osgi.service.cm.ConfigurationAdmin
+import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import static org.mockito.Mockito.mock
@@ -147,13 +151,16 @@ class SecurityProviderRegistrationTest e
public void testMultipleRequiredServices() {
// Set up the SecurityProvider to require 4 services
-
- setRequiredServicePids(
- "test.RequiredAuthorizationConfiguration",
- "test.RequiredPrincipalConfiguration",
- "test.RequiredTokenConfiguration",
- "test.RestrictionProvider")
- TimeUnit.MILLISECONDS.sleep(500)
+ awaitServiceEvent({
+ setRequiredServicePids(
+ "test.RequiredAuthorizationConfiguration",
+ "test.RequiredPrincipalConfiguration",
+ "test.RequiredTokenConfiguration",
+ "test.RestrictionProvider")
+ },
+ "(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.UNREGISTERING
+ )
assert securityProviderServiceReferences == null
// Start the services and verify that only at the end the
@@ -201,23 +208,34 @@ class SecurityProviderRegistrationTest e
assert c
// 1. Disable AuthenticationConfiguration such that SecurityProvider is unregistered
- c[0].disable()
-
- TimeUnit.SECONDS.sleep(1)
+ awaitServiceEvent({
+ c[0].disable()
+ },
+ '(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)',
+ ServiceEvent.UNREGISTERING
+ )
assert securityProviderServiceReferences == null
// 2. Modify the config for AuthorizableActionProvider. It's expected that this config change is picked up
- setConfiguration([
- "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider": [
- "groupPrivilegeNames":"jcr:read"
- ]
- ])
-
- TimeUnit.SECONDS.sleep(1)
+ awaitServiceEvent({
+ setConfiguration([
+ "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider": [
+ "groupPrivilegeNames":"jcr:read"
+ ]
+ ])
+ },
+ classNameFilter('org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider'),
+ ServiceEvent.MODIFIED | ServiceEvent.REGISTERED
+ )
// 3. Enable component again such that SecurityProvider gets reactivated
- c[0].enable()
+ awaitServiceEvent({
+ c[0].enable()
+ },
+ '(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)',
+ ServiceEvent.REGISTERED
+ )
securityProvider = getServiceWithWait(SecurityProvider.class)
assertAuthorizationConfig(securityProvider)
@@ -237,13 +255,17 @@ class SecurityProviderRegistrationTest e
UserConfiguration userConfiguration = getServiceWithWait(UserConfiguration.class)
//1. Modify the config for AuthorizableActionProvider. It's expected that this config change is picked up
- setConfiguration([
- "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider": [
- "groupPrivilegeNames":"jcr:read"
+ def servicePid = "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider"
+ awaitServiceEvent({
+ setConfiguration([
+ (servicePid): [
+ "groupPrivilegeNames":"jcr:read"
+ ]
]
- ])
-
- TimeUnit.SECONDS.sleep(1)
+ )},
+ "(service.pid=${servicePid})",
+ ServiceEvent.MODIFIED | ServiceEvent.REGISTERED
+ )
securityProvider = getServiceWithWait(SecurityProvider.class)
assertAuthorizationConfig(securityProvider)
@@ -254,14 +276,22 @@ class SecurityProviderRegistrationTest e
assert c
// 2. Disable AuthenticationConfiguration such that SecurityProvider is unregistered
- c[0].disable()
-
- TimeUnit.SECONDS.sleep(1)
+ awaitServiceEvent({
+ c[0].disable()
+ },
+ "(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.UNREGISTERING
+ )
assert securityProviderServiceReferences == null
// 3. Enable component again such that SecurityProvider gets reactivated
- c[0].enable()
+ awaitServiceEvent({
+ c[0].enable()
+ },
+ "(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.REGISTERED
+ )
securityProvider = getServiceWithWait(SecurityProvider.class)
assertAuthorizationConfig(securityProvider)
@@ -273,8 +303,12 @@ class SecurityProviderRegistrationTest e
// Adding a new precondition on a missing service PID forces the
// SecurityProvider to unregister.
- setRequiredServicePids("test.Required" + serviceClass.simpleName)
- TimeUnit.MILLISECONDS.sleep(500)
+ awaitServiceEvent({
+ setRequiredServicePids("test.Required" + serviceClass.simpleName)
+ },
+ "(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.UNREGISTERING
+ )
assert securityProviderServiceReferences == null
// If a service is registered, and if the PID of the service matches the
@@ -290,9 +324,12 @@ class SecurityProviderRegistrationTest e
assert securityProviderServiceReferences == null
// Removing the precondition allows the SecurityProvider to register.
-
- setRequiredServicePids()
- TimeUnit.MILLISECONDS.sleep(500)
+ awaitServiceEvent({
+ setRequiredServicePids()
+ },
+ "(objectClass=org.apache.jackrabbit.oak.spi.security.SecurityProvider)",
+ ServiceEvent.REGISTERED
+ )
assert securityProviderServiceReferences != null
}