use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file);
use PVE::HA::Resources;
-PVE::HA::Groups->register();
-
-PVE::HA::Groups->init();
-
my $manager_status_filename = "ha/manager_status";
my $ha_groups_config = "ha/groups.cfg";
my $ha_resources_config = "ha/resources.cfg";
my $crm_commands_filename = "ha/crm_commands";
my $ha_fence_config = "ha/fence.cfg";
-cfs_register_file($crm_commands_filename,
+cfs_register_file($crm_commands_filename,
sub { my ($fn, $raw) = @_; return defined($raw) ? $raw : ''; },
sub { my ($fn, $raw) = @_; return $raw; });
-cfs_register_file($ha_groups_config,
+cfs_register_file($ha_groups_config,
sub { PVE::HA::Groups->parse_config(@_); },
sub { PVE::HA::Groups->write_config(@_); });
-cfs_register_file($ha_resources_config,
+cfs_register_file($ha_resources_config,
sub { PVE::HA::Resources->parse_config(@_); },
sub { PVE::HA::Resources->write_config(@_); });
-cfs_register_file($manager_status_filename,
- \&json_reader,
+cfs_register_file($manager_status_filename,
+ \&json_reader,
\&json_writer);
cfs_register_file($ha_fence_config,
\&PVE::HA::FenceConfig::parse_config,
sub json_reader {
my ($filename, $data) = @_;
- return defined($data) ? decode_json($data) : {};
+ return defined($data) && length($data) > 0 ? decode_json($data) : {};
}
sub json_writer {
die "undefined node" if !defined($node);
- my $filename = "/etc/pve/nodes/$node/lrm_status";
+ my $cfs_path = "nodes/$node/lrm_status";
+
+ my $raw = PVE::Cluster::get_config($cfs_path);
+ if (!defined($raw)) {
+ # ENOENT -> possible deleted node, don't die here as it breaks our node
+ # 'gone' logic
+ warn "unable to read file '/etc/pve/$cfs_path'\n";
+ # unkown mode set explicitly as 'active' is assumed as default..
+ return { mode => 'unknown' } if ! -e "/etc/pve/$cfs_path";
+ }
- return PVE::HA::Tools::read_json_from_file($filename, {});
+ return json_reader(undef, $raw);
}
sub write_lrm_status {
my $filename = "/etc/pve/nodes/$node/lrm_status";
- PVE::HA::Tools::write_json_to_file($filename, $status_obj);
+ PVE::HA::Tools::write_json_to_file($filename, $status_obj);
}
sub parse_groups_config {
sub parse_resources_config {
my ($filename, $raw) = @_;
-
+
return PVE::HA::Resources->parse_config($filename, $raw);
}
return cfs_read_file($ha_resources_config);
}
+# checks if resource exists and sets defaults for unset values
+sub read_and_check_resources_config {
+
+ my $res = cfs_read_file($ha_resources_config);
+
+ my $vmlist = PVE::Cluster::get_vmlist();
+ my $conf = {};
+
+ foreach my $sid (keys %{$res->{ids}}) {
+ my $d = $res->{ids}->{$sid};
+ my (undef, undef, $name) = parse_sid($sid);
+ $d->{state} = 'started' if !defined($d->{state});
+ $d->{state} = 'started' if $d->{state} eq 'enabled'; # backward compatibility
+ $d->{max_restart} = 1 if !defined($d->{max_restart});
+ $d->{max_relocate} = 1 if !defined($d->{max_relocate});
+ if (PVE::HA::Resources->lookup($d->{type})) {
+ if (my $vmd = $vmlist->{ids}->{$name}) {
+ $d->{node} = $vmd->{node};
+ $conf->{$sid} = $d;
+ } else {
+ if (defined($d->{node})) {
+ $conf->{$sid} = $d;
+ } else {
+ warn "service '$sid' without node\n";
+ }
+ }
+ }
+ }
+
+ return $conf;
+}
+
+sub update_resources_config {
+ my ($sid, $param, $delete, $digest) = @_;
+
+ lock_ha_domain(
+ sub {
+ my $cfg = read_resources_config();
+ ($sid, my $type, my $name) = parse_sid($sid);
+
+ PVE::SectionConfig::assert_if_modified($cfg, $digest);
+
+ my $scfg = $cfg->{ids}->{$sid} ||
+ die "no such resource '$sid'\n";
+
+ my $plugin = PVE::HA::Resources->lookup($scfg->{type});
+ my $opts = $plugin->check_config($sid, $param, 0, 1);
+
+ foreach my $k (%$opts) {
+ $scfg->{$k} = $opts->{$k};
+ }
+
+ if ($delete) {
+ my $options = $plugin->private()->{options}->{$type};
+ foreach my $k (PVE::Tools::split_list($delete)) {
+ my $d = $options->{$k} ||
+ die "no such option '$k'\n";
+ die "unable to delete required option '$k'\n"
+ if !$d->{optional};
+ die "unable to delete fixed option '$k'\n"
+ if $d->{fixed};
+ delete $scfg->{$k};
+ }
+ }
+
+ write_resources_config($cfg);
+ }, "update resources config failed");
+}
+
+sub parse_sid {
+ my ($sid) = @_;
+
+ my ($type, $name);
+
+ if ($sid =~ m/^(\d+)$/) {
+ $name = $1;
+
+ my $vmlist = PVE::Cluster::get_vmlist();
+ if (defined($vmlist->{ids}->{$name})) {
+ my $vm_type = $vmlist->{ids}->{$name}->{type};
+ if ($vm_type eq 'lxc') {
+ $type = 'ct';
+ } elsif ($vm_type eq 'qemu') {
+ $type = 'vm';
+ } else {
+ die "internal error";
+ }
+ $sid = "$type:$name";
+ }
+ else {
+ die "unable do add resource - VM/CT $1 does not exist\n";
+ }
+ } elsif ($sid =~m/^(\S+):(\S+)$/) {
+ $name = $2;
+ $type = $1;
+ } else {
+ die "unable to parse service id '$sid'\n";
+ }
+
+ return wantarray ? ($sid, $type, $name) : $sid;
+}
+
sub read_group_config {
return cfs_read_file($ha_groups_config);
cfs_read_file($ha_fence_config);
}
+sub write_fence_config {
+ my ($cfg) = @_;
+
+ cfs_write_file($ha_fence_config, $cfg);
+}
+
sub lock_ha_domain {
my ($code, $errmsg) = @_;
return lock_ha_domain($code);
}
-my $servive_check_ha_state = sub {
+my $service_check_ha_state = sub {
my ($conf, $sid, $has_state) = @_;
if (my $d = $conf->{ids}->{$sid}) {
- return 1 if !defined($has_state);
+ if (!defined($has_state)) {
+ # ignored service behave as if they were not managed by HA
+ return 0 if defined($d->{state}) && $d->{state} eq 'ignored';
+ return 1;
+ }
+
+ # backward compatibility
+ $has_state = 'started' if $has_state eq 'enabled';
+
+ $d->{state} = 'started' if !defined($d->{state}) ||
+ ($d->{state} eq 'enabled');
- $d->{state} = 'enabled' if !defined($d->{state});
return 1 if $d->{state} eq $has_state;
}
my $types = PVE::HA::Resources->lookup_types();
foreach my $type ('vm', 'ct') {
- return 1 if &$servive_check_ha_state($conf, "$type:$vmid", $has_state);
+ return 1 if &$service_check_ha_state($conf, "$type:$vmid", $has_state);
}
return undef;
my $conf = cfs_read_file($ha_resources_config);
- return 1 if &$servive_check_ha_state($conf, $sid, $has_state);
+ return 1 if &$service_check_ha_state($conf, $sid, $has_state);
die "resource '$sid' is not HA managed\n" if !$noerr;
return undef;
}
+
+sub get_service_status {
+ my ($sid) = @_;
+
+ my $status = { managed => 0 };
+
+ my $conf = cfs_read_file($ha_resources_config);
+
+ if (&$service_check_ha_state($conf, $sid)) {
+ my $manager_status = cfs_read_file($manager_status_filename);
+
+ $status->{managed} = 1;
+ $status->{group} = $conf->{ids}->{$sid}->{group};
+ $status->{state} = $manager_status->{service_status}->{$sid}->{state};
+ }
+
+ return $status;
+}
+
1;
projects / pve-ha-manager.git / blobdiff