Commit 8a646545 authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop' of https://github.com/UPC/ravada into develop

parents f51c1d6c 797bbec4
......@@ -2302,6 +2302,7 @@ sub _execute {
if ( $pid == 0 ) {
$request->status('working','');
my $t0 = [gettimeofday];
srand();
$self->_do_execute_command($sub, $request);
my $elapsed = tv_interval($t0,[gettimeofday]);
$request->run_time($elapsed) if !$request->run_time();
......
......@@ -266,7 +266,7 @@ sub _set_vm($self, $vm, $force=0) {
sub _check_equal_storage_pools($self, $vm2) {
my $vm1 = $self->_vm;
my @sp;
push @sp,($vm1->default_storage_pool_name) if $vm1->default_storage_pool;
push @sp,($vm1->default_storage_pool_name) if $vm1->default_storage_pool_name;
push @sp,($vm1->base_storage_pool) if $vm1->base_storage_pool;
push @sp,($vm1->clone_storage_pool) if $vm1->clone_storage_pool;
......
......@@ -706,7 +706,6 @@ sub _data($self, $field, $value=undef) {
sub _timed_data_cache($self) {
return if !$self->{$FIELD_TIMEOUT} || time - $self->{$FIELD_TIMEOUT} < $CACHE_TIMEOUT;
warn "$$ deleting cache node ".localtime(time);
my $name = $self->{_data}->{name};
my $id = $self->{_data}->{id};
delete $self->{_data};
......
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