feat: 支持设置应用/容器 CPU 与内存性能上限

This commit is contained in:
jinghui committed 2026-10-26 23:22:22 +08:00
1 parent 0bfbb9a64a
commit fbc8a5cb38
5 files changed
+172 -2

No files matched your search

+9
View File
@@ -1,5 +1,14 @@
# 更新日志
## 2026-10-26 → ✨ 支持设置应用/容器性能上限(CPU 核数 + 内存)
- ✨ 容器抽屉与**应用详情页**新增「性能限制」:填 CPU 核数、内存 MB → 应用,用 Docker cgroup 硬限制,超过即被限流/限内存
- ✨ 应用详情页一次对**该应用全部容器**生效,回填当前值;容器行上显示红色小标(如 `限 0.3核/96M`),悬停看详情
- ✨ 取消限制:CPU 立即解除(`CpuQuota:-1`),内存受 Docker 限制需重建容器,接口与提示都明确说明
- 🔧 新增 `POST /api/containers/:id/limits`、`POST /api/apps/:key/limits`、`POST /api/limits/reapply`、`GET /api/limits`;限制值持久化到 `data/limits.json`(按应用 key 与容器名),重建容器后可一键重新应用
- 🔧 `/api/containers`、`/api/apps` 返回 `limits`(cpus/memMB)与 `nanoCpus/memLimitCfg`,用于回填与角标
- ✅ 实测:`docker inspect` 确认 `NanoCpus=300000000 Memory=100663296`(0.3 核 / 96MB)生效;应用级 `已对 1 个容器生效` 后为 0.4 核 / 200MB;取消后 `CpuQuota=-1`;`limits.json` 正确落盘;测试容器与记录已清理
## 2026-10-26 → ✨ 镜像仓库页新增「批量 Compose 部署」
- ✨ 镜像仓库页新增部署卡片:多段 Compose 用 `---` 分隔,一次部署多个项目;实时预览「识别到 N 个项目」并显示每项目录与参数个数
+4
View File
@@ -34,6 +34,10 @@ Docker 自带面板和 Portainer 都是按「容器」管理:六十多个容
- 一键备份面板数据(设置/事件/流量·CPU·内存历史)与 Compose 应用配置文件(不含数据卷),生成 tar.gz 可直接下载;附 `manifest.json`
**性能限制**
- 在容器抽屉或应用详情页给应用设 CPU(核)与内存(MB)上限,走 Docker cgroup 硬限制;应用级一次对全部容器生效,行内显示 `限 0.3核/96M` 角标;限制值持久化在 `data/limits.json`
**告警**
- CPU/内存阈值、Webhook 推送、同应用去重间隔、测试推送
+51 -1
View File
@@ -588,6 +588,16 @@ async function openApp(key) {
<div class="s-card"><div class="k">可用率</div><div class="v">${a.uptime !== null ? a.uptime + '%' : '采样中'}</div></div>
<div class="s-card"><div class="k">端口</div><div class="v" style="font-size:13px">${a.ports.map(p => `<span class="port" data-port="${p.public}">:${p.public}</span>`).join(' ') || '无'}</div></div>
</div>
<div class="limit-box">
<div class="lim-head"><b>性能限制</b><span class="muted">用 cgroup 硬限制,超过即被限流/限内存;对全部容器生效</span></div>
<div class="lim-row">
<label>CPU <input id="limCpu" type="number" min="0" step="0.1" placeholder="不限" value="${a.containers[0] && a.containers[0].nanoCpus ? (a.containers[0].nanoCpus / 1e9) : ''}"> 核</label>
<label>内存 <input id="limMem" type="number" min="0" step="64" placeholder="不限" value="${a.containers[0] && a.containers[0].memLimitCfg ? Math.round(a.containers[0].memLimitCfg / 1048576) : ''}"> MB</label>
<button class="btn primary sm" id="limApply">应用限制</button>
<button class="btn ghost sm" id="limClear">取消限制</button>
<span class="muted" id="limNote">留空 = 不限制</span>
</div>
</div>
<div class="tabs inline" id="appTabs">
<button data-atab="containers" class="active">容器 (${a.total})</button>
<button data-atab="logs">聚合日志</button>
@@ -595,6 +605,22 @@ async function openApp(key) {
</div>
<div id="appTabBody"></div>`;
const applyAppLimits = async (cpus, memMB) => {
const btn = $('#limApply'); if (btn) { btn.disabled = true; btn.textContent = '应用中…'; }
try {
const r = await api(`/api/apps/${encodeURIComponent(key)}/limits`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ cpus, memMB }) });
if (r.clearing) toast(r.note || '限制已取消');
else toast(r.applied === r.total ? `已对 ${r.total} 个容器生效` : `${r.applied}/${r.total} 个容器生效(部分不支持热更新)`);
setTimeout(() => openApp(key), 900);
} catch (e) { toast(e.message, true); if (btn) { btn.disabled = false; btn.textContent = '应用限制'; } }
};
if ($('#limApply')) $('#limApply').onclick = () => {
const cpus = Number($('#limCpu').value) || 0;
const memMB = Number($('#limMem').value) || 0;
if (!cpus && !memMB) return toast('CPU 和内存至少填一个,或点「取消限制」', true);
applyAppLimits(cpus, memMB);
};
if ($('#limClear')) $('#limClear').onclick = () => applyAppLimits(0, 0);
$('#backBtn').onclick = () => { $('#pageTitle').textContent = '概览'; go('apps'); };
$$('#view [data-app-act]').forEach(b => b.onclick = async () => {
const act = b.dataset.appAct;
@@ -660,7 +686,7 @@ async function renderContainers(silent, mode = 'running') {
return `<div class="row${c.state === 'running' ? '' : ' off'}" data-id="${c.id}">
${mode === 'stopped' ? `<span class="chk"><input type="checkbox" class="rowsel" data-id="${c.id}"${state.sel.has(c.id) ? ' checked' : ''}></span>` : ''}
<div class="wicon">${icon('box')}<span class="dot ${c.state === 'running' ? 'up' : ''}"></span></div>
<div class="ident" title="${esc(c.name)}${c.created ? ' · 安装于 ' + new Date(c.created * 1000).toLocaleString('zh-CN') : ''}"><div class="nm">${esc(c.name)}</div>
<div class="ident" title="${esc(c.name)}${c.created ? ' · 安装于 ' + new Date(c.created * 1000).toLocaleString('zh-CN') : ''}"><div class="nm">${esc(c.name)}${(c.limits && (c.limits.cpus || c.limits.memMB)) ? `<span class="lim-chip" title="性能限制:${c.limits.cpus ? c.limits.cpus + ' 核' : '不限 CPU'} / ${c.limits.memMB ? c.limits.memMB + ' MB' : '不限内存'}">限 ${c.limits.cpus ? c.limits.cpus + '核' : ''}${c.limits.cpus && c.limits.memMB ? '/' : ''}${c.limits.memMB ? c.limits.memMB + 'M' : ''}</span>` : ''}</div>
<div class="pj" title="${esc((c.project ? '项目: ' + c.project : c.image) + ' · ' + c.status)}">${c.project ? '项目: ' + esc(c.project) : esc(shortImg(c.image))} · ${c.state === 'running' ? (c.runMs === null || c.runMs === undefined ? '运行中' : c.runMs < 60000 ? '刚刚启动' : '已运行 ' + fmtDurCompact(c.runMs)) : '已停止'}${c.restarts ? ` · 重启${c.restarts}` : ''}${c.created ? `` : ''}</div></div>
<div class="metrics">
<div class="metric"><div class="k">CPU</div><div class="v">${fmtPct(s.cpu)}</div>
@@ -866,6 +892,20 @@ async function openDrawer(id) {
} catch (e) { toast(e.message, true); }
});
drawTab(d);
const applyOne = async (cpus, memMB) => {
try {
const r = await api(`/api/containers/${id}/limits`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ cpus, memMB }) });
toast(r.clearing ? (r.note || '限制已取消') : '限制已生效');
openDrawer(id); render();
} catch (e) { toast(e.message, true); }
};
if ($('#limApply1')) $('#limApply1').onclick = () => {
const cpus = Number($('#limCpu1').value) || 0;
const memMB = Number($('#limMem1').value) || 0;
if (!cpus && !memMB) return toast('CPU 和内存至少填一个,或点「取消限制」', true);
applyOne(cpus, memMB);
};
if ($('#limClear1')) $('#limClear1').onclick = () => applyOne(0, 0);
}
async function drawTab(d) {
@@ -897,6 +937,16 @@ async function drawTab(d) {
<div class="k">命令</div><div class="muted">${esc([].concat(d.entrypoint || [], d.cmd || []).join(' ') || '-')}</div>
<div class="k">端口</div><div>${Object.entries(d.ports || {}).map(([p, b]) => `${p} → ${(b || []).map(x => x.HostPort).join(',') || '-'}`).join('<br/>') || '-'}</div>
<div class="k">容器 ID</div><div class="muted">${esc(d.info.Id)}</div>
<div class="k">当前限制</div><div>${(d.info.HostConfig && (d.info.HostConfig.NanoCpus || d.info.HostConfig.Memory)) ? `${d.info.HostConfig.NanoCpus ? (d.info.HostConfig.NanoCpus / 1e9) + ' 核' : '不限 CPU'} / ${d.info.HostConfig.Memory ? Math.round(d.info.HostConfig.Memory / 1048576) + ' MB' : '不限内存'}` : '未设置'}</div>
</div>
<div class="limit-box">
<div class="lim-head"><b>设置性能限制</b><span class="muted">超过即被 Docker 限流/限内存</span></div>
<div class="lim-row">
<label>CPU <input id="limCpu1" type="number" min="0" step="0.1" placeholder="不限" value="${d.info.HostConfig && d.info.HostConfig.NanoCpus ? d.info.HostConfig.NanoCpus / 1e9 : ''}"> 核</label>
<label>内存 <input id="limMem1" type="number" min="0" step="64" placeholder="不限" value="${d.info.HostConfig && d.info.HostConfig.Memory ? Math.round(d.info.HostConfig.Memory / 1048576) : ''}"> MB</label>
<button class="btn primary sm" id="limApply1">应用</button>
<button class="btn ghost sm" id="limClear1">取消限制</button>
</div>
</div>`;
const hist = d.history || [];
drawChart(body, 'cpu', hist.map(x => x.c), v => v.toFixed(1) + '%', '#1a73e8');
+9
View File
@@ -380,3 +380,12 @@ table.tb th.num{text-align:right}
.dep-text:focus{outline:none;border-color:#1a73e8;box-shadow:0 0 0 3px rgba(26,115,232,.10)}
.dep-meta{margin-top:8px;font-size:12px;color:#5a6b82}
.dep-chip{display:inline-block;background:#eef4ff;border:1px solid #d6e4f7;color:#1a5fbf;border-radius:999px;padding:2px 9px;margin:3px 4px 0 0;font-size:11.5px}
/* 性能限制 */
.limit-box{background:#fbfdff;border:1px solid #e6eef8;border-radius:10px;padding:10px 12px;margin:10px 0}
.lim-head{display:flex;align-items:baseline;gap:8px;margin-bottom:8px;font-size:12.5px}
.lim-head b{font-size:13px;color:#26303f}
.lim-row{display:flex;align-items:center;gap:10px;flex-wrap:wrap;font-size:12.5px;color:#5a6b82}
.lim-row input{width:92px;height:28px;padding:0 8px;border:1px solid #dfe6ef;border-radius:7px;font-size:12.5px}
.lim-row input:focus{outline:none;border-color:#1a73e8;box-shadow:0 0 0 3px rgba(26,115,232,.10)}
.lim-chip{display:inline-block;margin-left:6px;padding:1px 6px;border-radius:999px;background:#fff1f0;border:1px solid #ffd6d2;color:#c0392b;font-size:10.5px;font-weight:600;vertical-align:middle}
+99 -1
View File
@@ -234,6 +234,7 @@ async function inspectAll() {
state: c.State, restarts: old.restarts || 0, health: old.health || '',
startedAt: old.startedAt || '', exitCode: old.exitCode ?? 0,
restartPolicy: old.restartPolicy || '', memLimitCfg: old.memLimitCfg || 0,
nanoCpus: old.nanoCpus || 0, pidsLimit: old.pidsLimit || 0,
privileged: !!old.privileged, user: old.user || '', healthcheck: !!old.healthcheck,
dockerSock: !!old.dockerSock, inspected: !!old.inspected,
};
@@ -248,6 +249,8 @@ async function inspectAll() {
next.exitCode = d.State?.ExitCode ?? 0;
next.restartPolicy = d.HostConfig?.RestartPolicy?.Name || 'no';
next.memLimitCfg = d.HostConfig?.Memory || 0;
next.nanoCpus = d.HostConfig?.NanoCpus || 0;
next.pidsLimit = d.HostConfig?.PidsLimit || 0;
next.privileged = !!d.HostConfig?.Privileged;
next.user = d.Config?.User || '';
next.healthcheck = !!(d.Config?.Healthcheck && (d.Config.Healthcheck.Test || []).length);
@@ -284,7 +287,7 @@ function buildApps(containers) {
id: c.Id, name: strip((c.Names || [])[0]), service: svcOf(c.Labels),
image: c.Image, state: c.State, status: c.Status,
health: m.health || '', restarts: m.restarts || 0, startedAt: m.startedAt || '', exitCode: m.exitCode ?? 0,
restartPolicy: m.restartPolicy || '', memLimitCfg: m.memLimitCfg || 0,
restartPolicy: m.restartPolicy || '', memLimitCfg: m.memLimitCfg || 0, nanoCpus: m.nanoCpus || 0,
privileged: !!m.privileged, healthcheck: !!m.healthcheck, dockerSock: !!m.dockerSock,
ports: (c.Ports || []).filter(pp => pp.PublicPort).length,
runMs: c.State === 'running' && m.startedAt ? Math.max(0, Date.now() - Date.parse(m.startedAt)) : null,
@@ -994,6 +997,7 @@ app.get('/api/containers', async (req, res) => {
image: c.Image, state: c.State, status: c.Status, created: c.Created,
project: projectOf(c.Labels), service: svcOf(c.Labels),
health: m.health || '', restarts: m.restarts || 0,
limits: { cpus: (m.nanoCpus || 0) / 1e9, memMB: Math.round((m.memLimitCfg || 0) / 1048576), pids: m.pidsLimit || 0 },
startedAt: m.startedAt || '',
runMs: c.State === 'running' && m.startedAt ? Math.max(0, Date.now() - Date.parse(m.startedAt)) : null,
ports: (c.Ports || []).map(p => ({ ip: p.IP, private: p.PrivatePort, public: p.PublicPort, type: p.Type })),
@@ -1280,6 +1284,100 @@ app.post('/api/images/pull', async (req, res) => {
const BUILTIN_NETS = ['bridge', 'host', 'none'];
/* ---------------- 性能限制 ---------------- */
const LIMITS_PATH = path.join(path.dirname(SETTINGS_PATH), 'limits.json');
let limitsStore = { apps: {}, containers: {} };
try { limitsStore = JSON.parse(fs.readFileSync(LIMITS_PATH, 'utf8')); } catch (e) {}
function saveLimits() {
try { fs.mkdirSync(path.dirname(LIMITS_PATH), { recursive: true }); fs.writeFileSync(LIMITS_PATH, JSON.stringify(limitsStore, null, 2)); } catch (e) {}
}
function limitPayload(cpus, memMB) {
const c = Number(cpus) || 0;
const m = Number(memMB) || 0;
if (c < 0 || m < 0) throw new Error('限制值不能为负');
const opt = { NanoCpus: c > 0 ? Math.round(c * 1e9) : 0 };
if (m > 0) { opt.Memory = Math.round(m * 1048576); opt.MemorySwap = -1; }
else { opt.Memory = 0; opt.MemorySwap = 0; }
return opt;
}
app.get('/api/limits', (req, res) => res.json(limitsStore));
app.post('/api/containers/:id/limits', async (req, res) => {
try {
const rawCpus = Number(req.body && req.body.cpus) || 0;
const rawMem = Number(req.body && req.body.memMB) || 0;
const clearing = rawCpus <= 0 && rawMem <= 0;
const opt = clearing ? { CpuQuota: -1 } : limitPayload(rawCpus, rawMem);
const c = docker.getContainer(req.params.id);
const info = await c.inspect();
await c.update(opt);
const name = strip(info.Name || '');
if (clearing) delete limitsStore.containers[name];
else limitsStore.containers[name] = { cpus: rawCpus, memMB: rawMem };
saveLimits();
const st = meta.get(info.Id) || {};
st.nanoCpus = clearing ? 0 : opt.NanoCpus; st.memLimitCfg = clearing ? 0 : (opt.Memory || 0);
meta.set(info.Id, st);
pushEvent('info', null, clearing ? `取消容器限制 ${name}` : `设置容器限制 ${name}`,
clearing ? 'CPU 已解除;内存上限需重建容器才彻底移除' : `${opt.NanoCpus ? (opt.NanoCpus / 1e9).toFixed(2) + ' 核' : '不限 CPU'} · ${opt.Memory ? (opt.Memory / 1048576).toFixed(0) + ' MB' : '不限内存'}`);
res.json({ ok: true, clearing, applied: opt, note: clearing ? 'CPU 限制已解除;内存上限需重建容器(docker compose up -d --force-recreate)才能完全移除' : '' });
} catch (e) { res.status(500).json({ error: e.message }); }
});
app.post('/api/apps/:key/limits', async (req, res) => {
try {
const rawCpus = Number(req.body && req.body.cpus) || 0;
const rawMem = Number(req.body && req.body.memMB) || 0;
const clearing = rawCpus <= 0 && rawMem <= 0;
const opt = clearing ? { CpuQuota: -1 } : limitPayload(rawCpus, rawMem);
const key = String(req.params.key);
const conts = await docker.listContainers({ all: true });
const mine = conts.filter(c => appKeyOf(c) === key);
if (!mine.length) return res.status(404).json({ error: '该应用下没有容器' });
const results = [];
for (const c of mine) {
try {
await docker.getContainer(c.Id).update(opt);
const st = meta.get(c.Id) || {};
st.nanoCpus = clearing ? 0 : opt.NanoCpus; st.memLimitCfg = clearing ? 0 : (opt.Memory || 0);
meta.set(c.Id, st);
results.push({ name: strip((c.Names || [])[0]), ok: true });
} catch (e) { results.push({ name: strip((c.Names || [])[0]), ok: false, error: e.message }); }
}
if (clearing) delete limitsStore.apps[key];
else limitsStore.apps[key] = { cpus: rawCpus, memMB: rawMem };
saveLimits();
const ok = results.filter(r => r.ok).length;
pushEvent('info', null, clearing ? `取消应用限制 ${key}` : `设置应用限制 ${key}`,
`${ok}/${results.length} 个容器生效 · ${clearing ? '已解除 CPU;内存需重建容器' : `${opt.NanoCpus ? (opt.NanoCpus / 1e9).toFixed(2) + ' 核' : '不限 CPU'} / ${opt.Memory ? (opt.Memory / 1048576).toFixed(0) + ' MB' : '不限内存'}`}`);
res.json({ ok: true, clearing, applied: ok, total: results.length, results, note: clearing ? 'CPU 限制已解除;内存上限需重建容器才能完全移除' : '' });
} catch (e) { res.status(500).json({ error: e.message }); }
});
app.post('/api/limits/reapply', async (req, res) => {
try {
const conts = await docker.listContainers({ all: true });
let applied = 0, failed = 0;
for (const c of conts) {
const key = appKeyOf(c);
const name = strip((c.Names || [])[0]);
const lim = limitsStore.apps[key] || limitsStore.containers[name];
if (!lim) continue;
try {
const opt = limitPayload(lim.cpus, lim.memMB);
await docker.getContainer(c.Id).update(opt);
const st = meta.get(c.Id) || {};
st.nanoCpus = opt.NanoCpus; st.memLimitCfg = opt.Memory || 0;
meta.set(c.Id, st);
applied++;
} catch (e) { failed++; }
}
res.json({ ok: true, applied, failed });
} catch (e) { res.status(500).json({ error: e.message }); }
});
/* ---------------- Compose 批量部署 ---------------- */
function safeSubdir(dir) {
const d = String(dir || '').trim().replace(/^\/+|\/+$/g, '');