On 11/27/19 9:24 AM, Fabian Grünbichler wrote:
> On November 25, 2019 7:56 pm, Thomas Lamprecht wrote:
>> Signed-off-by: Thomas Lamprecht <t.lampre...@proxmox.com>
>> ---
>>
>> Mostly just line-wrapping, as:
>> # git show --word-diff=color --word-diff-regex=.
>> tells you. Sorry, to lazy to split that up :)
>>
>> data/PVE/DataCenterConfig.pm | 17 ++++++++++++++---
>> 1 file changed, 14 insertions(+), 3 deletions(-)
>>
>> diff --git a/data/PVE/DataCenterConfig.pm b/data/PVE/DataCenterConfig.pm
>> index 77cc73c..2f2dedf 100644
>> --- a/data/PVE/DataCenterConfig.pm
>> +++ b/data/PVE/DataCenterConfig.pm
>> @@ -28,9 +28,20 @@ my $migration_format = {
>> my $ha_format = {
>> shutdown_policy => {
>> type => 'string',
>> - enum => ['freeze', 'failover', 'conditional'],
>> - description => "The policy for HA services on node shutdown. 'freeze'
>> disables auto-recovery, 'failover' ensures recovery, 'conditional' recovers
>> on poweroff and freezes on reboot. Running HA Services will always get
>> stopped first on shutdown.",
>> - verbose_description => "Describes the policy for handling HA services
>> on poweroff or reboot of a node. Freeze will always freeze services which
>> are still located on the node on shutdown, those services won't be recovered
>> by the HA manager. Failover will not mark the services as frozen and thus
>> the services will get recovered to other nodes, if the shutdown node does
>> not come up again quickly (< 1min). 'conditional' chooses automatically
>> depending on the type of shutdown, i.e., on a reboot the service will be
>> frozen but on a poweroff the service will stay as is, and thus get recovered
>> after about 2 minutes.",
>> + enum => ['freeze', 'failover', 'conditional', 'migrate'],
>> + description => "The policy for HA services on node shutdown. 'freeze'
>> disables ".
>> + "auto-recovery, 'failover' ensures recovery, 'conditional' recovers
>> on ".
>> + "poweroff and freezes on reboot. 'migrate' will migrate running
>> services ".
>> + "to other nodes, if possible. With 'freeze' or 'failover', HA
>> Services will ".
>> + "always get stopped first on shutdown.",
>> + verbose_description => "Describes the policy for handling HA services
>> on poweroff ".
>> + "or reboot of a node. Freeze will always freeze services which are
>> still located ".
>> + "on the node on shutdown, those services won't be recovered by the
>> HA manager. ".
>> + "Failover will not mark the services as frozen and thus the
>> services will get ".
>> + "recovered to other nodes, if the shutdown node does not come up
>> again quickly ".
>> + "(< 1min). 'conditional' chooses automatically depending on the
>> type of shutdown, ".
>> + "i.e., on a reboot the service will be frozen but on a poweroff the
>> service will ".
>> + "stay as is, and thus get recovered after about 2 minutes.",
>
> nit: migrate is missing in the verbose_description string, and thus also
> in 'man datacenter.cfg'
>
Yeah, was to lazy when doing the POC (where I added above) and forogt
when I applied it a month later :) Will fix.
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
