Skip to content

fix: harden legacy database upgrades #842

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

Merged
RussH merged 1 commit into from
Aug 27, 2026
Merged

fix: harden legacy database upgrades #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 53 additions & 19 deletions js/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,31 @@
);
}

function Installpage_showMaintenanceRetry(http)

Check notice on line 103 in js/install.js

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

js/install.js#L103 

Identifier 'Installpage_showMaintenanceRetry' is not in camel case.
{
var htmlObjectID = "subFormBlock";
var statusMessage = "";

if (http.status != 0)
{
statusMessage =
"<p>HTTP status: " + parseInt(http.status, 10) + "</p>";
}

document.getElementById(htmlObjectID).innerHTML =
"<p><strong>The database upgrade response was interrupted.</strong></p>" +
"<p>The web server stopped waiting for this upgrade step. " +
"The database update may still be completing in the background.</p>" +
"<p>Please wait briefly, then click <strong>Continue Upgrade</strong>. " +
"OpenCATS will continue from the database schema version that was " +
"successfully recorded.</p>" +
statusMessage +
"<p>" +
"<input type=\"button\" value=\"Continue Upgrade\" " +
"onclick=\"this.disabled = true; Installpage_maint(); return false;\" />" +
"</p>";
}

function Installpage_maint()
{
var htmlObjectID = "subFormBlock";
Expand All @@ -120,17 +145,27 @@

response = http.responseText;

if (response.indexOf("setProgressUpdating") == -1)
{
if (http.status == 200)
{
Installpage_populate(installMaintNextAction);
installMaintNextAction = "a=reindexResumes";
}
if (http.status == 200)
{
if (response.indexOf("setProgressUpdating") == -1)
{
Installpage_populate(installMaintNextAction);
installMaintNextAction = "a=reindexResumes";
}
else
{
execJS(response);
}
}
else
{
execJS(response);
/*
* A web server or proxy can stop waiting for a long-running
* maintenance request even though PHP / MariaDB continues
* processing it. Allow the installer to resume once the
* database operation has completed.
*/
Installpage_showMaintenanceRetry(http);

Check notice on line 168 in js/install.js

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

js/install.js#L168 

A function with a name starting with an uppercase letter should only be used as a constructor.
}
}

Expand Down Expand Up @@ -236,22 +271,22 @@

function setProgressUpdating(progress, currentVersion, maxVersion, module)
{
document.getElementById("upToDateSqlQuery").innerHTML = progress;
document.getElementById("upToDateModuleName").innerHTML = "Processing Module: " + module + " (" + currentVersion + ")";
if (totalProgressInstall != maxVersion)
{
totalProgressInstall = maxVersion;
firstProgressInstall = currentVersion;
}
document.getElementById("upToDateSqlQuery").innerHTML = progress;
document.getElementById("upToDateModuleName").innerHTML = "Processing Module: " + module + " (" + currentVersion + ")";

if (totalProgressInstall != maxVersion)
{
totalProgressInstall = maxVersion;
firstProgressInstall = currentVersion;
}

theProgress = Math.round(((currentVersion - firstProgressInstall) * 100) / (totalProgressInstall - firstProgressInstall));

if (theProgress > 100)
{
return;
}

document.getElementById("d1").style.display = "";
document.getElementById("d2").style.display = "";
document.getElementById("d3").style.display = "";
Expand All @@ -272,4 +307,3 @@
document.getElementById("d2").style.width = (theProgress * 3) + "px";
}
}

Loading
Loading