Boonlive_RD_Web/Web_UploadTest_Rcu_Dev
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 将批量升级改为逐个主机顺序升级并添加超时控制

Browse Source 
- 修改升级流程，从同时触发所有主机改为逐个主机顺序触发和轮询
- 添加 session_id 字段到 upgrade_log 表以区分不同主机的升级会话
- 引入 upgradePollTimeoutSeconds 配置项控制单个主机轮询超时时间
- 添加数据库迁移脚本以更新表结构和主键约束
- 实现运行组状态跟踪，防止同一组并发执行
- 改进错误处理和日志记录，为每个主机独立记录升级结果
This commit is contained in:
徐
2026-01-23 18:22:05 +08:00
parent 834ac02da5
commit fc134b0108
5 changed files with 167 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/init_db.sql
View File

@@ -5,6 +5,7 @@
CREATE TABLE IF NOT EXISTS upgrade_log (
uuid UUID NOT NULL,
session_id UUID,
start_time TIMESTAMP NOT NULL,
roomtype_id INTEGER NOT NULL,
host_str TEXT NOT NULL,

34
scripts/update_db_schema.js Normal file
View File

@@ -0,0 +1,34 @@
const db = require('../src/db');
const updateSchema = async () => {
try {
console.log('Updating database schema...');
await db.query(`
DO $$
BEGIN
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'upgrade_log' AND column_name = 'session_id') THEN
ALTER TABLE upgrade_log ADD COLUMN session_id UUID;
END IF;
END $$;
`);
console.log('Added session_id column.');
try {
await db.query(`ALTER TABLE upgrade_log DROP CONSTRAINT IF EXISTS upgrade_log_pkey`);
console.log('Dropped old primary key constraint.');
} catch (e) {
console.log('Primary key might not exist or different name:', e.message);
}
await db.query(`ALTER TABLE upgrade_log ADD PRIMARY KEY (uuid)`);
console.log('Set uuid as Primary Key.');
console.log('Schema update completed successfully.');
process.exit(0);
} catch (error) {
console.error('Schema update failed:', error);
process.exit(1);
}
};
updateSchema();

1
src/config.js
View File

@@ -41,5 +41,6 @@ module.exports = {
runOnStartup: String(process.env.RUN_ON_STARTUP || 'false').toLowerCase() === 'true',
upgradeWaitSeconds: Number(process.env.UPGRADE_WAIT_SECONDS || 45),
upgradePollIntervalSeconds: Number(process.env.UPGRADE_POLL_INTERVAL_SECONDS || 45),
upgradePollTimeoutSeconds: Number(process.env.UPGRADE_POLL_TIMEOUT_SECONDS || 300),
upgradeConfig: parseUpgradeConfig(process.env.UPGRADE_CONFIG)
};

7
src/loggerService.js
View File

@@ -1,13 +1,16 @@
const { v4: uuidv4 } = require('uuid');
const db = require('./db');
const logHostResult = async (data) => {
const entryId = uuidv4();
const query = `
INSERT INTO upgrade_log (
uuid, start_time, roomtype_id, host_str, filename, status,
uuid, session_id, start_time, roomtype_id, host_str, filename, status,
end_time, file_type, config_version, firmware_version
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
`;
const values = [
entryId,
data.uuid,
data.start_time,
data.roomtype_id,

174
src/upgradeController.js
View File

@@ -5,9 +5,19 @@ const config = require('./config');
const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
const runningGroups = new Map();
const processGroup = async (group, groupIdx) => {
const stateKey = `group_${groupIdx}`;
if (runningGroups.get(stateKey)) {
console.log(`[${stateKey}] Skipping scheduled run because group is still running.`);
return;
}
runningGroups.set(stateKey, true);
try {
let state = await loggerService.getUpgradeState(stateKey);
if (!state) {
state = { current_roomtype_index: 0, execution_count: 0 };
@@ -25,93 +35,117 @@ const processGroup = async (group, groupIdx) => {
nextState.current_roomtype_index = (state.current_roomtype_index + 1) % group.roomtypes.length;
}
const sessionUuid = uuidv4();
const startTime = new Date();
const hostList = group.hosts;
console.log(`[${stateKey}] Starting upgrade. Roomtype: ${roomtype_id}. File: ${fileName}. Hosts: ${hostList}`);
try {
const upgradeRes = await apiClient.triggerUpgrade(roomtype_id, hostList, fileName);
if (!upgradeRes.IsSuccess) {
console.error(`[${stateKey}] Upgrade trigger failed: ${upgradeRes.Message}`);
return;
}
} catch (e) {
console.error(`[${stateKey}] Upgrade trigger error:`, e.message);
return;
}
const hostQueue = group.hosts.map(String);
console.log(`[${stateKey}] Starting queue. Roomtype: ${roomtype_id}. File: ${fileName}. Hosts: ${hostQueue.join(', ')}`);
const waitSeconds = config.upgradeWaitSeconds || 45;
const pollIntervalSeconds = config.upgradePollIntervalSeconds || 45;
console.log(`[${stateKey}] Waiting ${waitSeconds}s...`);
await sleep(waitSeconds * 1000);
const pollTimeoutSeconds = config.upgradePollTimeoutSeconds || 300;
const timeout = 5 * 60 * 1000;
const interval = pollIntervalSeconds * 1000;
const pollStartTime = Date.now();
for (const hostId of hostQueue) {
const sessionUuid = uuidv4();
const startTime = new Date();
const allHosts = new Set(hostList.map(String));
const lastStatusMap = new Map();
console.log(`[${stateKey}] Triggering upgrade for host ${hostId}. Roomtype: ${roomtype_id}. File: ${fileName}.`);
while (Date.now() - pollStartTime < timeout) {
try {
const queryRes = await apiClient.queryStatus(hostList);
if (queryRes && Array.isArray(queryRes.Response)) {
for (const hostStatus of queryRes.Response) {
const hid = String(hostStatus.HostID);
if (allHosts.has(hid)) {
lastStatusMap.set(hid, {
status: hostStatus.Upgrade_status,
file_type: hostStatus.UpgradeFileType,
config_version: hostStatus.ConfiguraVersion,
firmware_version: hostStatus.Version
});
}
}
}
} catch (e) {
console.error(`[${stateKey}] Poll error:`, e.message);
}
if (lastStatusMap.size === allHosts.size) {
const allDone = Array.from(lastStatusMap.values()).every((item) =>
item.status === '升级完成' || item.status === '超时失败'
);
if (allDone) {
console.log(`[${stateKey}] All hosts completed or timeout failed.`);
break;
}
}
await sleep(interval);
}
for (const hid of allHosts) {
const data = lastStatusMap.get(hid) || {
status: '超时失败',
file_type: 'Unknown',
config_version: '',
firmware_version: ''
};
const upgradeRes = await apiClient.triggerUpgrade(roomtype_id, [hostId], fileName);
if (!upgradeRes.IsSuccess) {
console.error(`[${stateKey}] Upgrade trigger failed for host ${hostId}: ${upgradeRes.Message}`);
await loggerService.logHostResult({
uuid: sessionUuid,
start_time: startTime.toISOString(),
roomtype_id: roomtype_id,
host_str: hid,
host_str: hostId,
filename: fileName,
status: data.status,
status: '触发失败',
end_time: new Date().toISOString(),
file_type: data.file_type,
config_version: data.config_version,
firmware_version: data.firmware_version
file_type: '',
config_version: '',
firmware_version: ''
});
console.log(`[${stateKey}] Host ${hid} final status: ${data.status}.`);
continue;
}
} catch (e) {
console.error(`[${stateKey}] Upgrade trigger error for host ${hostId}:`, e.message);
await loggerService.logHostResult({
uuid: sessionUuid,
start_time: startTime.toISOString(),
roomtype_id: roomtype_id,
host_str: hostId,
filename: fileName,
status: '触发失败',
end_time: new Date().toISOString(),
file_type: '',
config_version: '',
firmware_version: ''
});
continue;
}
console.log(`[${stateKey}] Waiting ${waitSeconds}s for host ${hostId}...`);
await sleep(waitSeconds * 1000);
const pollStartTime = Date.now();
let completed = false;
while (Date.now() - pollStartTime < pollTimeoutSeconds * 1000) {
try {
const queryRes = await apiClient.queryStatus([hostId]);
if (queryRes && Array.isArray(queryRes.Response)) {
const hostStatus = queryRes.Response.find((item) => String(item.HostID) === String(hostId));
if (hostStatus) {
const rawStatus = hostStatus.Upgrade_status || '';
const status = rawStatus.trim();
if (['升级完成', '超时失败', '升级失败'].includes(status)) {
await loggerService.logHostResult({
uuid: sessionUuid,
start_time: startTime.toISOString(),
roomtype_id: roomtype_id,
host_str: hostId,
filename: fileName,
status: status,
end_time: new Date().toISOString(),
file_type: hostStatus.UpgradeFileType,
config_version: hostStatus.ConfiguraVersion,
firmware_version: hostStatus.Version
});
console.log(`[${stateKey}] Host ${hostId} logged to DB with status: '${status}'.`);
completed = true;
break;
}
}
} else {
console.warn(`[${stateKey}] Invalid query response for host ${hostId}:`, queryRes);
}
} catch (e) {
console.error(`[${stateKey}] Poll error for host ${hostId}:`, e.message);
}
await sleep(pollIntervalSeconds * 1000);
}
if (!completed) {
await loggerService.logHostResult({
uuid: sessionUuid,
start_time: startTime.toISOString(),
roomtype_id: roomtype_id,
host_str: hostId,
filename: fileName,
status: '超时失败',
end_time: new Date().toISOString(),
file_type: 'Unknown',
config_version: '',
firmware_version: ''
});
console.log(`[${stateKey}] Host ${hostId} timeout failed.`);
}
}
await loggerService.updateUpgradeState(stateKey, nextState.current_roomtype_index, nextState.execution_count);
} finally {
runningGroups.set(stateKey, false);
}
};
const run = async () => {