add some StopWatch to get time on what happened here

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1423874 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-12-19 15:18:31 +00:00
parent a538626d57
commit 0c55117416
5 changed files with 70 additions and 23 deletions

View File

@ -35,6 +35,7 @@ import org.apache.archiva.redback.components.taskqueue.TaskQueue;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException; import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.apache.archiva.scheduler.repository.model.RepositoryTask;
import org.apache.commons.lang.time.StopWatch;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.quartz.impl.JobDetailImpl; import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.triggers.CronTriggerImpl; import org.quartz.impl.triggers.CronTriggerImpl;
@ -116,6 +117,10 @@ public class DefaultRepositoryArchivaTaskScheduler
public void startup() public void startup()
throws ArchivaException throws ArchivaException
{ {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
archivaConfiguration.addListener( this ); archivaConfiguration.addListener( this );
List<ManagedRepositoryConfiguration> repositories = List<ManagedRepositoryConfiguration> repositories =
@ -158,6 +163,8 @@ public class DefaultRepositoryArchivaTaskScheduler
repositorySession.close(); repositorySession.close();
} }
stopWatch.stop();
log.info( "Time to initalize DefaultRepositoryArchivaTaskScheduler: {} ms", stopWatch.getTime() );
} }
@ -298,7 +305,6 @@ public class DefaultRepositoryArchivaTaskScheduler
} }
} }
@SuppressWarnings ("unchecked")
private boolean isPreviouslyScanned( ManagedRepositoryConfiguration repoConfig, private boolean isPreviouslyScanned( ManagedRepositoryConfiguration repoConfig,
MetadataRepository metadataRepository ) MetadataRepository metadataRepository )
throws MetadataRepositoryException throws MetadataRepositoryException

View File

@ -20,12 +20,38 @@
<configuration status="debug"> <configuration status="debug">
<properties>
<property name="logsDirectory">${sys:appserver.base}/logs</property>
</properties>
<appenders> <appenders>
<Console name="console" target="SYSTEM_OUT"> <Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</Console> </Console>
<!--RollingFile name="console" fileName="${logsDirectory}/archiva.log"
filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log">
<PatternLayout>
<pattern>%d [%t] %-5p %c %x - %m%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
</RollingFile-->
</appenders> </appenders>
<loggers> <loggers>
<!-- apache httpclient debug content transfer-->
<!--
<logger name="org.apache.http.wire">
<level value="debug"/>
</logger>
<logger name="org.apache.http.headers" level="debug"/>
-->
<logger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/> <logger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
<logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/> <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
@ -38,16 +64,6 @@
<logger name="org.apache.archiva.admin.repository.managed" level="info"/> <logger name="org.apache.archiva.admin.repository.managed" level="info"/>
<!-- apache httpclient debug content transfer-->
<!--
<logger name="org.apache.http.wire">
<level value="debug"/>
</logger>
-->
<logger name="org.apache.http.headers" level="debug"/>
<logger name="org.springframework" level="info"/> <logger name="org.springframework" level="info"/>
@ -63,6 +79,8 @@
<logger name="org.apache.archiva.indexer.merger" level="info"/> <logger name="org.apache.archiva.indexer.merger" level="info"/>
<logger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" />
<root level="info"> <root level="info">
<appender-ref ref="console"/> <appender-ref ref="console"/>
</root> </root>

View File

@ -75,6 +75,7 @@ import java.util.Set;
public class JcrMetadataRepository public class JcrMetadataRepository
implements MetadataRepository implements MetadataRepository
{ {
private static final String JCR_LAST_MODIFIED = "jcr:lastModified"; private static final String JCR_LAST_MODIFIED = "jcr:lastModified";
static final String NAMESPACE_NODE_TYPE = "archiva:namespace"; static final String NAMESPACE_NODE_TYPE = "archiva:namespace";
@ -108,6 +109,7 @@ public class JcrMetadataRepository
static void initialize( Session session ) static void initialize( Session session )
throws RepositoryException throws RepositoryException
{ {
// TODO: consider using namespaces for facets instead of the current approach: // TODO: consider using namespaces for facets instead of the current approach:
// (if used, check if actually called by normal injection) // (if used, check if actually called by normal injection)
// for ( String facetId : metadataFacetFactories.keySet() ) // for ( String facetId : metadataFacetFactories.keySet() )
@ -130,6 +132,7 @@ public class JcrMetadataRepository
registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.ARTIFACT_NODE_TYPE ); registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.ARTIFACT_NODE_TYPE );
registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.FACET_NODE_TYPE ); registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.FACET_NODE_TYPE );
registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.DEPENDENCY_NODE_TYPE ); registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.DEPENDENCY_NODE_TYPE );
} }
private static void registerMixinNodeType( NodeTypeManager nodeTypeManager, String name ) private static void registerMixinNodeType( NodeTypeManager nodeTypeManager, String name )

