Unverified Commit 9006fa79 authored by Francesc Guasch's avatar Francesc Guasch Committed by GitHub
Browse files

refactor(backend): fast search already started (#1267)

issue #1265
parent f67ee142
...@@ -349,7 +349,8 @@ sub _start_preconditions{ ...@@ -349,7 +349,8 @@ sub _start_preconditions{
} }
#_check_used_memory(@_); #_check_used_memory(@_);
return if $self->_search_already_started(); return if $self->_search_already_started('fast');
$self->status('starting');
# if it is a clone ( it is not a base ) # if it is a clone ( it is not a base )
if ($self->id_base) { if ($self->id_base) {
# $self->_set_last_vm(1) # $self->_set_last_vm(1)
...@@ -382,10 +383,10 @@ sub _start_preconditions{ ...@@ -382,10 +383,10 @@ sub _start_preconditions{
#$self->_check_cpu_usage($request); #$self->_check_cpu_usage($request);
} }
sub _search_already_started($self) { sub _search_already_started($self, $fast = 0) {
my $sth = $$CONNECTOR->dbh->prepare( my $sql = "SELECT id FROM vms where vm_type=?";
"SELECT id FROM vms where vm_type=?" $sql .= " AND is_active=1" if $fast;
); my $sth = $$CONNECTOR->dbh->prepare($sql);
$sth->execute($self->_vm->type); $sth->execute($self->_vm->type);
my %started; my %started;
while (my ($id) = $sth->fetchrow) { while (my ($id) = $sth->fetchrow) {
......
...@@ -636,6 +636,8 @@ sub _interface_ip($self, $remote_ip=undef) { ...@@ -636,6 +636,8 @@ sub _interface_ip($self, $remote_ip=undef) {
my ($network, $ip) = ($1, $2); my ($network, $ip) = ($1, $2);
$route{$network} = $ip; $route{$network} = $ip;
return $ip if $remote_ip && $remote_ip eq $ip;
my $netaddr = NetAddr::IP->new($network); my $netaddr = NetAddr::IP->new($network);
return $ip if $remote_ip_addr->within($netaddr); return $ip if $remote_ip_addr->within($netaddr);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment