Skip to content

Commit

Permalink
Changed locking for JSP repository purge to avoid performance
Browse files Browse the repository at this point in the history 
degradation.
  • Loading branch information
@tHerrmann
tHerrmann committed Mar 21, 2019
1 parent f666794 commit 6f0adfe
Showing 1 changed file with 41 additions and 41 deletions.
82 changes: 41 additions & 41 deletions src/org/opencms/loader/CmsJspLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -521,24 +519,18 @@ public void load(CmsObject cms, CmsResource file, HttpServletRequest req, HttpSe

// get the Flex controller
CmsFlexController controller = getController(cms, file, req, res, streaming, true);
Lock lock = m_purgeLock.readLock();
try {
lock.lock();
if (bypass || controller.isForwardMode()) {
// initialize the standard contex bean to be available for all requests
CmsJspStandardContextBean.getInstance(controller.getCurrentRequest());
// once in forward mode, always in forward mode (for this request)
controller.setForwardMode(true);
// bypass Flex cache for this page, update the JSP first if necessary
String target = updateJsp(file, controller, new HashSet<String>());
// dispatch to external JSP
req.getRequestDispatcher(target).forward(controller.getCurrentRequest(), res);
} else {
// Flex cache not bypassed, dispatch to internal JSP
dispatchJsp(controller);
}
} finally {
lock.unlock();
if (bypass || controller.isForwardMode()) {
// initialize the standard contex bean to be available for all requests
CmsJspStandardContextBean.getInstance(controller.getCurrentRequest());
// once in forward mode, always in forward mode (for this request)
controller.setForwardMode(true);
// bypass Flex cache for this page, update the JSP first if necessary
String target = updateJsp(file, controller, new HashSet<String>());
// dispatch to external JSP
req.getRequestDispatcher(target).forward(controller.getCurrentRequest(), res);
} else {
// Flex cache not bypassed, dispatch to internal JSP
dispatchJsp(controller);
}

// remove the controller from the request if not forwarding
Expand Down Expand Up @@ -651,24 +643,17 @@ public void removeOfflineJspFromRepository(CmsResource resource) throws CmsLoade
public void service(CmsObject cms, CmsResource resource, ServletRequest req, ServletResponse res)
throws ServletException, IOException, CmsLoaderException {

Lock lock = m_purgeLock.readLock();
try {
lock.lock();

CmsFlexController controller = CmsFlexController.getController(req);
// get JSP target name on "real" file system
String target = updateJsp(resource, controller, new HashSet<String>(8));
// important: Indicate that all output must be buffered
controller.getCurrentResponse().setOnlyBuffering(true);
// initialize the standard contex bean to be available for all requests
CmsJspStandardContextBean.getInstance(controller.getCurrentRequest());
// dispatch to external file
controller.getCurrentRequest().getRequestDispatcherToExternal(cms.getSitePath(resource), target).include(
req,
res);
} finally {
lock.unlock();
}
CmsFlexController controller = CmsFlexController.getController(req);
// get JSP target name on "real" file system
String target = updateJsp(resource, controller, new HashSet<String>(8));
// important: Indicate that all output must be buffered
controller.getCurrentResponse().setOnlyBuffering(true);
// initialize the standard contex bean to be available for all requests
CmsJspStandardContextBean.getInstance(controller.getCurrentRequest());
// dispatch to external file
controller.getCurrentRequest().getRequestDispatcherToExternal(cms.getSitePath(resource), target).include(
req,
res);
}

/**
Expand All @@ -695,14 +680,23 @@ public void triggerPurge(final Runnable afterPurgeAction) {
@SuppressWarnings("synthetic-access")
public void run() {

WriteLock lock = m_purgeLock.writeLock();
try {
lock.lock();
m_purgeLock.writeLock().lock();
for (ReentrantReadWriteLock lock : m_fileLocks.values()) {
lock.writeLock().lock();
}
doPurge(afterPurgeAction);
} catch (Exception e) {
LOG.error("Error while purging jsp repository: " + e.getLocalizedMessage(), e);
} finally {
lock.unlock();
for (ReentrantReadWriteLock lock : m_fileLocks.values()) {
try {
lock.writeLock().unlock();
} catch (Exception e) {
LOG.warn(e.getLocalizedMessage(), e);
}
}
m_purgeLock.writeLock().unlock();
}
}
});
Expand Down Expand Up @@ -1752,12 +1746,18 @@ private ReentrantReadWriteLock getFileLock(String jspVfsName) {

ReentrantReadWriteLock lock = m_fileLocks.get(jspVfsName);
if (lock == null) {
// acquire the purge lock before adding new file lock entries
// in case of a JSP repository purge, adding new file lock entries is blocked
// and all present file locks will be locked for purge
// @see #triggerPurge()
m_purgeLock.readLock().lock();
synchronized (m_fileLocks) {
if (!m_fileLocks.containsKey(jspVfsName)) {
m_fileLocks.put(jspVfsName, new ReentrantReadWriteLock(true));
}
lock = m_fileLocks.get(jspVfsName);
}
m_purgeLock.readLock().unlock();
}
return lock;
}
Expand Down

0 comments on commit 6f0adfe

Please sign in to comment.