renamed Server to CRM

diff --git a/PVE/HA/CRM.pm b/PVE/HA/CRM.pm
new file mode 100644 (file)
index 0000000..3335daf
--- /dev/null
+++ b/PVE/HA/CRM.pm
@@ -0,0 +1,221 @@
+package PVE::HA::CRM;
+
+# Cluster Resource Manager
+
+use strict;
+use warnings;
+
+use PVE::SafeSyslog;
+use PVE::Tools;
+
+use PVE::HA::Manager;
+
+# Server can have several state:
+#
+# wait_for_quorum: cluster is not quorate, waiting
+# recover: fixme?
+# master:
+# slave:
+# lost_quorum:
+# error:
+# halt:
+
+my $valid_states = {
+    wait_for_quorum => 1,
+    recover => 1,
+    master => 1,
+    slave => 1,
+    lost_quorum => 1,
+    error => 1,
+    halt => 1,
+};
+
+sub new {
+    my ($this, $haenv) = @_;
+
+    my $class = ref($this) || $this;
+
+    my $self = bless {
+       haenv => $haenv,
+       manager => undef,
+    }, $class;
+
+    $self->{status} = $haenv->read_local_status() || 'wait_for_quorum';
+    # can happen after crash?
+    if ($self->{status} eq 'master') {
+       $self->set_local_status('recover');
+    } else {
+       $self->set_local_status('wait_for_quorum');   
+    }
+    
+    return $self;
+}
+
+sub get_local_status {
+    my ($self) = @_;
+
+    return $self->{status};
+}
+
+sub set_local_status {
+    my ($self, $new_status) = @_;
+
+    die "invalid state '$new_status'" 
+       if !$valid_states->{$new_status};
+
+    my $haenv = $self->{haenv};
+
+    my $status = $self->{status};
+
+    return if $status eq $new_status;
+
+    $haenv->log('info', "manager status change $status => $new_status");
+
+    $status = $new_status;
+
+    $haenv->write_local_status($status);
+
+    $self->{status} = $status;
+
+    if ($status eq 'master') {
+       $self->{manager} = PVE::HA::Manager->new($haenv);
+    } else {
+       if ($self->{manager}) {
+           # fixme: what should we do here?
+           $self->{manager}->cleanup();
+           $self->{manager} = undef;
+       }
+    }
+}
+
+sub get_manager_locks {
+    my ($self) = @_;
+
+    my $haenv = $self->{haenv};
+
+    my $count = 0;
+    my $agent_lock = 0;
+    my $manager_lock = 0;
+
+    for (;;) {
+
+       if (!$manager_lock) {
+           if ($manager_lock = $haenv->get_ha_manager_lock()) {
+               if ($self->{ha_manager_wd}) {
+                   $haenv->watchdog_update($self->{ha_manager_wd});
+               } else {
+                   my $wfh = $haenv->watchdog_open();
+                   $self->{ha_manager_wd} = $wfh;
+               }
+           }
+       }
+
+       if (!$agent_lock) {
+           if ($agent_lock = $haenv->get_ha_agent_lock()) {
+               if ($self->{ha_agent_wd}) {
+                   $haenv->watchdog_update($self->{ha_agent_wd});
+               } else {
+                   my $wfh = $haenv->watchdog_open();
+                   $self->{ha_agent_wd} = $wfh;
+               }
+           }
+       }
+           
+       last if ++$count > 5;
+
+       last if $manager_lock && $agent_lock;
+
+       $haenv->sleep(1);
+    }
+
+    return 1 if $manager_lock;
+
+    return 0;
+}
+
+sub do_one_iteration {
+    my ($self) = @_;
+
+    my $haenv = $self->{haenv};
+
+    my $status = $self->get_local_status();
+
+    if ($status eq 'recover') {
+
+       $haenv->log('info', "waiting for 5 seconds");
+
+       $haenv->sleep(5);
+
+       $self->set_local_status('wait_for_quorum');
+
+    } elsif ($status eq 'wait_for_quorum') {
+
+       $haenv->sleep(5);
+          
+       if ($haenv->quorate()) {
+           if ($self->get_manager_locks()) {
+               $self->set_local_status('master');
+           } else {
+               $self->set_local_status('slave');
+           }
+       }
+
+    } elsif ($status eq 'master') {
+
+       my $manager = $self->{manager};
+
+       die "no manager" if !defined($manager);
+
+       my $startime = $haenv->get_time();
+
+       my $max_time = 10;
+
+       # do work (max_time seconds)
+       eval {
+           # fixme: set alert timer
+           $manager->manage();
+       };
+       if (my $err = $@) {
+
+           # fixme: cleanup?
+           $haenv->log('err', "got unexpected error - $err");
+           $self->set_local_status('error');
+
+       } else {
+           $haenv->sleep_until($startime + $max_time);
+       }
+
+       if (!$self->get_manager_locks()) {
+           if ($haenv->quorate()) {
+               $self->set_local_status('slave');
+           } else {
+               $self->set_local_status('wait_for_quorum');
+               # set_local_status('lost_quorum');
+           }
+       }
+    } elsif ($status eq 'slave') {
+
+       $haenv->sleep(5);
+
+       if ($haenv->quorate()) {
+           if ($self->get_manager_locks()) {
+               $self->set_local_status('master');
+           }
+       } else {
+           $self->set_local_status('wait_for_quorum');
+       }
+
+    } elsif ($status eq 'error') {
+       die "stopping due to errors\n";
+    } elsif ($status eq 'lost_quorum') {
+       die "lost_quorum\n";
+    } elsif ($status eq 'halt') {
+       die "halt\n";
+    } else {
+       die "got unexpected status '$status'\n";
+    }
+
+    return 1;
+}
+
+1;

