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:56:58 UTC
svn commit: r1838650 - in /jackrabbit/oak/branches/1.4: ./
oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/
Author: mreutegg
Date: Wed Aug 22 15:56:58 2018
New Revision: 1838650
URL: http://svn.apache.org/viewvc?rev=1838650&view=rev
Log:
OAK-5750: Test failure: PojoSR run.osgi.SecurityProviderRegistrationTest
Merged revisions 1785161,1785172 from trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 22 15:56:58 2018
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.6:1802566,1819951,1819977,1830228,1835110
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772
228,1772593,1772768,1772906,1773190,1774141,1774256,1774445,1774497,1774519,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798832,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1804437,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1809745,1811380,1811655,1811952,1811963,1811986,1813538,1814189,1814332,1814397,1815438,1817326,1818645,1819048,1819050,1821325,1821516,1823172,1823655,1826237,1826640,1826932,1826957,1829527,1829987,1830019,1830160,1831374,1833308,1834648-1834649,1834681,1835060,1837475,1
837998
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750656,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1753481,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772
228,1772593,1772768,1772906,1773190,1774141,1774256,1774445,1774497,1774519,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785161,1785172,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798832,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1804437,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1809745,1811380,1811655,1811952,1811963,1811986,1813538,1814189,1814332,1814397,1815438,1817326,1818645,1819048,1819050,1821325,1821516,1823172,1823655,1826237,1826640,1826932,1826957,1829527,1829987,1830019,1830160,1831374,1833308,1834648-1834649,1834681,1
835060,1837475,1837998
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1838650&r1=1838649&r2=1838650&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy (original)
+++ jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy Wed Aug 22 15:56:58 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
@@ -153,4 +156,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.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1838650&r1=1838649&r2=1838650&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy Wed Aug 22 15:56:58 2018
@@ -38,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.h2.jdbcx.JdbcDataSource
import org.junit.After
import org.junit.Test
+import org.osgi.framework.ServiceEvent
import org.osgi.framework.ServiceReference
import org.osgi.framework.ServiceRegistration
@@ -126,16 +127,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.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy?rev=1838650&r1=1838649&r2=1838650&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy (original)
+++ jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy Wed Aug 22 15:56:58 2018
@@ -34,11 +34,10 @@ 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.ServiceEvent
import org.osgi.framework.ServiceReference
import org.osgi.service.cm.ConfigurationAdmin
-import java.util.concurrent.TimeUnit
-
import static org.mockito.Mockito.mock
import static org.mockito.Mockito.when
@@ -147,13 +146,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
@@ -196,24 +198,35 @@ 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": [
- "enabledActions":"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction",
- "groupPrivilegeNames":"jcr:read"
- ]
- ])
-
- TimeUnit.SECONDS.sleep(1)
+ awaitServiceEvent({
+ setConfiguration([
+ "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider": [
+ "enabledActions":"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction",
+ "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 securityProvider = getServiceWithWait(SecurityProvider.class)
assertAuthorizationConfig(securityProvider)
@@ -238,14 +251,18 @@ 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": [
- "enabledActions":"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction",
- "groupPrivilegeNames":"jcr:read"
+ def servicePid = "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider"
+ awaitServiceEvent({
+ setConfiguration([
+ (servicePid): [
+ "enabledActions":"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction",
+ "groupPrivilegeNames":"jcr:read"
+ ]
]
- ])
-
- TimeUnit.SECONDS.sleep(1)
+ )},
+ "(service.pid=${servicePid})",
+ ServiceEvent.MODIFIED | ServiceEvent.REGISTERED
+ )
securityProvider = getServiceWithWait(SecurityProvider.class)
assertAuthorizationConfig(securityProvider)
@@ -256,14 +273,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)
@@ -275,8 +300,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
@@ -292,9 +321,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
}