Skip to content

protection de l'API pour des commandes concurrentes sur la même branche #425

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
gmaillet wants to merge 6 commits into
base: master
Choose a base branch
from
Open

protection de l'API pour des commandes concurrentes sur la même branche #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6726fe
add advisory lock to avoid concurrent branch modifications
gmaillet Jul 1, 2024
9497b20
check all files before undo/redo process
gmaillet Jul 24, 2024
8617e2c
add fsyncSync to flush disk operations
gmaillet Jul 25, 2024
fb1c8c5
revert and clean
gmaillet Jul 25, 2024
6eac1a3
protect rename with try/catch
gmaillet Jul 25, 2024
7c648a7
protect rename with try/catch
gmaillet Jul 25, 2024
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
20 changes: 20 additions & 0 deletions db/db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,24 @@ async function getCachePath(pgClient, idBranch) {
throw new Error('idBranch non valide');
}

async function lockSharedBranch(pgClient, idBranch) {
debug(` ~~lockSharedBranch (idBranch: ${idBranch})`);
await pgClient.query(
'SELECT pg_advisory_xact_lock_shared($1)',
[idBranch],
);
debug(` ~~lockSharedBranch (idBranch: ${idBranch}) done`);
}

async function lockBranch(pgClient, idBranch) {
debug(` ~~lockBranch (idBranch: ${idBranch})`);
await pgClient.query(
'SELECT pg_advisory_xact_lock($1)',
[idBranch],
);
debug(` ~~lockBranch (idBranch: ${idBranch}) done`);
}

async function getBranches(pgClient, idCache) {
debug(` ~~getBranches (idCache: ${idCache})`);
let results;
Expand Down Expand Up @@ -546,6 +564,8 @@ module.exports = {
deleteCache,
insertListOpi,
getCachePath,
lockSharedBranch,
lockBranch,
getBranches,
// getIdCacheFromPath,
insertBranch,
Expand Down
38 changes: 38 additions & 0 deletions middlewares/branch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,48 @@ async function getCachePath(req, _res, next) {
next();
}

async function lockShared(req, _res, next) {
debug('>>GET lockShared');
if (req.error) {
next();
return;
}
const params = matchedData(req);
const { idBranch } = params;
try {
await db.lockSharedBranch(req.client, idBranch);
} catch (error) {
debug(error);
req.error = error;
}
debug(' next>>');
next();
}

async function lock(req, _res, next) {
debug('>>GET lock');
if (req.error) {
next();
return;
}
const params = matchedData(req);
const { idBranch } = params;
try {
await db.lockBranch(req.client, idBranch);
} catch (error) {
debug(error);
req.error = error;
}
debug(' next>>');
next();
}

module.exports = {
getBranches,
postBranch,
deleteBranch,
rebase,
getCachePath,
lockShared,
lock,
};
Loading