From addd30180e2ca0a05390af44f3ce7c2b982717e7 Mon Sep 17 00:00:00 2001 From: leiaibj Date: Wed, 31 Oct 2012 05:22:43 +0000 Subject: [PATCH] discover querying should not acquire lock git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14170 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/profilednodes.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm index 9c22629de..69b81c952 100644 --- a/xCAT-server/lib/xcat/plugins/profilednodes.pm +++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm @@ -89,6 +89,14 @@ sub process_request { $command = $request->{command}->[0]; $args = $request->{arg}; + # There is no need to acquire lock for command nodediscoverstatus and nodediscoverls. + if ($command eq "nodediscoverstatus"){ + nodediscoverstatus(); + return; + } elsif ($command eq "nodediscoverls"){ + nodediscoverls(); + return; + } my $lock = xCAT::Utils->acquire_lock("nodemgmt", 1); if (! $lock){ @@ -107,7 +115,7 @@ sub process_request { } if ($command eq "nodeimport"){ - nodeimport() + nodeimport(); } elsif ($command eq "nodepurge"){ nodepurge(); } elsif ($command eq "nodechprofile"){ @@ -118,12 +126,8 @@ sub process_request { nodediscoverstart(); } elsif ($command eq "nodediscoverstop"){ nodediscoverstop(); - } elsif ($command eq "nodediscoverstatus"){ - nodediscoverstatus(); } elsif ($command eq "findme"){ findme(); - } elsif ($command eq "nodediscoverls"){ - nodediscoverls(); } elsif ($command eq "nodeaddunmged"){ nodeaddunmged(); } elsif ($command eq "nodechmac"){