diff --git a/PVE/HA/Server.pm b/PVE/HA/Server.pm
deleted file mode 100644 (file)
index 3ccd536..0000000
--- a/PVE/HA/Server.pm
+++ /dev/null
@@ -1,219 +0,0 @@
-package PVE::HA::Server;
-
-use strict;
-use warnings;
-
-use PVE::SafeSyslog;
-use PVE::Tools;
-
-use PVE::HA::Manager;
-
-# Server can have several state:
-#
-# wait_for_quorum: cluster is not quorate, waiting
-# recover: fixme?
-# master:
-# slave:
-# lost_quorum:
-# error:
-# halt:
-
-my $valid_states = {
-    wait_for_quorum => 1,
-    recover => 1,
-    master => 1,
-    slave => 1,
-    lost_quorum => 1,
-    error => 1,
-    halt => 1,
-};
-
-sub new {
-    my ($this, $haenv) = @_;
-
-    my $class = ref($this) || $this;
-
-    my $self = bless {
-       haenv => $haenv,
-       manager => undef,
-    }, $class;
-
-    $self->{status} = $haenv->read_local_status() || 'wait_for_quorum';
-    # can happen after crash?
-    if ($self->{status} eq 'master') {
-       $self->set_local_status('recover');
-    } else {
-       $self->set_local_status('wait_for_quorum');   
-    }
-    
-    return $self;
-}
-
-sub get_local_status {
-    my ($self) = @_;
-
-    return $self->{status};
-}
-
-sub set_local_status {
-    my ($self, $new_status) = @_;
-
-    die "invalid state '$new_status'" 
-       if !$valid_states->{$new_status};
-
-    my $haenv = $self->{haenv};
-
-    my $status = $self->{status};
-
-    return if $status eq $new_status;
-
-    $haenv->log('info', "manager status change $status => $new_status");
-
-    $status = $new_status;
-
-    $haenv->write_local_status($status);
-
-    $self->{status} = $status;
-
-    if ($status eq 'master') {
-       $self->{manager} = PVE::HA::Manager->new($haenv);
-    } else {
-       if ($self->{manager}) {
-           # fixme: what should we do here?
-           $self->{manager}->cleanup();
-           $self->{manager} = undef;
-       }
-    }
-}
-
-sub get_manager_locks {
-    my ($self) = @_;
-
-    my $haenv = $self->{haenv};
-
-    my $count = 0;
-    my $agent_lock = 0;
-    my $manager_lock = 0;
-
-    for (;;) {
-
-       if (!$manager_lock) {
-           if ($manager_lock = $haenv->get_ha_manager_lock()) {
-               if ($self->{ha_manager_wd}) {
-                   $haenv->watchdog_update($self->{ha_manager_wd});
-               } else {
-                   my $wfh = $haenv->watchdog_open();
-                   $self->{ha_manager_wd} = $wfh;
-               }
-           }
-       }
-
-       if (!$agent_lock) {
-           if ($agent_lock = $haenv->get_ha_agent_lock()) {
-               if ($self->{ha_agent_wd}) {
-                   $haenv->watchdog_update($self->{ha_agent_wd});
-               } else {
-                   my $wfh = $haenv->watchdog_open();
-                   $self->{ha_agent_wd} = $wfh;
-               }
-           }
-       }
-           
-       last if ++$count > 5;
-
-       last if $manager_lock && $agent_lock;
-
-       $haenv->sleep(1);
-    }
-
-    return 1 if $manager_lock;
-
-    return 0;
-}
-
-sub do_one_iteration {
-    my ($self) = @_;
-
-    my $haenv = $self->{haenv};
-
-    my $status = $self->get_local_status();
-
-    if ($status eq 'recover') {
-
-       $haenv->log('info', "waiting for 5 seconds");
-
-       $haenv->sleep(5);
-
-       $self->set_local_status('wait_for_quorum');
-
-    } elsif ($status eq 'wait_for_quorum') {
-
-       $haenv->sleep(5);
-          
-       if ($haenv->quorate()) {
-           if ($self->get_manager_locks()) {
-               $self->set_local_status('master');
-           } else {
-               $self->set_local_status('slave');
-           }
-       }
-
-    } elsif ($status eq 'master') {
-
-       my $manager = $self->{manager};
-
-       die "no manager" if !defined($manager);
-
-       my $startime = $haenv->get_time();
-
-       my $max_time = 10;
-
-       # do work (max_time seconds)
-       eval {
-           # fixme: set alert timer
-           $manager->manage();
-       };
-       if (my $err = $@) {
-
-           # fixme: cleanup?
-           $haenv->log('err', "got unexpected error - $err");
-           $self->set_local_status('error');
-
-       } else {
-           $haenv->sleep_until($startime + $max_time);
-       }
-
-       if (!$self->get_manager_locks()) {
-           if ($haenv->quorate()) {
-               $self->set_local_status('slave');
-           } else {
-               $self->set_local_status('wait_for_quorum');
-               # set_local_status('lost_quorum');
-           }
-       }
-    } elsif ($status eq 'slave') {
-
-       $haenv->sleep(5);
-
-       if ($haenv->quorate()) {
-           if ($self->get_manager_locks()) {
-               $self->set_local_status('master');
-           }
-       } else {
-           $self->set_local_status('wait_for_quorum');
-       }
-
-    } elsif ($status eq 'error') {
-       die "stopping due to errors\n";
-    } elsif ($status eq 'lost_quorum') {
-       die "lost_quorum\n";
-    } elsif ($status eq 'halt') {
-       die "halt\n";
-    } else {
-       die "got unexpected status '$status'\n";
-    }
-
-    return 1;
-}
-
-1;

