Skip to content

bug(db): fixes one leak as seen in the logs #35120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wezell wants to merge 4 commits into
base: main
Choose a base branch
from
+73 −65
Open

bug(db): fixes one leak as seen in the logs #35120

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63b9cb8
bug(db): fixes one leak as seen in the logs
wezell Mar 25, 2026
5ca3daf
bug(db): address PR review — single connection, per-row error handlin…
wezell Mar 26, 2026
a639079
Merge branch 'main' into issue-35119-db-connection-leaks
wezell Mar 26, 2026
31ddd3b
Merge branch 'main' into issue-35119-db-connection-leaks
wezell Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 73 additions & 65 deletions dotCMS/src/main/java/com/dotmarketing/servlets/UpdateQuartzCronJobsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.dotmarketing.db.DbConnectionFactory;
import com.dotmarketing.util.Logger;
import java.io.IOException;
import java.sql.Connection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
Expand All @@ -15,70 +16,77 @@
import org.quartz.CronTrigger;

public class UpdateQuartzCronJobsServlet extends HttpServlet {
/**
*
*/
private static final long serialVersionUID = 1L;

@SuppressWarnings("unchecked")
public void init(ServletConfig cfg) throws javax.servlet.ServletException {
super.init(cfg);

try {
DotConnect db = new DotConnect();

StringBuilder query = new StringBuilder(512);
query.ensureCapacity(128);
query.append("select * ");
query.append("from qrtz_triggers, ");
query.append(" qrtz_cron_triggers ");
query.append("where (qrtz_triggers.job_group='User Job' or ");
query.append(" qrtz_triggers.job_group='Recurrent Campaign') and ");
query.append(" qrtz_triggers.job_group<>'PAUSED' and ");
query.append(" qrtz_triggers.start_time < ? and ");
query.append(" qrtz_triggers.trigger_name=qrtz_cron_triggers.trigger_name and ");
query.append(" qrtz_triggers.trigger_group=qrtz_cron_triggers.trigger_group");

db.setSQL(query.toString());
db.addParam(new Date().getTime());
List<HashMap<String, String>> result = db.loadResults();

if(result != null && !result.isEmpty()) {
CronTrigger cronTrigger = new CronTrigger();

query = new StringBuilder(512);
query.ensureCapacity(128);
query.append("update qrtz_triggers ");
query.append("set start_time=?, ");
query.append(" next_fire_time=? ");
query.append("where trigger_name=? and ");
query.append(" trigger_group=?");

for (HashMap<String, String> trigger: result) {
cronTrigger.setCronExpression(trigger.get("cron_expression"));

db.setSQL(query.toString());
long nextFireTime = cronTrigger.getFireTimeAfter(new Date()).getTime();
db.addParam(nextFireTime);
db.addParam(nextFireTime);
db.addParam(trigger.get("trigger_name"));
db.addParam(trigger.get("trigger_group"));

db.getResult();
}
}
} catch (Exception e) {
Logger.error(UpdateQuartzCronJobsServlet.class, e.getMessage(), e);
}finally{
DbConnectionFactory.closeSilently();
}
}

public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}

public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}
/**
*
*/
private static final long serialVersionUID = 1L;

@SuppressWarnings("unchecked")
public void init(ServletConfig cfg) throws javax.servlet.ServletException {
super.init(cfg);

try {
DotConnect db = new DotConnect();

StringBuilder query = new StringBuilder(512);
query.append("select * ");
query.append("from qrtz_triggers, ");
query.append(" qrtz_cron_triggers ");
query.append("where (qrtz_triggers.job_group='User Job' or ");
query.append(" qrtz_triggers.job_group='Recurrent Campaign') and ");
query.append(" qrtz_triggers.job_group<>'PAUSED' and ");
query.append(" qrtz_triggers.start_time < ? and ");
query.append(" qrtz_triggers.trigger_name=qrtz_cron_triggers.trigger_name and ");
query.append(" qrtz_triggers.trigger_group=qrtz_cron_triggers.trigger_group");

db.setSQL(query.toString());
db.addParam(new Date().getTime());
List<HashMap<String, String>> result = db.loadResults();
if (result == null || result.isEmpty()) {
return;
}

final String updateSql = "update qrtz_triggers set start_time=?, next_fire_time=? where trigger_name=? and trigger_group=?";
final CronTrigger cronTrigger = new CronTrigger();

try (Connection conn = DbConnectionFactory.getDataSource().getConnection()) {
conn.setAutoCommit(false);
for (HashMap<String, String> trigger : result) {
try {
cronTrigger.setCronExpression(trigger.get("cron_expression"));
final Date nextFireDate = cronTrigger.getFireTimeAfter(new Date());
if (nextFireDate == null) {
Logger.warn(UpdateQuartzCronJobsServlet.class,
"No future fire time for trigger " + trigger.get("trigger_name") + ", skipping");
continue;
}
final long nextFireTime = nextFireDate.getTime();
db.setSQL(updateSql);
db.addParam(nextFireTime);
db.addParam(nextFireTime);
db.addParam(trigger.get("trigger_name"));
db.addParam(trigger.get("trigger_group"));
db.loadResult(conn);
} catch (Exception e) {
Logger.error(UpdateQuartzCronJobsServlet.class,
"Failed to update trigger " + trigger.get("trigger_name") + ": " + e.getMessage(), e);
}
}
conn.commit();
}
} catch (Exception e) {
Logger.error(UpdateQuartzCronJobsServlet.class, e.getMessage(), e);
} finally {
DbConnectionFactory.closeSilently();
}
}

public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}

public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}
}
Loading