[jbpm-commits] JBoss JBPM SVN: r3540 - in jbpm4/trunk/modules: test-load/src/test/java/org/jbpm/test/load and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-12-24 02:41:36 -0500 (Wed, 24 Dec 2008) New Revision: 3540 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties jbpm4/trunk/modules/test-load/src/test/resources/logging.properties Log: test fine tunings Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-24 03:57:16 UTC (rev 3539) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-12-24 07:41:36 UTC (rev 3540) @@ -39,17 +39,17 @@ private static final Log log = Log.getLog(DispatcherThread.class.getName()); - JobExecutor jobExecutor; - boolean isActive = true; - boolean checkForNewJobs; - int currentIdleInterval; - Object semaphore = new Object(); + protected JobExecutor jobExecutor; + protected boolean isActive = true; + protected boolean checkForNewJobs; + protected int currentIdleInterval; + protected Object semaphore = new Object(); - DispatcherThread(JobExecutor jobExecutor) { + protected DispatcherThread(JobExecutor jobExecutor) { this(jobExecutor, "DispatcherThread"); } - DispatcherThread(JobExecutor jobExecutor, String name) { + protected DispatcherThread(JobExecutor jobExecutor, String name) { super(name); this.jobExecutor = jobExecutor; } @@ -70,7 +70,7 @@ currentIdleInterval = jobExecutor.getIdleMillis(); if ((acquiredJobDbids != null) && (!acquiredJobDbids.isEmpty())) { putAcquiredJobDbidsOnQueue(acquiredJobDbids); - log.info("added jobs "+acquiredJobDbids+" to the queue"); + log.debug("added jobs "+acquiredJobDbids+" to the queue"); } else if (isActive) { long waitPeriod = getWaitPeriod(); Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-24 03:57:16 UTC (rev 3539) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-24 07:41:36 UTC (rev 3540) @@ -388,10 +388,10 @@ boolean areJobsAvailable() { return commandService.execute(new Command<Boolean>() { public Boolean execute(Environment environment) { - JobDbSession jobDbSession = environment.get(JobDbSession.class); + Session session = environment.get(Session.class); - JobImpl< ? > firstAcquirableJob = jobDbSession.findFirstAcquirableJob(); - if (firstAcquirableJob != null) { + Long jobs = (Long) session.createQuery("select count(*) from "+JobImpl.class.getName()).uniqueResult(); + if (jobs.longValue()>0) { log.debug("found more jobs to process"); return true; } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java 2008-12-24 03:57:16 UTC (rev 3539) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/TestMessageCommand.java 2008-12-24 07:41:36 UTC (rev 3540) @@ -55,6 +55,7 @@ CommentImpl comment = new CommentImpl(msgText); environment.get(Session.class).save(comment); + /* // let's assume that an average job takes between 0 and 150 millis to complete. int workTime = random.nextInt(150); log.debug("executing test message "+messageId+". this is going to take "+workTime+"ms"); @@ -63,6 +64,7 @@ } catch (RuntimeException e) { log.debug("sleeping was interrupted"); } + */ return null; } Modified: jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-24 03:57:16 UTC (rev 3539) +++ jbpm4/trunk/modules/test-load/src/test/resources/hibernate.properties 2008-12-24 07:41:36 UTC (rev 3540) @@ -9,6 +9,8 @@ hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider +# hibernate.jdbc.batch_size=1 + # hibernate.show_sql true # hibernate.format_sql true # hibernate.use_sql_comments true Modified: jbpm4/trunk/modules/test-load/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2008-12-24 03:57:16 UTC (rev 3539) +++ jbpm4/trunk/modules/test-load/src/test/resources/logging.properties 2008-12-24 07:41:36 UTC (rev 3540) @@ -4,7 +4,7 @@ redirect.commons.logging = enabled -java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.level = ERROR java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter # org.jbpm.util.ErrorTriggeredFileHandler.size = 500