From: Hannes Laimer <h.laimer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-guest-common 2/3] jobs: move VZDump plugin from pve-manager
Date: Tue, 22 Mar 2022 07:34:11 +0000 [thread overview]
Message-ID: <20220322073412.30562-3-h.laimer@proxmox.com> (raw)
In-Reply-To: <20220322073412.30562-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
src/Makefile | 4 +
src/PVE/Jobs.pm | 282 +++++++++++++++++++++++++++++++++++++++++
src/PVE/Jobs/VZDump.pm | 87 +++++++++++++
3 files changed, 373 insertions(+)
create mode 100644 src/PVE/Jobs.pm
create mode 100644 src/PVE/Jobs/VZDump.pm
diff --git a/src/Makefile b/src/Makefile
index baa2688..853b562 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,6 +9,7 @@ install: PVE
install -m 0644 PVE/GuestHelpers.pm ${PERL5DIR}/PVE/
install -m 0644 PVE/AbstractConfig.pm ${PERL5DIR}/PVE/
install -m 0644 PVE/AbstractMigrate.pm ${PERL5DIR}/PVE/
+ install -m 0644 PVE/Jobs.pm ${PERL5DIR}/PVE/
install -m 0644 PVE/ReplicationConfig.pm ${PERL5DIR}/PVE/
install -m 0644 PVE/ReplicationState.pm ${PERL5DIR}/PVE/
install -m 0644 PVE/Replication.pm ${PERL5DIR}/PVE/
@@ -17,6 +18,9 @@ install: PVE
install -d ${PERL5DIR}/PVE/VZDump
install -m 0644 PVE/VZDump/Plugin.pm ${PERL5DIR}/PVE/VZDump/
install -m 0644 PVE/VZDump/Common.pm ${PERL5DIR}/PVE/VZDump/
+ install -d ${PERL5DIR}/PVE/Jobs
+ install -m 0644 PVE/Jobs/VZDump.pm ${PERL5DIR}/PVE/Jobs/
+
.PHONY: check
check:
diff --git a/src/PVE/Jobs.pm b/src/PVE/Jobs.pm
new file mode 100644
index 0000000..ba3685e
--- /dev/null
+++ b/src/PVE/Jobs.pm
@@ -0,0 +1,282 @@
+package PVE::Jobs;
+
+use strict;
+use warnings;
+use JSON;
+
+use PVE::Cluster qw(cfs_read_file cfs_lock_file);
+use PVE::Jobs::Plugin;
+use PVE::Jobs::VZDump;
+use PVE::Tools;
+
+PVE::Jobs::VZDump->register();
+PVE::Jobs::Plugin->init();
+
+my $state_dir = "/var/lib/pve-manager/jobs";
+my $lock_dir = "/var/lock/pve-manager";
+
+my $get_state_file = sub {
+ my ($jobid, $type) = @_;
+ return "$state_dir/$type-$jobid.json";
+};
+
+my $default_state = {
+ state => 'created',
+ time => 0,
+};
+
+# lockless, since we use file_get_contents, which is atomic
+sub read_job_state {
+ my ($jobid, $type) = @_;
+ my $path = $get_state_file->($jobid, $type);
+ return if ! -e $path;
+
+ my $raw = PVE::Tools::file_get_contents($path);
+
+ return $default_state if $raw eq '';
+
+ # untaint $raw
+ if ($raw =~ m/^(\{.*\})$/) {
+ return decode_json($1);
+ }
+
+ die "invalid json data in '$path'\n";
+}
+
+sub lock_job_state {
+ my ($jobid, $type, $sub) = @_;
+
+ my $filename = "$lock_dir/$type-$jobid.lck";
+
+ my $res = PVE::Tools::lock_file($filename, 10, $sub);
+ die $@ if $@;
+
+ return $res;
+}
+
+my $get_job_task_status = sub {
+ my ($state) = @_;
+
+ if (!defined($state->{upid})) {
+ return; # not started
+ }
+
+ my ($task, $filename) = PVE::Tools::upid_decode($state->{upid}, 1);
+ die "unable to parse worker upid - $state->{upid}\n" if !$task;
+ die "no such task\n" if ! -f $filename;
+
+ my $pstart = PVE::ProcFSTools::read_proc_starttime($task->{pid});
+ if ($pstart && $pstart == $task->{pstart}) {
+ return; # still running
+ }
+
+ return PVE::Tools::upid_read_status($state->{upid});
+};
+
+# checks if the job is already finished if it was started before and
+# updates the statefile accordingly
+sub update_job_stopped {
+ my ($jobid, $type) = @_;
+
+ # first check unlocked to save time,
+ my $state = read_job_state($jobid, $type);
+ return if !defined($state) || $state->{state} ne 'started'; # removed or not started
+
+ if (defined($get_job_task_status->($state))) {
+ lock_job_state($jobid, $type, sub {
+ my $state = read_job_state($jobid, $type);
+ return if !defined($state) || $state->{state} ne 'started'; # removed or not started
+
+ my $new_state = {
+ state => 'stopped',
+ msg => $get_job_task_status->($state) // 'internal error',
+ upid => $state->{upid},
+ };
+
+ if ($state->{updated}) { # save updated time stamp
+ $new_state->{updated} = $state->{updated};
+ }
+
+ my $path = $get_state_file->($jobid, $type);
+ PVE::Tools::file_set_contents($path, encode_json($new_state));
+ });
+ }
+}
+
+# must be called when the job is first created
+sub create_job {
+ my ($jobid, $type) = @_;
+
+ lock_job_state($jobid, $type, sub {
+ my $state = read_job_state($jobid, $type) // $default_state;
+
+ if ($state->{state} ne 'created') {
+ die "job state already exists\n";
+ }
+
+ $state->{time} = time();
+
+ my $path = $get_state_file->($jobid, $type);
+ PVE::Tools::file_set_contents($path, encode_json($state));
+ });
+}
+
+# to be called when the job is removed
+sub remove_job {
+ my ($jobid, $type) = @_;
+ my $path = $get_state_file->($jobid, $type);
+ unlink $path;
+}
+
+# checks if the job can be started and sets the state to 'starting'
+# returns 1 if the job can be started, 0 otherwise
+sub starting_job {
+ my ($jobid, $type) = @_;
+
+ # first check unlocked to save time
+ my $state = read_job_state($jobid, $type);
+ return 0 if !defined($state) || $state->{state} eq 'started'; # removed or already started
+
+ lock_job_state($jobid, $type, sub {
+ my $state = read_job_state($jobid, $type);
+ return 0 if !defined($state) || $state->{state} eq 'started'; # removed or already started
+
+ my $new_state = {
+ state => 'starting',
+ time => time(),
+ };
+
+ my $path = $get_state_file->($jobid, $type);
+ PVE::Tools::file_set_contents($path, encode_json($new_state));
+ });
+ return 1;
+}
+
+sub started_job {
+ my ($jobid, $type, $upid, $msg) = @_;
+
+ lock_job_state($jobid, $type, sub {
+ my $state = read_job_state($jobid, $type);
+ return if !defined($state); # job was removed, do not update
+ die "unexpected state '$state->{state}'\n" if $state->{state} ne 'starting';
+
+ my $new_state;
+ if (defined($msg)) {
+ $new_state = {
+ state => 'stopped',
+ msg => $msg,
+ time => time(),
+ };
+ } else {
+ $new_state = {
+ state => 'started',
+ upid => $upid,
+ };
+ }
+
+ my $path = $get_state_file->($jobid, $type);
+ PVE::Tools::file_set_contents($path, encode_json($new_state));
+ });
+}
+
+# will be called when the job schedule is updated
+sub updated_job_schedule {
+ my ($jobid, $type) = @_;
+ lock_job_state($jobid, $type, sub {
+ my $old_state = read_job_state($jobid, $type) // $default_state;
+
+ $old_state->{updated} = time();
+
+ my $path = $get_state_file->($jobid, $type);
+ PVE::Tools::file_set_contents($path, encode_json($old_state));
+ });
+}
+
+sub get_last_runtime {
+ my ($jobid, $type) = @_;
+
+ my $state = read_job_state($jobid, $type) // $default_state;
+
+ return $state->{updated} if defined($state->{updated});
+
+ if (my $upid = $state->{upid}) {
+ my ($task) = PVE::Tools::upid_decode($upid, 1);
+ die "unable to parse worker upid\n" if !$task;
+ return $task->{starttime};
+ }
+
+ return $state->{time} // 0;
+}
+
+sub run_jobs {
+ synchronize_job_states_with_config();
+
+ my $jobs_cfg = cfs_read_file('jobs.cfg');
+ my $nodename = PVE::INotify::nodename();
+
+ foreach my $id (sort keys %{$jobs_cfg->{ids}}) {
+ my $cfg = $jobs_cfg->{ids}->{$id};
+ my $type = $cfg->{type};
+ my $schedule = delete $cfg->{schedule};
+
+ # only schedule local jobs
+ next if defined($cfg->{node}) && $cfg->{node} ne $nodename;
+
+ eval { update_job_stopped($id, $type) };
+ if (my $err = $@) {
+ warn "could not update job state, skipping - $err\n";
+ next;
+ }
+
+ next if defined($cfg->{enabled}) && !$cfg->{enabled}; # only schedule actually enabled jobs
+
+ my $last_run = get_last_runtime($id, $type);
+ my $calspec = PVE::CalendarEvent::parse_calendar_event($schedule);
+ my $next_sync = PVE::CalendarEvent::compute_next_event($calspec, $last_run) // 0;
+
+ next if time() < $next_sync; # not yet its (next) turn
+
+ my $plugin = PVE::Jobs::Plugin->lookup($type);
+ if (starting_job($id, $type)) {
+ my $upid = eval { $plugin->run($cfg) };
+ if (my $err = $@) {
+ warn $@ if $@;
+ started_job($id, $type, undef, $err);
+ } elsif ($upid eq 'OK') { # some jobs return OK immediately
+ started_job($id, $type, undef, 'OK');
+ } else {
+ started_job($id, $type, $upid);
+ }
+ }
+ }
+}
+
+# creates and removes statefiles for job configs
+sub synchronize_job_states_with_config {
+ cfs_lock_file('jobs.cfg', undef, sub {
+ my $data = cfs_read_file('jobs.cfg');
+
+ for my $id (keys $data->{ids}->%*) {
+ my $job = $data->{ids}->{$id};
+ my $type = $job->{type};
+ my $jobstate = read_job_state($id, $type);
+ create_job($id, $type) if !defined($jobstate);
+ }
+
+ PVE::Tools::dir_glob_foreach($state_dir, '(.*?)-(.*).json', sub {
+ my ($path, $type, $id) = @_;
+
+ if (!defined($data->{ids}->{$id})) {
+ remove_job($id, $type);
+ }
+ });
+ });
+ die $@ if $@;
+}
+
+sub setup_dirs {
+ mkdir $state_dir;
+ mkdir $lock_dir;
+}
+
+1;
diff --git a/src/PVE/Jobs/VZDump.pm b/src/PVE/Jobs/VZDump.pm
new file mode 100644
index 0000000..44fe33d
--- /dev/null
+++ b/src/PVE/Jobs/VZDump.pm
@@ -0,0 +1,87 @@
+package PVE::Jobs::VZDump;
+
+use strict;
+use warnings;
+
+use PVE::INotify;
+use PVE::VZDump::Common;
+use PVE::API2::VZDump;
+use PVE::Cluster;
+use PVE::JSONSchema;
+
+use base qw(PVE::Jobs::Plugin);
+
+sub type {
+ return 'vzdump';
+}
+
+my $props = PVE::VZDump::Common::json_config_properties();
+
+sub properties {
+ return $props;
+}
+
+sub options {
+ my $options = {
+ enabled => { optional => 1 },
+ schedule => {},
+ comment => { optional => 1 },
+ };
+ foreach my $opt (keys %$props) {
+ if ($props->{$opt}->{optional}) {
+ $options->{$opt} = { optional => 1 };
+ } else {
+ $options->{$opt} = {};
+ }
+ }
+
+ return $options;
+}
+
+sub decode_value {
+ my ($class, $type, $key, $value) = @_;
+
+ if ($key eq 'prune-backups' && !ref($value)) {
+ $value = PVE::JSONSchema::parse_property_string(
+ 'prune-backups',
+ $value,
+ );
+ }
+
+ return $value;
+}
+
+sub encode_value {
+ my ($class, $type, $key, $value) = @_;
+
+ if ($key eq 'prune-backups' && ref($value) eq 'HASH') {
+ $value = PVE::JSONSchema::print_property_string(
+ $value,
+ 'prune-backups',
+ );
+ }
+
+ return $value;
+}
+
+sub run {
+ my ($class, $conf) = @_;
+
+ # remove all non vzdump related options
+ foreach my $opt (keys %$conf) {
+ delete $conf->{$opt} if !defined($props->{$opt});
+ }
+
+ my $retention = $conf->{'prune-backups'};
+ if ($retention && ref($retention) eq 'HASH') { # fixup, its required as string parameter
+ $conf->{'prune-backups'} = PVE::JSONSchema::print_property_string($retention, 'prune-backups');
+ }
+
+ $conf->{quiet} = 1; # do not write to stdout/stderr
+
+ PVE::Cluster::cfs_update(); # refresh vmlist
+
+ return PVE::API2::VZDump->vzdump($conf);
+}
+
+1;
--
2.30.2
next prev parent reply other threads:[~2022-03-22 7:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 7:34 [pve-devel] [PATCH-SERIES] move jobs " Hannes Laimer
2022-03-22 7:34 ` [pve-devel] [PATCH pve-cluster 1/3] jobs: move base plugin " Hannes Laimer
[not found] ` <<20220322073412.30562-2-h.laimer@proxmox.com>
2022-04-08 7:40 ` Fabian Grünbichler
2022-03-22 7:34 ` Hannes Laimer [this message]
2022-04-08 7:40 ` [pve-devel] [PATCH pve-guest-common 2/3] jobs: move VZDump " Fabian Grünbichler
2022-03-22 7:34 ` [pve-devel] [PATCH pve-manager 3/3] jobs: move to pve-cluster and pve-guest-common Hannes Laimer
2022-04-08 7:44 ` [pve-devel] [PATCH-SERIES] move jobs from pve-manager Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220322073412.30562-3-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.