From b52c6611b0020c725b0017027a57d9b4be8f26be Mon Sep 17 00:00:00 2001 From: mellor Date: Wed, 7 Sep 2011 17:12:20 +0000 Subject: [PATCH] defect 3396907 - added new reconfiglist keyword to send LL reconfig cmd to specified nodes, e.g. submit-only nodes such as login nodes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10468 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/rollupdate.pm | 8 ++++++++ .../share/xcat/rollupdate/rollupdate.input.sample | 11 +++++++++++ .../share/xcat/rollupdate/rollupdate_all.input.sample | 11 +++++++++++ .../xcat/rollupdate/rollupdate_stateful.input.sample | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/rollupdate.pm b/xCAT-server/lib/xcat/plugins/rollupdate.pm index 14589b1f6..a687de5b2 100644 --- a/xCAT-server/lib/xcat/plugins/rollupdate.pm +++ b/xCAT-server/lib/xcat/plugins/rollupdate.pm @@ -842,6 +842,9 @@ sub ll_jobs { if (defined($::FILEATTRS{newfeature}[0])){ push (@ugdflines, "newfeature=$::FILEATTRS{newfeature}[0]\n"); } + if (defined($::FILEATTRS{reconfiglist}[0])){ + push (@ugdflines, "reconfiglist=$::FILEATTRS{reconfiglist}[0]\n"); + } push (@ugdflines, "\n"); push (@ugdflines, &get_prescripts($nodelist)); if (defined($::FILEATTRS{shutdowntimeout}[0])){ @@ -2834,6 +2837,11 @@ sub llreconfig { $runlocal=1; } } + if ( defined($::FILEATTRS{reconfiglist}[0]) ) { + push (@llnodes, split( /,/,$::FILEATTRS{reconfiglist}[0]) ); + } elsif ( defined($::DATAATTRS{reconfiglist}[0]) ) { + push (@llnodes, split( /,/,$::DATAATTRS{reconfiglist}[0]) ); + } if ($runlocal) { if ($::VERBOSE) { open (RULOG, ">>$::LOGDIR/$::LOGFILE"); diff --git a/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample b/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample index f1ffcff44..856416623 100644 --- a/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample +++ b/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample @@ -151,6 +151,17 @@ mutex_count=2 maxupdates=all +# reconfiglist: For LoadLeveler, the list of nodes (as known by xCAT) +# that xCAT will xdsh an 'llctl reconfig' command to. xCAT will always send +# the reconfig command to the local xCAT management node, and to all nodes +# listed as the LL central managers and LL resource managers in the LL +# database. This is a list of additional machines required to immediately see +# any database changes xCAT may make. For example, all LL submit-only nodes +# should be added to this list so that any machine FEATURE changes are +# visible for job submission. +#reconfiglist=login1,login2 + + # jobtemplate: Scheduler job template file. See this sample LoadLeveler file # for details on how the template will be processed: diff --git a/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample b/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample index a0849d340..e0f582fcc 100644 --- a/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample +++ b/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample @@ -111,6 +111,17 @@ newfeature=newvalue maxupdates=16 +# reconfiglist: For LoadLeveler, the list of nodes (as known by xCAT) +# that xCAT will xdsh an 'llctl reconfig' command to. xCAT will always send +# the reconfig command to the local xCAT management node, and to all nodes +# listed as the LL central managers and LL resource managers in the LL +# database. This is a list of additional machines required to immediately see +# any database changes xCAT may make. For example, all LL submit-only nodes +# should be added to this list so that any machine FEATURE changes are +# visible for job submission. +#reconfiglist=login1,login2 + + #jobtemplate: Scheduler job template file. See this sample LoadLeveler file # for details on how the template will be processed: diff --git a/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample b/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample index b68ceecfd..adeb6ea07 100644 --- a/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample +++ b/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample @@ -119,6 +119,16 @@ updategroup=ns11(c4lpar211-c4lpar214) maxupdates=all +# reconfiglist: For LoadLeveler, the list of nodes (as known by xCAT) +# that xCAT will xdsh an 'llctl reconfig' command to. xCAT will always send +# the reconfig command to the local xCAT management node, and to all nodes +# listed as the LL central managers and LL resource managers in the LL +# database. This is a list of additional machines required to immediately see +# any database changes xCAT may make. For example, all LL submit-only nodes +# should be added to this list so that any machine FEATURE changes are +# visible for job submission. +#reconfiglist=login1,login2 + # jobtemplate: Scheduler job template file. See this sample LoadLeveler file # for details on how the template will be processed: