[Mauiusers] Re: [torqueusers] Maui?torque problems with NodeSet (solved)

[Bas van der Vlies]

Bas van der Vlies wrote:
> Bas van der Vlies wrote:
>  > Dave Jackson wrote:
>  >  > Bas,
>  >  >
>  >  >   The problem you were seeing stemmed from the fact that Maui's 
> NodeSet
>  >  > feature only enforced task based job constraints.  It was correctly
>  >  > finding enough tasks, but not enough nodes to run the job.  We 
> have made
>  >  > some extensions to the NodeSet algorithm which should allow it to
>  >  > enforce both node and task based requirements.  This is available 
> in the
>  >  > latest snapshot release.  We will continue to test this release
>  >  > internally but please let us know if this resolves your issue.
>  >  >
> 
> Dave,
> 
>   I found the bug in maui snapshot 11 you send to me. It is in the
> function: int MJobSelectResourceSet()
> 
> In the function the value of NodesRequired is always 0:
>     NodesRequired = J->Request.NC;
> 
> must be:
>     RQ = J->Req[0];
>     NodesRequired = RQ->NodeCount;
> 
> I can sent you the patchess. Is there an tool to generate the patches.
> I have also made some patches for showq.
> 
>         Regards

Forgot to attach the patch for the latest maui-snapshot



-- 
--
********************************************************************
*                                                                  *
*  Bas van der Vlies                     e-mail: basv at sara.nl      *
*  SARA - Academic Computing Services    phone:  +31 20 592 8012   *
*  Kruislaan 415                         fax:    +31 20 6683167    *
*  1098 SJ Amsterdam                                               *
*                                                                  *
********************************************************************
-------------- next part --------------
--- ../../../../maui-3.2.6p11-snap.1104270207/src/moab/MSched.c	2004-12-28 22:43:26.000000000 +0100
+++ MSched.c	2005-02-03 14:41:03.000000000 +0100
@@ -2081,6 +2081,11 @@
 
   mnode_t     *N;
 
+  /*
+   * HvB
+  */
+  mreq_t *RQ;
+
   const char *FName = "MJobSelectResourceSet";
 
   DBG(4,fSCHED) DPrint("%s(%s,%d,%d,SetList,NodeList,%d)\n",
@@ -2108,7 +2113,12 @@
     }
 
   TasksRequired = J->Request.TC;
-  NodesRequired = J->Request.NC;
+
+  /*
+   * HvB
+  */
+  RQ = J->Req[0];
+  NodesRequired = RQ->NodeCount;
 
   memset(SetCount,0,sizeof(SetCount));
   memset(SetNC,0,sizeof(SetNC));
@@ -2491,7 +2501,8 @@
 
       for (sindex = 0;sindex < MaxSet;sindex++)
         {
-        if (EffSetCount[sindex] < TasksRequired)
+        /* HvB */
+        if ( (EffSetCount[sindex] < TasksRequired) || (SetNC[sindex] < NodesRequired) )
           continue;
 
         switch (MPar[0].NodeSetPriorityType)