From f813d2e20f040c1b2e463960d2659c1732fee4ff Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 3 Feb 2012 18:21:28 +0000 Subject: [PATCH] Take a stab at having xcatd itself filter out potentially circular preprocess_request invocations git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11468 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/xcatd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 924840247..a40dd1383 100755 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -1302,7 +1302,7 @@ sub dispatch_request { #Since plugins may commonly experience this, a preprocess_request implementation #will for now be required for a command to be scaled through service nodes #If the plugin offers a preprocess method, use it to set the request array - if (defined(${"xCAT_plugin::".$modname."::"}{preprocess_request})) { + if ((not (defined $request->{_xcatpreprocessed}->[0] and $request->{_xcatpreprocessed}->[0] == 1)) and (defined(${"xCAT_plugin::".$modname."::"}{preprocess_request}))) { $SIG{CHLD}='DEFAULT'; $reqs = ${"xCAT_plugin::".$modname."::"}{preprocess_request}->($req,$dispatch_cb,\&do_request); } else { #otherwise, pass it in without hierarchy support