fix: retry history and config renames while the target is briefly locked
CI / verify (push) Canceled after 0s
CI / verify (push) Canceled after 0s
On Windows the rename of electron-history.json.tmp failed with EPERM when another reader held the history file for a moment. appendHistory then reported historyPersisted=false, the batch-end source cleanup was blocked with persistence-barrier-incomplete and the uploaded source files stayed in the watched folder. History, automation completion and config writes now retry EPERM/EBUSY/EACCES renames with increasing delays (about 6 s). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
175c9ede11
commit
65e0d6c3c9
1 file changed
+22
-10
+22
-10
@@ -4,6 +4,9 @@ const secretStore = require('./secret-store');
|
|||||||
const { normalizeLogMode } = require('./log-mode');
|
const { normalizeLogMode } = require('./log-mode');
|
||||||
const { mergeAutomationCompletions, normalizeAutomationCompletion, removeAutomationCompletions } = require('./automation-control');
|
const { mergeAutomationCompletions, normalizeAutomationCompletion, removeAutomationCompletions } = require('./automation-control');
|
||||||
|
|
||||||
|
const TRANSIENT_RENAME_ERROR_CODES = new Set(['EPERM', 'EBUSY', 'EACCES']);
|
||||||
|
const RENAME_RETRY_DELAYS_MS = [50, 100, 200, 400, 800, 1600, 3200];
|
||||||
|
|
||||||
const HOSTER_SETTINGS_DEFAULTS = {
|
const HOSTER_SETTINGS_DEFAULTS = {
|
||||||
retries: 3,
|
retries: 3,
|
||||||
maxSpeedKbs: 0, // 0 = unlimited
|
maxSpeedKbs: 0, // 0 = unlimited
|
||||||
@@ -252,14 +255,23 @@ class ConfigStore {
|
|||||||
fs.renameSync(tmp, this.historyPath);
|
fs.renameSync(tmp, this.historyPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
_writeHistoryFileAtomic(arr) {
|
async _writeHistoryFileAtomic(arr) {
|
||||||
return new Promise((resolve, reject) => {
|
const tmp = this.historyPath + '.tmp';
|
||||||
const tmp = this.historyPath + '.tmp';
|
await fs.promises.writeFile(tmp, JSON.stringify(arr), 'utf-8');
|
||||||
fs.writeFile(tmp, JSON.stringify(arr), 'utf-8', (err) => {
|
await this._renameWithRetry(tmp, this.historyPath);
|
||||||
if (err) return reject(err);
|
}
|
||||||
fs.rename(tmp, this.historyPath, error => error ? reject(error) : resolve());
|
|
||||||
});
|
async _renameWithRetry(from, to) {
|
||||||
});
|
const delays = this._renameRetryDelays || RENAME_RETRY_DELAYS_MS;
|
||||||
|
for (let attempt = 0; ; attempt += 1) {
|
||||||
|
try {
|
||||||
|
await fs.promises.rename(from, to);
|
||||||
|
return;
|
||||||
|
} catch (error) {
|
||||||
|
if (!TRANSIENT_RENAME_ERROR_CODES.has(error && error.code) || attempt >= delays.length) throw error;
|
||||||
|
await new Promise(resolve => setTimeout(resolve, delays[attempt]));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_quiescedWriteError() {
|
_quiescedWriteError() {
|
||||||
@@ -715,7 +727,7 @@ class ConfigStore {
|
|||||||
} finally {
|
} finally {
|
||||||
await handle.close();
|
await handle.close();
|
||||||
}
|
}
|
||||||
await fs.promises.rename(temporary, target);
|
await this._renameWithRetry(temporary, target);
|
||||||
}
|
}
|
||||||
|
|
||||||
_enqueueAutomationCompletionWrite(operation) {
|
_enqueueAutomationCompletionWrite(operation) {
|
||||||
@@ -855,7 +867,7 @@ class ConfigStore {
|
|||||||
const current = await fs.promises.readFile(this.filePath, 'utf-8');
|
const current = await fs.promises.readFile(this.filePath, 'utf-8');
|
||||||
if (current && current.trim().length > 2) await fs.promises.writeFile(backupPath, current, 'utf-8');
|
if (current && current.trim().length > 2) await fs.promises.writeFile(backupPath, current, 'utf-8');
|
||||||
} catch {}
|
} catch {}
|
||||||
await fs.promises.rename(tmpPath, this.filePath);
|
await this._renameWithRetry(tmpPath, this.filePath);
|
||||||
this._cache = nextCache;
|
this._cache = nextCache;
|
||||||
this._cacheKey = '';
|
this._cacheKey = '';
|
||||||
this._lastConfigCheck = Date.now();
|
this._lastConfigCheck = Date.now();
|
||||||
|
|||||||
Reference in new issue
Block a user