Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 12:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Browse Source
This commit is contained in:
Jan Bartel 2020-08-05 15:43:08 +02:00
commit 8dd205d18f
2 changed files with 202 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
View File

@ -64,8 +64,11 @@ public class HouseKeeper extends AbstractLifeCycle
}
finally
{
if (_scheduler != null && _scheduler.isRunning())
_task = _scheduler.schedule(this, _intervalMs, TimeUnit.MILLISECONDS);
try (AutoLock l = _lock.lock())
{
if (_scheduler != null && _scheduler.isRunning())
_task = _scheduler.schedule(this, _intervalMs, TimeUnit.MILLISECONDS);
}
}
}
}
@ -77,6 +80,8 @@ public class HouseKeeper extends AbstractLifeCycle
*/
public void setSessionIdManager(SessionIdManager sessionIdManager)
{
if (isStarted())
throw new IllegalStateException("HouseKeeper started");
_sessionIdManager = sessionIdManager;
}
@ -91,35 +96,6 @@ public class HouseKeeper extends AbstractLifeCycle
super.doStart();
}
/**
* Get a scheduler. First try a common scheduler, failing that
* create our own.
*
* @throws Exception when the scheduler cannot be started
*/
protected void findScheduler() throws Exception
{
if (_scheduler == null)
{
if (_sessionIdManager instanceof DefaultSessionIdManager)
{
//try and use a common scheduler, fallback to own
_scheduler = ((DefaultSessionIdManager)_sessionIdManager).getServer().getBean(Scheduler.class);
}
if (_scheduler == null)
{
_scheduler = new ScheduledExecutorScheduler(String.format("Session-HouseKeeper-%x", hashCode()), false);
_ownScheduler = true;
_scheduler.start();
if (LOG.isDebugEnabled())
LOG.debug("Using own scheduler for scavenging");
}
else if (!_scheduler.isStarted())
throw new IllegalStateException("Shared scheduler not started");
}
}
/**
* If scavenging is not scheduled, schedule it.
*
@ -129,16 +105,33 @@ public class HouseKeeper extends AbstractLifeCycle
{
try (AutoLock l = _lock.lock())
{
if (_scheduler != null)
if (_scheduler == null)
{
//cancel any previous task
if (_task != null)
_task.cancel();
if (_runner == null)
_runner = new Runner();
LOG.info("{} Scavenging every {}ms", _sessionIdManager.getWorkerName(), _intervalMs);
_task = _scheduler.schedule(_runner, _intervalMs, TimeUnit.MILLISECONDS);
if (_sessionIdManager instanceof DefaultSessionIdManager)
{
//try and use a common scheduler, fallback to own
_scheduler = ((DefaultSessionIdManager)_sessionIdManager).getServer().getBean(Scheduler.class);
}
if (_scheduler == null)
{
_scheduler = new ScheduledExecutorScheduler(String.format("Session-HouseKeeper-%x", hashCode()), false);
_ownScheduler = true;
_scheduler.start();
if (LOG.isDebugEnabled())
LOG.debug("Using own scheduler for scavenging");
}
else if (!_scheduler.isStarted())
throw new IllegalStateException("Shared scheduler not started");
}
//cancel any previous task
if (_task != null)
_task.cancel();
if (_runner == null)
_runner = new Runner();
LOG.info("{} Scavenging every {}ms", _sessionIdManager.getWorkerName(), _intervalMs);
_task = _scheduler.schedule(_runner, _intervalMs, TimeUnit.MILLISECONDS);
}
}
@ -163,8 +156,8 @@ public class HouseKeeper extends AbstractLifeCycle
_scheduler.stop();
_scheduler = null;
}
_runner = null;
}
_runner = null;
}
@Override
@ -186,38 +179,40 @@ public class HouseKeeper extends AbstractLifeCycle
*/
public void setIntervalSec(long sec) throws Exception
{
if (isStarted() || isStarting())
try (AutoLock l = _lock.lock())
{
if (sec <= 0)
if (isStarted() || isStarting())
{
_intervalMs = 0L;
LOG.info("{} Scavenging disabled", _sessionIdManager.getWorkerName());
stopScavenging();
if (sec <= 0)
{
_intervalMs = 0L;
LOG.info("{} Scavenging disabled", _sessionIdManager.getWorkerName());
stopScavenging();
}
else
{
if (sec < 10)
LOG.warn("{} Short interval of {}sec for session scavenging.", _sessionIdManager.getWorkerName(), sec);
_intervalMs = sec * 1000L;
//add a bit of variability into the scavenge time so that not all
//nodes with the same scavenge interval sync up
long tenPercent = _intervalMs / 10;
if ((System.currentTimeMillis() % 2) == 0)
_intervalMs += tenPercent;
if (isStarting() || isStarted())
{
startScavenging();
}
}
}
else
{
if (sec < 10)
LOG.warn("{} Short interval of {}sec for session scavenging.", _sessionIdManager.getWorkerName(), sec);
_intervalMs = sec * 1000L;
//add a bit of variability into the scavenge time so that not all
//nodes with the same scavenge interval sync up
long tenPercent = _intervalMs / 10;
if ((System.currentTimeMillis() % 2) == 0)
_intervalMs += tenPercent;
if (isStarting() || isStarted())
{
findScheduler();
startScavenging();
}
}
}
else
{
_intervalMs = sec * 1000L;
}
}
/**
@ -228,7 +223,10 @@ public class HouseKeeper extends AbstractLifeCycle
@ManagedAttribute(value = "secs between scavenge cycles", readonly = true)
public long getIntervalSec()
{
return _intervalMs / 1000;
try (AutoLock l = _lock.lock())
{
return _intervalMs / 1000;
}
}
/**
@ -263,6 +261,9 @@ public class HouseKeeper extends AbstractLifeCycle
@Override
public String toString()
{
return super.toString() + "[interval=" + _intervalMs + ", ownscheduler=" + _ownScheduler + "]";
try (AutoLock l = _lock.lock())
{
return super.toString() + "[interval=" + _intervalMs + ", ownscheduler=" + _ownScheduler + "]";
}
}
}

135
jetty-server/src/test/java/org/eclipse/jetty/server/session/HouseKeeperTest.java Normal file
View File

@ -0,0 +1,135 @@
//
// ========================================================================
// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.server.session;
import java.util.Collections;
import java.util.Set;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.thread.Scheduler;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* HouseKeeperTest
*/
public class HouseKeeperTest
{
public class TestHouseKeeper extends HouseKeeper
{
public Scheduler getScheduler()
{
return _scheduler;
}
public Scheduler.Task getTask()
{
return _task;
}
public Runner getRunner()
{
return _runner;
}
public boolean isOwnScheduler()
{
return _ownScheduler;
}
}
public class TestSessionIdManager extends DefaultSessionIdManager
{
public TestSessionIdManager(Server server)
{
super(server);
}
@Override
public Set<SessionHandler> getSessionHandlers()
{
return Collections.singleton(new SessionHandler());
}
}
@Test
public void testHouseKeeper() throws Exception
{
HouseKeeper t = new TestHouseKeeper();
assertThrows(IllegalStateException.class, () -> t.start());
TestHouseKeeper hk = new TestHouseKeeper();
hk.setSessionIdManager(new TestSessionIdManager(new Server()));
hk.setIntervalSec(-1);
hk.start(); //no scavenging
//check that the housekeeper isn't running
assertNull(hk.getRunner());
assertNull(hk.getTask());
assertNull(hk.getScheduler());
assertFalse(hk.isOwnScheduler());
hk.stop();
assertNull(hk.getRunner());
assertNull(hk.getTask());
assertNull(hk.getScheduler());
assertFalse(hk.isOwnScheduler());
//set the interval but don't start it
hk.setIntervalSec(10000);
assertNull(hk.getRunner());
assertNull(hk.getTask());
assertNull(hk.getScheduler());
assertFalse(hk.isOwnScheduler());
//now start it
hk.start();
assertNotNull(hk.getRunner());
assertNotNull(hk.getTask());
assertNotNull(hk.getScheduler());
assertTrue(hk.isOwnScheduler());
//stop it
hk.stop();
assertNull(hk.getRunner());
assertNull(hk.getTask());
assertNull(hk.getScheduler());
assertFalse(hk.isOwnScheduler());
//start it, but set a different interval after start
hk.start();
Scheduler.Task oldTask = hk.getTask();
hk.setIntervalSec(50000);
assertTrue(hk.getIntervalSec() >= 50000);
assertNotNull(hk.getRunner());
assertNotNull(hk.getTask());
//Note: it would be nice to test if the old task was
//cancelled, but the Scheduler.Task interface does not
//provide that functionality.
assertNotSame(oldTask, hk.getTask());
assertNotNull(hk.getScheduler());
assertTrue(hk.isOwnScheduler());
}
}