View File

@ -25,6 +25,9 @@ import org.apache.archiva.metadata.repository.MetadataResolver;
import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory; import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -43,6 +46,8 @@ public class JcrRepositorySessionFactory
implements RepositorySessionFactory implements RepositorySessionFactory
{ {
private Logger logger = LoggerFactory.getLogger( getClass() );
@Inject @Inject
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@ -87,6 +92,9 @@ public class JcrRepositorySessionFactory
public void initialize() public void initialize()
throws Exception throws Exception
{ {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
metadataFacetFactories = applicationContext.getBeansOfType( MetadataFacetFactory.class ); metadataFacetFactories = applicationContext.getBeansOfType( MetadataFacetFactory.class );
// olamy with spring the "id" is now "metadataFacetFactory#hint" // olamy with spring the "id" is now "metadataFacetFactory#hint"
// whereas was only hint with plexus so let remove metadataFacetFactory# // whereas was only hint with plexus so let remove metadataFacetFactory#
@ -118,5 +126,8 @@ public class JcrRepositorySessionFactory
metadataRepository.close(); metadataRepository.close();
} }
} }
stopWatch.stop();
logger.info( "time to initialize JcrRepositorySessionFactory: {}", stopWatch.getTime() );
} }
} }

View File

@ -24,6 +24,7 @@ import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet;
import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.MetadataResolutionException; import org.apache.archiva.metadata.repository.MetadataResolutionException;
import org.apache.commons.lang.time.StopWatch;
import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.commons.JcrUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -61,6 +62,8 @@ public class DefaultRepositoryStatisticsManager
public RepositoryStatistics getLastStatistics( MetadataRepository metadataRepository, String repositoryId ) public RepositoryStatistics getLastStatistics( MetadataRepository metadataRepository, String repositoryId )
throws MetadataRepositoryException throws MetadataRepositoryException
{ {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
// TODO: consider a more efficient implementation that directly gets the last one from the content repository // TODO: consider a more efficient implementation that directly gets the last one from the content repository
List<String> scans = metadataRepository.getMetadataFacets( repositoryId, RepositoryStatistics.FACET_ID ); List<String> scans = metadataRepository.getMetadataFacets( repositoryId, RepositoryStatistics.FACET_ID );
if ( scans == null ) if ( scans == null )
@ -71,8 +74,12 @@ public class DefaultRepositoryStatisticsManager
if ( !scans.isEmpty() ) if ( !scans.isEmpty() )
{ {
String name = scans.get( scans.size() - 1 ); String name = scans.get( scans.size() - 1 );
return (RepositoryStatistics) metadataRepository.getMetadataFacet( repositoryId, RepositoryStatistics repositoryStatistics =
RepositoryStatistics.FACET_ID, name ); (RepositoryStatistics) metadataRepository.getMetadataFacet( repositoryId, RepositoryStatistics.FACET_ID,
name );
stopWatch.stop();
log.debug( "time to find last RepositoryStatistics: {} ms", stopWatch.getTime() );
return repositoryStatistics;
} }
else else
{ {
@ -105,8 +112,8 @@ public class DefaultRepositoryStatisticsManager
stats.setTotalArtifactCount( stats.getTotalArtifactCount() + 1 ); stats.setTotalArtifactCount( stats.getTotalArtifactCount() + 1 );
stats.setTotalArtifactFileSize( stats.getTotalArtifactFileSize() + artifact.getSize() ); stats.setTotalArtifactFileSize( stats.getTotalArtifactFileSize() + artifact.getSize() );
MavenArtifactFacet facet = (MavenArtifactFacet) artifact.getFacet( MavenArtifactFacet facet =
MavenArtifactFacet.FACET_ID ); (MavenArtifactFacet) artifact.getFacet( MavenArtifactFacet.FACET_ID );
if ( facet != null ) if ( facet != null )
{ {
String type = facet.getType(); String type = facet.getType();
@ -268,8 +275,10 @@ public class DefaultRepositoryStatisticsManager
if ( ( startTime == null || !date.before( startTime ) ) && ( endTime == null || !date.after( if ( ( startTime == null || !date.before( startTime ) ) && ( endTime == null || !date.after(
endTime ) ) ) endTime ) ) )
{ {
RepositoryStatistics stats = (RepositoryStatistics) metadataRepository.getMetadataFacet( RepositoryStatistics stats =
repositoryId, RepositoryStatistics.FACET_ID, name ); (RepositoryStatistics) metadataRepository.getMetadataFacet( repositoryId,
RepositoryStatistics.FACET_ID,
name );
results.add( stats ); results.add( stats );
} }
} }