diff --git a/PVE/HA/Sim/Hardware.pm b/PVE/HA/Sim/Hardware.pm
index bfaacf677e75d6eb8fbe785f22a0d0ce8be80790..58a3634709b88748e8ee00f1daad57abf869d115 100644 (file)
--- a/PVE/HA/Sim/Hardware.pm
+++ b/PVE/HA/Sim/Hardware.pm
@@ -19,7 +19,7 @@ use File::Path qw(make_path remove_tree);
 my $max_sim_time = 10000;
 
 use PVE::HA::Sim::Env;
-use PVE::HA::Server;
+use PVE::HA::CRM;
 
 # Status directory layout
 #
@@ -103,10 +103,9 @@ sub new {
        die "HA is not enabled\n" if !$haenv->manager_status_exists();
 
        $haenv->log('info', "starting server");
-       my $server = PVE::HA::Server->new($haenv);
 
        $self->{nodes}->{$node}->{haenv} = $haenv;
-       $self->{nodes}->{$node}->{server} = undef; # create on power on
+       $self->{nodes}->{$node}->{crm} = undef; # create on power on
     }
 
     return $self;
@@ -233,10 +232,11 @@ sub sim_hardware_cmd {
        if ($cmd eq 'power') {
            if ($cstatus->{$node}->{power} ne $action) {
                if ($action eq 'on') {
-                   my $server = $self->{nodes}->{$node}->{server} = PVE::HA::Server->new($haenv);
-               } elsif ($self->{nodes}->{$node}->{server}) {
+                   my $crm = $self->{nodes}->{$node}->{crm} = 
+                       PVE::HA::CRM->new($haenv);
+               } elsif ($self->{nodes}->{$node}->{crm}) {
                    $haenv->log('info', "server killed by poweroff", $logid);
-                   $self->{nodes}->{$node}->{server} = undef;
+                   $self->{nodes}->{$node}->{crm} = undef;
                }
            }
 
@@ -270,13 +270,13 @@ sub run {
 
        foreach my $node (@nodes) {
            my $haenv = $self->{nodes}->{$node}->{haenv};
-           my $server = $self->{nodes}->{$node}->{server};
+           my $crm = $self->{nodes}->{$node}->{crm};
 
-           next if !$server;
+           next if !$crm;
 
            $haenv->loop_start_hook($self->get_time());
 
-           die "implement me" if !$server->do_one_iteration();
+           die "implement me" if !$crm->do_one_iteration();
 
            $haenv->loop_end_hook();
 
@@ -287,7 +287,7 @@ sub run {
                if (!$self->watchdog_check($n)) {
                    $self->sim_hardware_cmd("power $n off", 'fencedev');
                    $self->log('info', "server '$n' killed by poweroff (fencing)");
-                   $self->{nodes}->{$n}->{server} = undef;
+                   $self->{nodes}->{$n}->{crm} = undef;
                }
            }
        }