Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #2619 - Test Failure: QueuedThreadPoolTest.testThreadPool(). 

Now newly created threads set _lastShrink to avoid they are immediately
removed from the pool if they happen to meet the shrink conditions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2018-06-04 17:45:50 +02:00
parent c6cc33805f
commit 77df9e1d87
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
View File

@ -536,7 +536,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
thread.setPriority(getThreadsPriority());
thread.setName(_name + "-" + thread.getId());
_threads.add(thread);
_lastShrink.set(System.nanoTime());
thread.start();
started = true;
--threadsToStart;
@ -669,19 +669,20 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
startThreads(1);
}
loop: while (isRunning())
loop:
while (isRunning())
{
// Job loop
while (job != null && isRunning())
{
if (LOG.isDebugEnabled())
LOG.debug("run {}",job);
LOG.debug("run {}", job);
runJob(job);
if (LOG.isDebugEnabled())
LOG.debug("ran {}",job);
LOG.debug("ran {}", job);
if (Thread.interrupted())
{
ignore=true;
ignore = true;
break loop;
}
job = _jobs.poll();
@ -708,7 +709,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
{
if (_lastShrink.compareAndSet(last, now) && _threadsStarted.compareAndSet(size, size - 1))
{
shrink=true;
shrink = true;
break loop;
}
}
@ -728,7 +729,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
}
catch (InterruptedException e)
{
ignore=true;
ignore = true;
LOG.ignore(e);
}
catch (Throwable e)
@ -740,9 +741,9 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
if (!shrink && isRunning())
{
if (!ignore)
LOG.warn("Unexpected thread death: {} in {}",this,QueuedThreadPool.this);
LOG.warn("Unexpected thread death: {} in {}", this, QueuedThreadPool.this);
// This is an unexpected thread death!
if (_threadsStarted.decrementAndGet()<getMaxThreads())
if (_threadsStarted.decrementAndGet() < getMaxThreads())
startThreads(1);
}
removeThread(Thread.currentThread());