From 485a267ffea4124a440de18d35d02d13a83bd364 Mon Sep 17 00:00:00 2001 From: Claw Date: Tue, 17 Nov 2026 19:23:28 +0100 Subject: [PATCH] 0.2.0: job engine, VM actions, theme-aware styling --- TODO.md | 14 +-- bin/vmm-ctl | 69 ++++++++++ bin/vmm-jobd | 189 ++++++++++++++++++++++++++++ bin/vmm-lib.php | 249 +++++++++++++++++++++++++++++++++++++ gui/ext/vmmngr/vmmngr.conf | 5 +- gui/vmmngr-boot.inc | 33 +++++ gui/vmmngr.js | 79 ++++++++++++ gui/vmmngr.php | 105 +++++++++++----- gui/vmmngr_api.php | 49 +++++++- gui/vmmngr_config.php | 9 +- gui/vmmngr_jobs.php | 89 +++++++++++++ gui/vmmngr_vm.php | 72 ++++++++--- version.txt | 2 +- vmm-init | 8 +- 14 files changed, 901 insertions(+), 71 deletions(-) create mode 100644 bin/vmm-jobd create mode 100644 gui/vmmngr.js create mode 100644 gui/vmmngr_jobs.php diff --git a/TODO.md b/TODO.md index 29aee13..15f379d 100644 --- a/TODO.md +++ b/TODO.md @@ -1,13 +1,13 @@ # TODO -## GUI / Styling -- [ ] **Kontrast/Farben (von Matthias, 19:18):** dunkle Grautöne verdecken Info-Text. - Ursache: Karten/badges/`
` nutzen hartkodierte Hex-Farben statt Theme-Variablen.
-      Fix: XigmaNAS-Theme-CSS-Variablen erben, heller Verlauf, Badges mit Theme-Rahmen;
-      Lesbarkeit in Light+Dark prüfen. -> M2, vor den Aktions-Buttons.
+## Erledigt
+- [x] **Kontrast/Farben** (19:18): Karten/Badges/`
` nutzen jetzt Theme-Variablen
+      (`--bgc-area-data`, `--bgc-input-ro`, currentColor) statt harter Hex-Werte.
+- [x] **M2**: Start/Stop/Restart/Reset/Poweroff/Destroy + Job-Engine
+      (flock pro VM, Logs, Recovery, RAM-Budget 85 %, Destroy mit eingetipptem Namen).
 
-## Funktion
-- [ ] M2: Start/Stop/Restart/Reset/Destroy + Job-Engine (flock, Logs, Recovery)
+## Offen
 - [ ] M3: Create-Wizard, Images (ISO/IMG/Cloud-Init), Datastores
 - [ ] M4: Templates-CRUD, Switches, Snapshots/Clone/Rename, Autostart
 - [ ] M5: Konsole (ttyd), VNC, Passthru-Gate, OBI-Eintrag, Doku
+- [ ] Nice-to-have: Job-Liste filtern, Fortschritt bei Downloads
diff --git a/bin/vmm-ctl b/bin/vmm-ctl
index 63a1b18..3af9d8a 100644
--- a/bin/vmm-ctl
+++ b/bin/vmm-ctl
@@ -122,6 +122,75 @@ switch ($cmd) {
             }
         );
 
+    case 'action':
+        $verb = $argv[1] ?? '';
+        $name = $argv[2] ?? '';
+        $confirm = '';
+        foreach ($argv as $a) {
+            if (str_starts_with($a, '--confirm=')) {
+                $confirm = substr($a, 10);
+            }
+        }
+        $check = vmm_action_check($verb, $name, $confirm);
+        if (!$check['ok']) {
+            if ($json) {
+                vmm_json(['ok' => false, 'error' => $check['error']], 1);
+            }
+            fwrite(STDERR, 'refused: ' . $check['error'] . "\n");
+            exit(1);
+        }
+        $job = vmm_job_new($verb, $name);
+        out(
+            ['ok' => true, 'job' => $job],
+            $json,
+            static function (array $d): void {
+                printf("job %s queued: %s %s\n", $d['job']['id'], $d['job']['verb'], $d['job']['vm']);
+            }
+        );
+
+    case 'job':
+        $job = vmm_job_get($arg);
+        if ($job === null) {
+            if ($json) {
+                vmm_json(['ok' => false, 'error' => 'job not found'], 404);
+            }
+            fwrite(STDERR, "job not found\n");
+            exit(1);
+        }
+        $job['log'] = vmm_job_log($arg);
+        out(
+            ['ok' => true, 'job' => $job],
+            $json,
+            static function (array $d): void {
+                printf("job %s  %s %s  state=%s rc=%s\n", $d['job']['id'], $d['job']['verb'], $d['job']['vm'], $d['job']['state'], $d['job']['rc'] ?? '-');
+                echo $d['job']['log'];
+            }
+        );
+
+    case 'jobs':
+        $jobs = vmm_job_list(50, $arg);
+        out(
+            ['ok' => true, 'jobs' => $jobs],
+            $json,
+            static function (array $d): void {
+                foreach ($d['jobs'] as $j) {
+                    printf("%-32s %-8s %-8s %-10s rc=%s\n", $j['id'], $j['verb'], $j['vm'], $j['state'], $j['rc'] ?? '-');
+                }
+            }
+        );
+
+    case 'cancel':
+        $res = vmm_job_cancel($arg);
+        out($res, $json, static function (array $d): void {
+            echo $d['ok'] ? "cancel requested\n" : ('error: ' . $d['error'] . "\n");
+        });
+
+    case 'recover':
+        $fixed = vmm_job_recover();
+        out(['ok' => true, 'fixed' => $fixed], $json, static function (array $d): void {
+            printf("%d interrupted job(s) marked failed\n", $d['fixed']);
+        });
+
     case 'json':
         vmm_json(vmm_selfcheck());
         // no break
diff --git a/bin/vmm-jobd b/bin/vmm-jobd
new file mode 100644
index 0000000..5a95693
--- /dev/null
+++ b/bin/vmm-jobd
@@ -0,0 +1,189 @@
+#!/usr/local/bin/php
+.log and records the final state.
+ */
+
+declare(strict_types=1);
+
+require_once __DIR__ . '/vmm-lib.php';
+
+$id = $argv[1] ?? '';
+$job = vmm_job_get($id);
+if ($job === null) {
+    fwrite(STDERR, "job not found: {$id}\n");
+    exit(2);
+}
+
+$verb = (string)$job['verb'];
+$name = (string)$job['vm'];
+if (!isset(VMM_ACTIONS[$verb])) {
+    $job['state'] = 'failed';
+    $job['error'] = 'unknown verb';
+    $job['ended'] = time();
+    vmm_job_write($job);
+    exit(2);
+}
+
+$logFile = VMM_JOBDIR . '/' . $id . '.log';
+$log = fopen($logFile, 'ab');
+if ($log === false) {
+    exit(2);
+}
+
+function joblog($log, string $line): void
+{
+    fwrite($log, '[' . date('H:i:s') . '] ' . $line . "\n");
+    fflush($log);
+}
+
+// one lock per VM (destroy/start/stop of the same guest never overlap)
+vmm_ensure_state_dirs();
+$lockPath = VMM_LOCKDIR . '/' . preg_replace('/[^A-Za-z0-9._-]/', '_', $name) . '.lock';
+$lock = fopen($lockPath, 'c');
+if ($lock === false || !flock($lock, LOCK_EX | LOCK_NB)) {
+    $job['state'] = 'failed';
+    $job['error'] = 'another job holds the lock for this vm';
+    $job['ended'] = time();
+    vmm_job_write($job);
+    joblog($log, 'lock busy: ' . $lockPath);
+    fclose($log);
+    exit(3);
+}
+
+$job['state'] = 'running';
+$job['pid'] = getmypid();
+$job['started'] = time();
+vmm_job_write($job);
+
+$argvVm = array_merge(VMM_ACTIONS[$verb]['argv'], [$name]);
+joblog($log, 'start: vm ' . implode(' ', $argvVm));
+
+$vm = vmm_resolve('vm');
+if (!$vm['available']) {
+    $job['state'] = 'failed';
+    $job['error'] = 'vm-bhyve not available';
+    $job['ended'] = time();
+    vmm_job_write($job);
+    joblog($log, 'fatal: vm-bhyve not available');
+    flock($lock, LOCK_UN);
+    fclose($lock);
+    fclose($log);
+    exit(4);
+}
+
+$env = getenv() ?: [];
+$env['LC_ALL'] = 'C';
+$grub = vmm_resolve('grub');
+if ($grub['source'] === 'bundle') {
+    $env['PATH'] = VMM_ROOT . '/vendor/grub2-bhyve:' . ($env['PATH'] ?? '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin');
+}
+
+$cmd = array_merge([$vm['path']], $argvVm);
+$spec = [
+    0 => ['pipe', 'r'],
+    1 => ['pipe', 'w'],
+    2 => ['pipe', 'w'],
+];
+$proc = proc_open($cmd, $spec, $pipes, null, $env);
+if (!is_resource($proc)) {
+    $job['state'] = 'failed';
+    $job['error'] = 'proc_open failed';
+    $job['ended'] = time();
+    vmm_job_write($job);
+    flock($lock, LOCK_UN);
+    fclose($lock);
+    fclose($log);
+    exit(5);
+}
+fclose($pipes[0]);
+stream_set_blocking($pipes[1], false);
+stream_set_blocking($pipes[2], false);
+
+$timeout = (int)(VMM_ACTIONS[$verb]['timeout'] ?? 300);
+$start = time();
+$timedOut = false;
+$cancelFile = VMM_JOBDIR . '/' . $id . '.cancel';
+
+while (true) {
+    $status = proc_get_status($proc);
+    $out = (string)stream_get_contents($pipes[1]);
+    $err = (string)stream_get_contents($pipes[2]);
+    if ($out !== '') {
+        fwrite($log, $out);
+        fflush($log);
+    }
+    if ($err !== '') {
+        fwrite($log, $err);
+        fflush($log);
+    }
+    if (!$status['running']) {
+        break;
+    }
+    if (is_file($cancelFile)) {
+        joblog($log, 'cancel requested, sending TERM');
+        proc_terminate($proc, 15);
+        usleep(300000);
+        if (proc_get_status($proc)['running']) {
+            proc_terminate($proc, 9);
+        }
+        @unlink($cancelFile);
+        break;
+    }
+    if (time() - $start > $timeout) {
+        $timedOut = true;
+        joblog($log, "timeout after {$timeout}s, sending TERM");
+        proc_terminate($proc, 15);
+        usleep(500000);
+        if (proc_get_status($proc)['running']) {
+            proc_terminate($proc, 9);
+        }
+        break;
+    }
+    usleep(200000);
+}
+
+fwrite($log, (string)stream_get_contents($pipes[1]));
+fwrite($log, (string)stream_get_contents($pipes[2]));
+fclose($pipes[1]);
+fclose($pipes[2]);
+$rc = proc_close($proc);
+
+$stateAfter = vmm_vm_state($name);
+
+// vm-bhyve often returns 0 even when it refused the operation, so the
+// resulting state is what counts.
+$expected = [
+    'start' => 'running',
+    'stop' => 'stopped',
+    'restart' => 'running',
+    'reset' => 'running',
+    'poweroff' => 'stopped',
+    'destroy' => 'absent',
+][$verb] ?? '';
+
+$job['rc'] = $rc;
+$job['ended'] = time();
+$job['state_after'] = $stateAfter;
+if ($timedOut) {
+    $job['state'] = 'failed';
+    $job['error'] = 'timeout';
+} elseif ($rc !== 0) {
+    $job['state'] = 'failed';
+    $job['error'] = 'vm exited with code ' . $rc;
+} elseif ($expected !== '' && $stateAfter !== $expected) {
+    $job['state'] = 'failed';
+    $job['error'] = sprintf('unexpected state after %s: %s (expected %s)', $verb, $stateAfter, $expected);
+} else {
+    $job['state'] = 'done';
+}
+vmm_job_write($job);
+joblog($log, sprintf('finished: rc=%d, state=%s', $rc, $stateAfter));
+
+flock($lock, LOCK_UN);
+fclose($lock);
+fclose($log);
+exit(0);
diff --git a/bin/vmm-lib.php b/bin/vmm-lib.php
index bafc1fe..a338e6d 100644
--- a/bin/vmm-lib.php
+++ b/bin/vmm-lib.php
@@ -472,3 +472,252 @@ function vmm_json(array $data, int $code = 0): never
     echo json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
     exit;
 }
+
+/* ------------------------------------------------------------------ */
+/* job engine                                                         */
+/* ------------------------------------------------------------------ */
+
+const VMM_JOBDIR  = VMM_ROOT . '/state/jobs';
+const VMM_LOCKDIR = VMM_ROOT . '/state/locks';
+const VMM_ACTIONS = [
+    'start'    => ['argv' => ['start'],    'timeout' => 300, 'needs' => 'stopped'],
+    'stop'     => ['argv' => ['stop'],     'timeout' => 180, 'needs' => 'running'],
+    'restart'  => ['argv' => ['restart'],  'timeout' => 300, 'needs' => 'running'],
+    'reset'    => ['argv' => ['reset', '-f'], 'timeout' => 120, 'needs' => 'running'],
+    'poweroff' => ['argv' => ['poweroff', '-f'], 'timeout' => 120, 'needs' => 'running'],
+    'destroy'  => ['argv' => ['destroy', '-f'], 'timeout' => 300, 'needs' => 'stopped'],
+];
+
+function vmm_ensure_state_dirs(): void
+{
+    foreach ([VMM_JOBDIR, VMM_LOCKDIR] as $d) {
+        if (!is_dir($d)) {
+            @mkdir($d, 0750, true);
+        }
+    }
+}
+
+function vmm_vm_state(string $name): string
+{
+    foreach (vmm_list() as $v) {
+        if (($v['name'] ?? '') === $name) {
+            return (string)$v['state'];
+        }
+    }
+    return 'absent';
+}
+
+function vmm_ram_budget(): array
+{
+    $conf = vmm_config();
+    $limitPct = (int)($conf['ram_budget_pct'] ?? 85);
+    $total = 0;
+    $out = trim((string)@shell_exec('/sbin/sysctl -n hw.physmem 2>/dev/null'));
+    if ($out !== '' && ctype_digit($out)) {
+        $total = (int)$out;
+    }
+    if ($total <= 0) {
+        $total = 8 * 1024 ** 3;
+    }
+    return ['total' => $total, 'limit' => (int)($total * $limitPct / 100), 'pct' => $limitPct];
+}
+
+function vmm_ram_used(): int
+{
+    $used = 0;
+    foreach (vmm_list() as $v) {
+        if (($v['state'] ?? '') === 'running') {
+            $used += vmm_size_to_bytes((string)($v['memory'] ?? '0'));
+        }
+    }
+    return $used;
+}
+
+function vmm_action_check(string $verb, string $name, string $confirm = ''): array
+{
+    if (!isset(VMM_ACTIONS[$verb])) {
+        return ['ok' => false, 'error' => 'unknown action'];
+    }
+    if (!vmm_valid_name($name)) {
+        return ['ok' => false, 'error' => 'invalid vm name'];
+    }
+    $state = vmm_vm_state($name);
+    if ($state === 'absent') {
+        return ['ok' => false, 'error' => 'vm not found'];
+    }
+    $needs = VMM_ACTIONS[$verb]['needs'];
+    if ($needs === 'running' && $state !== 'running') {
+        return ['ok' => false, 'error' => "vm is {$state}, not running"];
+    }
+    if ($needs === 'stopped' && $state === 'running') {
+        return ['ok' => false, 'error' => 'vm is running; stop it first'];
+    }
+    if ($verb === 'start') {
+        $budget = vmm_ram_budget();
+        $used = vmm_ram_used();
+        $need = 0;
+        foreach (vmm_list() as $v) {
+            if (($v['name'] ?? '') === $name) {
+                $need = vmm_size_to_bytes((string)($v['memory'] ?? '0'));
+            }
+        }
+        if ($need > 0 && $used + $need > $budget['limit']) {
+            return [
+                'ok' => false,
+                'error' => sprintf(
+                    'RAM budget: %s in use + %s requested exceeds limit of %s (%d%%)',
+                    vmm_human_bytes($used),
+                    vmm_human_bytes($need),
+                    vmm_human_bytes($budget['limit']),
+                    $budget['pct']
+                ),
+            ];
+        }
+    }
+    if ($verb === 'destroy') {
+        if ($confirm !== $name) {
+            return ['ok' => false, 'error' => 'confirmation mismatch: type the vm name exactly'];
+        }
+    }
+    return ['ok' => true, 'state' => $state];
+}
+
+function vmm_job_path(string $id): string
+{
+    return VMM_JOBDIR . '/' . $id . '.json';
+}
+
+function vmm_job_write(array $job): void
+{
+    $job['updated'] = time();
+    $tmp = vmm_job_path($job['id']) . '.tmp';
+    file_put_contents($tmp, json_encode($job, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+    rename($tmp, vmm_job_path($job['id']));
+}
+
+function vmm_job_get(string $id): ?array
+{
+    if (!preg_match('/^[0-9]{8}-[0-9]{6}-[a-f0-9]{8}$/', $id)) {
+        return null;
+    }
+    $f = vmm_job_path($id);
+    if (!is_file($f)) {
+        return null;
+    }
+    $job = json_decode((string)file_get_contents($f), true);
+    return is_array($job) ? $job : null;
+}
+
+function vmm_job_list(int $limit = 50, string $vm = ''): array
+{
+    $files = glob(VMM_JOBDIR . '/*.json') ?: [];
+    rsort($files);
+    $out = [];
+    foreach ($files as $f) {
+        $job = json_decode((string)file_get_contents($f), true);
+        if (!is_array($job)) {
+            continue;
+        }
+        if ($vm !== '' && ($job['vm'] ?? '') !== $vm) {
+            continue;
+        }
+        $out[] = $job;
+        if (count($out) >= $limit) {
+            break;
+        }
+    }
+    return $out;
+}
+
+function vmm_job_log(string $id, int $maxBytes = 65536): string
+{
+    $f = VMM_JOBDIR . '/' . $id . '.log';
+    if (!is_file($f)) {
+        return '';
+    }
+    $size = filesize($f);
+    if ($size <= $maxBytes) {
+        return (string)file_get_contents($f);
+    }
+    $fh = fopen($f, 'rb');
+    fseek($fh, $maxBytes * -1, SEEK_END);
+    $data = (string)stream_get_contents($fh);
+    fclose($fh);
+    return "... (truncated)\n" . $data;
+}
+
+function vmm_job_new(string $verb, string $name): array
+{
+    vmm_ensure_state_dirs();
+    $id = date('Ymd-His') . '-' . bin2hex(random_bytes(4));
+    $job = [
+        'id'      => $id,
+        'verb'    => $verb,
+        'vm'      => $name,
+        'state'   => 'queued',
+        'created' => time(),
+        'started' => null,
+        'ended'   => null,
+        'pid'     => null,
+        'rc'      => null,
+        'error'   => '',
+        'by'      => (string)($_SERVER['REMOTE_ADDR'] ?? 'cli'),
+    ];
+    vmm_job_write($job);
+    @touch(VMM_JOBDIR . '/' . $id . '.log');
+
+    $php = PHP_BINARY !== '' ? PHP_BINARY : '/usr/local/bin/php';
+    $cmd = sprintf(
+        '/usr/bin/nohup %s %s %s > /dev/null 2>&1 &',
+        escapeshellarg($php),
+        escapeshellarg(VMM_ROOT . '/bin/vmm-jobd'),
+        escapeshellarg($id)
+    );
+    exec($cmd);
+    return $job;
+}
+
+function vmm_job_recover(): int
+{
+    $fixed = 0;
+    foreach (vmm_job_list(200) as $job) {
+        if (($job['state'] ?? '') !== 'running') {
+            continue;
+        }
+        $pid = (int)($job['pid'] ?? 0);
+        $alive = vmm_pid_alive($pid);
+        if (!$alive) {
+            $job['state'] = 'failed';
+            $job['error'] = 'interrupted (process gone)';
+            $job['ended'] = time();
+            vmm_job_write($job);
+            $fixed++;
+        }
+    }
+    return $fixed;
+}
+
+function vmm_pid_alive(int $pid): bool
+{
+    if ($pid <= 0) {
+        return false;
+    }
+    if (function_exists('posix_kill')) {
+        return @posix_kill($pid, 0);
+    }
+    exec('/bin/kill -0 ' . $pid . ' > /dev/null 2>&1', $o, $rc);
+    return $rc === 0;
+}
+
+function vmm_job_cancel(string $id): array
+{
+    $job = vmm_job_get($id);
+    if ($job === null) {
+        return ['ok' => false, 'error' => 'job not found'];
+    }
+    if (!in_array($job['state'], ['queued', 'running'], true)) {
+        return ['ok' => false, 'error' => 'job already finished'];
+    }
+    @touch(VMM_JOBDIR . '/' . $id . '.cancel');
+    return ['ok' => true, 'id' => $id];
+}
diff --git a/gui/ext/vmmngr/vmmngr.conf b/gui/ext/vmmngr/vmmngr.conf
index 0a83429..5c218c7 100644
--- a/gui/ext/vmmngr/vmmngr.conf
+++ b/gui/ext/vmmngr/vmmngr.conf
@@ -1,10 +1,11 @@
 {
     "appname": "VM Manager",
-    "version": "0.1.0-preview",
+    "version": "0.2.0",
     "rootfolder": "/mnt/Daten/extensions/vmmngr",
     "vm_source": "auto",
     "bridges": ["ix0bridge"],
     "default_bridge": "ix0bridge",
     "enable": true,
-    "job_timeout": 900
+    "job_timeout": 900,
+    "ram_budget_pct": 85
 }
diff --git a/gui/vmmngr-boot.inc b/gui/vmmngr-boot.inc
index 7e67e7f..2ac6baa 100644
--- a/gui/vmmngr-boot.inc
+++ b/gui/vmmngr-boot.inc
@@ -42,3 +42,36 @@ if (!function_exists('vmm_badge')) {
         return sprintf('%s %s', $icon, $p['source']);
     }
 }
+
+if (!function_exists('vmm_css')) {
+    /**
+     * Theme-aware styles: no hardcoded dark panels — colours derive from the
+     * XigmaNAS theme variables, so light and dark themes both stay readable.
+     */
+    function vmm_css(): void
+    {
+        ?>
+
+
+        Job ' + id + 'queued
';
+        poll(id, box);
+    };
+
+    window.vmmRun = function (verb, vm, confirmText) {
+        var payload = {action: 'action', verb: verb, vm: vm};
+        if (confirmText !== undefined && confirmText !== null) {
+            payload.confirm = confirmText;
+        }
+        post(payload).then(function (d) {
+            if (!d.ok) {
+                alert(d.error || 'action refused');
+                return;
+            }
+            vmmTrack(d.job.id);
+        }).catch(function (e) {
+            alert('request failed: ' + e);
+        });
+    };
+
+    window.vmmConfirmRun = function (verb, vm, question) {
+        if (!window.confirm(question)) { return; }
+        vmmRun(verb, vm);
+    };
+
+    window.vmmDestroy = function (vm) {
+        if (!window.confirm('Destroy ' + vm + '?\n\nAll disks and snapshots of this VM are deleted. This cannot be undone.')) {
+            return;
+        }
+        var typed = window.prompt('Type the VM name to confirm:', '');
+        if (typed === null) { return; }
+        if (typed !== vm) {
+            alert('Name does not match - nothing was done.');
+            return;
+        }
+        vmmRun('destroy', vm, typed);
+    };
+})();
diff --git a/gui/vmmngr.php b/gui/vmmngr.php
index 5ee55ab..f7a7bf9 100644
--- a/gui/vmmngr.php
+++ b/gui/vmmngr.php
@@ -1,6 +1,6 @@
  '', 'rev' => ''];
 $vm_dir = $vmprov['available'] ? vmm_vm_dir() : '';
+$budget = vmm_ram_budget();
 
 $running = array_values(array_filter($vms, static fn(array $v): bool => ($v['state'] ?? '') === 'running'));
 $mem_used = 0;
@@ -19,27 +20,17 @@ foreach ($running as $v) {
     $mem_used += vmm_size_to_bytes((string)($v['memory'] ?? '0'));
     $cpus += (int)($v['cpu'] ?? 0);
 }
+vmm_job_recover();
+$jobs = vmm_job_list(5);
 
 include 'fbegin.inc';
+vmm_css();
 ?>
-
 
 
- ' . gettext('Install vm-bhyve or run the installer with a bundled vendor tree.')); ?> +
@@ -51,7 +42,7 @@ include 'fbegin.inc';
-
vCPU
+
vCPU · (%)
@@ -65,16 +56,18 @@ include 'fbegin.inc';
+
+ - + + + + + - - - - - - + + - - + + @@ -97,8 +90,13 @@ include 'fbegin.inc'; + - + @@ -106,7 +104,15 @@ include 'fbegin.inc'; @@ -114,12 +120,51 @@ include 'fbegin.inc';
- + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
diff --git a/gui/vmmngr_api.php b/gui/vmmngr_api.php index 623d5d2..9e4a156 100644 --- a/gui/vmmngr_api.php +++ b/gui/vmmngr_api.php @@ -1,9 +1,12 @@ false, 'error' => 'forbidden'], 403); } +$method = strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? 'GET')); $action = (string)($_REQUEST['action'] ?? ''); -$name = (string)($_REQUEST['name'] ?? ''); +$name = (string)($_REQUEST['vm'] ?? $_REQUEST['name'] ?? ''); +$confirm = (string)($_REQUEST['confirm'] ?? ''); +$id = (string)($_REQUEST['id'] ?? ''); switch ($action) { case 'list': @@ -33,10 +39,43 @@ switch ($action) { // no break case 'selfcheck': - case '': vmm_json(['ok' => true, 'selfcheck' => vmm_selfcheck()]); // no break + case 'action': + if ($method !== 'POST') { + vmm_json(['ok' => false, 'error' => 'POST required'], 405); + } + $verb = (string)($_POST['verb'] ?? ''); + $check = vmm_action_check($verb, $name, $confirm); + if (!$check['ok']) { + vmm_json(['ok' => false, 'error' => $check['error']], 409); + } + $job = vmm_job_new($verb, $name); + vmm_json(['ok' => true, 'job' => $job], 202); + // no break + + case 'cancel': + if ($method !== 'POST') { + vmm_json(['ok' => false, 'error' => 'POST required'], 405); + } + $res = vmm_job_cancel($id); + vmm_json($res, $res['ok'] ? 200 : 409); + // no break + + case 'job': + $job = vmm_job_get($id); + if ($job === null) { + vmm_json(['ok' => false, 'error' => 'job not found'], 404); + } + $job['log'] = vmm_job_log($id); + vmm_json(['ok' => true, 'job' => $job]); + // no break + + case 'jobs': + vmm_json(['ok' => true, 'jobs' => vmm_job_list(30, $name)]); + // no break + default: vmm_json(['ok' => false, 'error' => 'unknown action'], 400); } diff --git a/gui/vmmngr_config.php b/gui/vmmngr_config.php index 02775da..7963c9f 100644 --- a/gui/vmmngr_config.php +++ b/gui/vmmngr_config.php @@ -11,12 +11,7 @@ $conf = vmm_config(); include 'fbegin.inc'; ?> - + + +
@@ -38,6 +33,8 @@ include 'fbegin.inc'; nmdm:
,
· (% )
diff --git a/gui/vmmngr_jobs.php b/gui/vmmngr_jobs.php new file mode 100644 index 0000000..41abed4 --- /dev/null +++ b/gui/vmmngr_jobs.php @@ -0,0 +1,89 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + +
—
+ + → + → (s) +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RC
+ +
+ diff --git a/gui/vmmngr_vm.php b/gui/vmmngr_vm.php index 6b9981e..d4786de 100644 --- a/gui/vmmngr_vm.php +++ b/gui/vmmngr_vm.php @@ -1,6 +1,6 @@ -
@@ -34,6 +27,8 @@ include 'fbegin.inc'; @@ -53,10 +48,27 @@ include 'fbegin.inc'; + + + +
vCPU · ()
UUID
+ + + + + + + + + + + + +
-
+
$blocks): ?> @@ -90,15 +102,43 @@ include 'fbegin.inc';
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
-
- -
-
diff --git a/version.txt b/version.txt index 2c31a29..0ea3a94 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.1.0-preview +0.2.0 diff --git a/vmm-init b/vmm-init index 84724eb..529c521 100644 --- a/vmm-init +++ b/vmm-init @@ -68,7 +68,7 @@ preflight() { *livecd*|*liveusb*) fail "live media is not supported for extensions (platform: ${platform})" ;; esac [ -d "${CWDIR}" ] || fail "install directory ${CWDIR} is missing" - mkdir -p "${CWDIR}/state" "${CWDIR}/log" "${CWDIR}/backup" "${CWDIR}/templates" + mkdir -p "${CWDIR}/state/jobs" "${CWDIR}/state/locks" "${CWDIR}/log" "${CWDIR}/backup" "${CWDIR}/templates" free_kb=$(df -k "${CWDIR}" | awk 'NR==2 {print $4}') if [ -n "${free_kb}" ] && [ "${free_kb}" -lt 1048576 ]; then @@ -133,7 +133,7 @@ do_symlinks() { mkdir -p "${WWWEXT}" link_force "${CONFDIR}" "${WWWEXT}/${APPNAME}" - for f in "${CWDIR}"/gui/*.php "${CWDIR}"/gui/*.inc; do + for f in "${CWDIR}"/gui/*.php "${CWDIR}"/gui/*.inc "${CWDIR}"/gui/*.js "${CWDIR}"/gui/*.css; do [ -e "${f}" ] || continue link_force "${f}" "${WWW}/$(basename "${f}")" done @@ -187,7 +187,7 @@ set_permissions() { find "${CWDIR}/bin" -type f -exec chmod 0555 {} \; 2>/dev/null find "${CWDIR}/gui" -type f \( -name '*.php' -o -name '*.inc' \) -exec chmod 0644 {} \; 2>/dev/null find "${CWDIR}/gui" -type f \( -name '*.js' -o -name '*.css' \) -exec chmod 0644 {} \; 2>/dev/null - chmod 0750 "${CWDIR}/state" "${CWDIR}/log" "${CWDIR}/backup" 2>/dev/null + chmod 0750 "${CWDIR}/state" "${CWDIR}/state/jobs" "${CWDIR}/state/locks" "${CWDIR}/log" "${CWDIR}/backup" 2>/dev/null } selfcheck() { @@ -264,7 +264,7 @@ cmd_remove() { fi banner "uninstall" rm -f "${WWWEXT}/${APPNAME}" - for f in "${CWDIR}"/gui/*.php "${CWDIR}"/gui/*.inc; do + for f in "${CWDIR}"/gui/*.php "${CWDIR}"/gui/*.inc "${CWDIR}"/gui/*.js "${CWDIR}"/gui/*.css; do [ -e "${f}" ] || continue lnk="${WWW}/$(basename "${f}")" if [ -L "${lnk}" ] && [ "$(readlink "${lnk}")" = "${f}" ]; then