From c98beba6afa8699209ba109700b808c51c7ab448 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 19 Nov 2010 20:30:56 +0000 Subject: [PATCH] -Fix for multi-vcenter concurrent operation git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8216 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/esx.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm index 5a97eb9d1..e16e78627 100644 --- a/xCAT-server/lib/xcat/plugins/esx.pm +++ b/xCAT-server/lib/xcat/plugins/esx.pm @@ -1613,7 +1613,7 @@ sub generic_vm_operation { #The general form of firing per-vm requests to ESX hy #retrieve all vm views in one gulp my $vmsearchstring = join(")|(",keys %{$vcenterhash{$currentvcenter}->{vms}}); $vmsearchstring = '^(('.$vmsearchstring.'))(\z|\.)'; - my $regex = qr/$vmsearchstring/o; + my $regex = qr/$vmsearchstring/; $vcviews{$currentvcenter} = $vcenterhash{$currentvcenter}->{conn}->find_entity_views(view_type => 'VirtualMachine',properties=>$properties,filter=>{'config.name'=>$regex}); } foreach $hyp (keys %hyphash) { @@ -2739,7 +2739,7 @@ sub populate_vcenter_hostviews { while ($iterations and scalar(@hypervisors)) { my $hosts = join(")|(",@hypervisors); $hosts = '^(('.$hosts.'))(\z|\.)'; - my $search = qr/$hosts/o; + my $search = qr/$hosts/; my @hypviews = @{$vcenterhash{$vcenter}->{conn}->find_entity_views(view_type=>'HostSystem',properties=>['summary.config.name','summary.runtime.connectionState','runtime.inMaintenanceMode','parent','configManager'],filter=>{'summary.config.name'=>$search})}; foreach (@hypviews) { my $hypname = $_->{'summary.config.name'};