Thanks for following up on this Robert! Regards Julian
On Tue, Aug 4, 2015 at 11:02 AM, Robert Munteanu <romb...@apache.org> wrote: > Hi Julian, > > On Mon, 2015-08-03 at 20:51 +0200, Julian Sedding wrote: >> Hi Robert >> >> It seems that this commit causes up to ~900 tests to fail >> (sporadically in two groups), both on Java 1.7 and 1.8. Before this >> we >> had only few sporadically failing tests. Could you take a look if >> your >> commit is the true cause or if the Jenkins builds give the wrong >> impression[0,1]. > > Unfortunately it's my commit, so reverted this change in r1694016. I > wasn't able to fix the jackrabbit.server bundle in a short time ( I'll > send a separate email about this ) so I'll have to start digging again > :-) > > Thanks, > > Robert > > > >> >> Thanks. >> >> Regards >> Julian >> >> [0] https://builds.apache.org/job/sling-trunk-1.7/2091/ >> [1] https://builds.apache.org/job/sling-trunk-1.8/1379/ >> >> >> On Thu, Jul 30, 2015 at 9:49 AM, <romb...@apache.org> wrote: >> > Author: rombert >> > Date: Thu Jul 30 07:49:31 2015 >> > New Revision: 1693392 >> > >> > URL: http://svn.apache.org/r1693392 >> > Log: >> > SLING-4556 - NPE in DiscoveryServiceImpl#activate due to >> > OakSlingRepositoryManager restart during startup >> > >> > Use start level ordering to ensure that the >> > OakSlingRepositoryManager is >> > only activated once all dependencies are activated and configured: >> > >> > - Move org.apache.sling.installer.factory.configuration to the >> > :boot >> > feature so that components are configured as soon as they become >> > availalble, otherwise that would've happened at start level 20 >> > - Move the org.apache.sling.jcr.oak.server bundle to start level >> > 16, so >> > that all the bundles which provide its dependendencies, mostly oak >> > -core, >> > are properly configured when the OakSlingRepositoryManager is >> > activated >> > >> > Modified: >> > sling/trunk/launchpad/builder/src/main/provisioning/boot.txt >> > sling/trunk/launchpad/builder/src/main/provisioning/oak.txt >> > sling/trunk/launchpad/builder/src/main/provisioning/sling.txt >> > >> > Modified: >> > sling/trunk/launchpad/builder/src/main/provisioning/boot.txt >> > URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src >> > /main/provisioning/boot.txt?rev=1693392&r1=1693391&r2=1693392&view= >> > diff >> > =================================================================== >> > =========== >> > --- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt >> > (original) >> > +++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt >> > Thu Jul 30 07:49:31 2015 >> > @@ -43,7 +43,8 @@ >> > org.apache.sling/org.apache.sling.launchpad.installer/1.2.2 >> > org.apache.sling/org.apache.sling.installer.core/3.6.6 >> > >> > org.apache.sling/org.apache.sling.installer.provider.file/1.1.0 >> > + >> > org.apache.sling/org.apache.sling.installer.factory.configuration/ >> > 1.1.2 >> > org.apache.felix/org.apache.felix.configadmin/1.8.6 >> > org.apache.felix/org.apache.felix.eventadmin/1.4.2 >> > # dependency with javax.inject - required for Sling Models >> > (SLING-4710) >> > - org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0 >> > + org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0 >> > \ No newline at end of file >> > >> > Modified: >> > sling/trunk/launchpad/builder/src/main/provisioning/oak.txt >> > URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src >> > /main/provisioning/oak.txt?rev=1693392&r1=1693391&r2=1693392&view=d >> > iff >> > =================================================================== >> > =========== >> > --- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt >> > (original) >> > +++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Thu >> > Jul 30 07:49:31 2015 >> > @@ -27,7 +27,6 @@ >> > org.apache.felix/org.apache.felix.jaas/0.0.2 >> > >> > [artifacts startLevel=15 runModes=oak] >> > - org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2 >> > -SNAPSHOT >> > com.google.guava/guava/15.0 >> > org.apache.jackrabbit/oak-core/${oak.version} >> > org.apache.jackrabbit/oak-commons/${oak.version} >> > @@ -37,6 +36,11 @@ >> > [artifacts startLevel=15 runModes=oak_mongo] >> > org.mongodb/mongo-java-driver/2.13.0 >> > >> > +# start the Oak server instance after all components have been >> > configured >> > +# and started to avoid restarting that component ( see SLING-4556 >> > ) >> > +[artifacts startLevel=16 runModes=oak] >> > + org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2 >> > -SNAPSHOT >> > + >> > [configurations runModes=oak] >> > org.apache.felix.jaas.Configuration.factory-GuestLoginModule >> > jaas.controlFlag="optional" >> > >> > Modified: >> > sling/trunk/launchpad/builder/src/main/provisioning/sling.txt >> > URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src >> > /main/provisioning/sling.txt?rev=1693392&r1=1693391&r2=1693392&view >> > =diff >> > =================================================================== >> > =========== >> > --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt >> > (original) >> > +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt >> > Thu Jul 30 07:49:31 2015 >> > @@ -71,7 +71,6 @@ >> > org.apache.sling/org.apache.sling.models.impl/1.2.0 >> > org.apache.felix/org.apache.felix.http.whiteboard/2.3.2 >> > org.apache.sling/org.apache.sling.installer.console/1.0.0 >> > - >> > org.apache.sling/org.apache.sling.installer.factory.configuration/ >> > 1.1.2 >> > >> > org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.16 >> > >> > [artifacts startLevel=5] >> > >> > >
