seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated Cluster->add_server() to wait up to 15 seconds for a server to appear to ensure that the pcs call to add the server with the right requested running state.

Browse Source 
* Updated Cluster->recover_server() to set the desired recovery state before calling the crm_resource refresh.

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 2 years ago
parent b3f3c9b24e
commit bc3d04ad2e
5 changed files with 72 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      Anvil/Tools/Cluster.pm
  2. 1
      Anvil/Tools/Server.pm
  3. 3
      ocf/alteeve/server
  4. 5
      scancore-agents/scan-cluster/scan-cluster
  5. 2
      tools/anvil-provision-server

83
Anvil/Tools/Cluster.pm
Unescape View File

@ -185,23 +185,47 @@ sub add_server
password => $anvil->Log->is_secure($password), password => $anvil->Log->is_secure($password),
}}); }});
# Verify that the server is here or on the peer. We need to add the command to t # Verify that the server is here or on the peer. Given they could be called at the same time that the
$anvil->Server->find({ # server is being provisioned, we'll wait up to 15 seconds for it to appear.
debug => $debug, my $waiting = 1;
server => $server_name, my $wait_until = time + 15;
}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { wait_until => $wait_until }});
$anvil->Server->find({ while ($waiting)
debug => $debug, {
refresh => 0, $anvil->Server->find({
password => $password, debug => $debug,
target => $peer_target_ip, server => $server_name,
server => $server_name, });
}); $anvil->Server->find({
debug => $debug,
refresh => 0,
password => $password,
target => $peer_target_ip,
server => $server_name,
});
if (exists $anvil->data->{server}{location}{$server_name}{status})
{
$waiting = 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
waiting => $waiting,
"server::location::${server_name}::status" => $anvil->data->{server}{location}{$server_name}{status},
"server::location::${server_name}::host_name" => $anvil->data->{server}{location}{$server_name}{host_name},
}});
}
if (($waiting) && (time > $wait_until))
{
# Stop waiting.
$waiting = 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { waiting => $waiting }});
}
}
# The host here is the full host name. # The host here is the full host name.
my $host_name = $anvil->Get->host_name(); my $host_name = $anvil->Get->host_name();
my $server_state = $anvil->data->{server}{location}{$server_name}{status}; my $server_state = defined $anvil->data->{server}{location}{$server_name}{status} ? $anvil->data->{server}{location}{$server_name}{status} : "";
my $server_host = $anvil->data->{server}{location}{$server_name}{host_name}; my $server_host = defined $anvil->data->{server}{location}{$server_name}{host_name} ? $anvil->data->{server}{location}{$server_name}{host_name} : "";
my $target_role = $server_state eq "running" ? "started" : "stopped"; my $target_role = $server_state eq "running" ? "started" : "stopped";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
host_name => $host_name, host_name => $host_name,
@ -4278,10 +4302,14 @@ This tries to recover a C<< FAILED >> resource (server).
Parameters; Parameters;
=head3 server_ (required) =head3 server (required)
This is the server (resource) name to try to recover. This is the server (resource) name to try to recover.
=head3 running (required)
This indicates if the server should be recovered into the running state when set to C<< 1 >>, or stopped state when set to C<< 0 >>.
=cut =cut
sub recover_server sub recover_server
{ {
@ -4291,9 +4319,11 @@ sub recover_server
my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3; my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3;
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "Cluster->recover_server()" }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "Cluster->recover_server()" }});
my $server = defined $parameter->{server} ? $parameter->{server} : ""; my $running = defined $parameter->{running} ? $parameter->{running} : "";
my $server = defined $parameter->{server} ? $parameter->{server} : "";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
server => $server, running => $running,
server => $server,
}}); }});
if (not $server) if (not $server)
@ -4301,8 +4331,15 @@ sub recover_server
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0020", variables => { method => "Cluster->recover_server()", parameter => "server" }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0020", variables => { method => "Cluster->recover_server()", parameter => "server" }});
return("!!error!!"); return("!!error!!");
} }
if ($running eq "")
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0020", variables => { method => "Cluster->recover_server()", parameter => "running" }});
return("!!error!!");
}
my $shell_call = $anvil->data->{path}{exe}{crm_resource}." --resource ".$server." --refresh"; # Set the desired state post recovery.
my $wanted_state = $running ? "enable" : "disable";
my $shell_call = $anvil->data->{path}{exe}{pcs}." resource ".$wanted_state." ".$server;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }});
my ($output, $return_code) = $anvil->System->call({debug => $debug, shell_call => $shell_call}); my ($output, $return_code) = $anvil->System->call({debug => $debug, shell_call => $shell_call});
@ -4311,6 +4348,16 @@ sub recover_server
return_code => $return_code, return_code => $return_code,
}}); }});
# Now tell it to refresh
$shell_call = $anvil->data->{path}{exe}{crm_resource}." --resource ".$server." --refresh";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }});
($output, $return_code) = $anvil->System->call({debug => $debug, shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
output => $output,
return_code => $return_code,
}});
return(0); return(0);
} }

1
Anvil/Tools/Server.pm
Unescape View File

@ -416,6 +416,7 @@ sub find
# Clear any old data # Clear any old data
if ((exists $anvil->data->{server}{location}) && ($refresh)) if ((exists $anvil->data->{server}{location}) && ($refresh))
{ {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0700", variables => { hash => "server::location" }});
delete $anvil->data->{server}{location}; delete $anvil->data->{server}{location};
} }

3
ocf/alteeve/server
Unescape View File

@ -100,8 +100,7 @@ $| = 1;
# NOTE: Setting 'log_level' and 'log_secure' here will get overridden in the main lopp. Use the Log methods # NOTE: Setting 'log_level' and 'log_secure' here will get overridden in the main lopp. Use the Log methods
# in the loop as well to override defaults in code. # in the loop as well to override defaults in code.
my $anvil = Anvil::Tools->new(); my $anvil = Anvil::Tools->new();
#$anvil->Log->level({set => 2});
$anvil->Log->level({set => 2});
### Read or Set the environment variables ### Read or Set the environment variables
# This is the name of the server we're managing. # Example values: # This is the name of the server we're managing. # Example values:

5
scancore-agents/scan-cluster/scan-cluster
Unescape View File

@ -199,8 +199,9 @@ sub check_resources
{ {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "scan_cluster_log_0010"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "scan_cluster_log_0010"});
$anvil->Cluster->recover_server({ $anvil->Cluster->recover_server({
debug => 2, debug => 2,
server => $server, server => $server,
running => $server_found,
}); });
# It'll leave 'failed state' for a bit, so we need to wait. # It'll leave 'failed state' for a bit, so we need to wait.

2
tools/anvil-provision-server
Unescape View File

@ -3463,6 +3463,8 @@ server_uuid=".$anvil->data->{new_server}{uuid};
$target_host_uuid = $node1_host_uuid; $target_host_uuid = $node1_host_uuid;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { target_host_uuid => $target_host_uuid }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { target_host_uuid => $target_host_uuid }});
} }
my $host_name = $anvil->Get->host_name_from_uuid({host_uuid => $target_host_uuid});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_name => $host_name }});
my ($job_uuid) = $anvil->Database->insert_or_update_jobs({ my ($job_uuid) = $anvil->Database->insert_or_update_jobs({
debug => 2, debug => 2,
job_command => $anvil->data->{path}{exe}{'anvil-provision-server'}.$anvil->Log->switches, job_command => $anvil->data->{path}{exe}{'anvil-provision-server'}.$anvil->Log->switches,

Write Preview
Loading…
Cancel
Save