Creating 3.3.1 branch

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/branches/3.3.1@149 3f5042e3-fb1d-0410-be18-d6ca2573e517

CHANGELOG

@@ -1,14 +1,3 @@
-Maui 3.3.2
-  - Patch for 'diagnose -f'. Allow to specify what section of fairshare you want to see, default is 
-    everything (-f [user|group|acct|class|qos]). To show fairshare for a group, use:
-     * diagnose -f group (Author: Dennis Stam and applied by Bas van der Vlies)
-  - Showstats segfaults when using compiler optimization (Author: Andrew Savchenko, applied by Bas van der Vlies)
-  - catch socket errors for MSUAcceptClient. So no errors in the log file (Author: Jonathan Barber, applied 
-    by Bas van der Vlies): 
-     * accept call failed, errno: 11 (Resource temporarily unavailable)
-  - Fixed an segv for showq -r, when user submit a job without specifying how many nodes, just a node property, eg:
-     * qsub -lnodes=infiniband -Ii (Authors: Bas van der Vlies/Dennis Stam, SURFsara)
-    
 Maui 3.3.1
   - Fixed issue where hostlist was being overwritten resulting in broken $PBS_NODEFILE. (Alexis Cousein)
   - Fixed issue where users could set system priority on their own jobs. (Bas van der Vlies)

README

@@ -1,4 +1,4 @@
-                 Maui Scheduler, Release 3.3.2
+                 Maui Scheduler, Release 3.3.1
 
 This package contains the Maui Scheduler, an advance reservation based HPC 
 batch scheduler with extensive job management and resource optimization

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for maui 3.3.2.
+# Generated by GNU Autoconf 2.57 for maui 3.3.1.
 #
 # Report bugs to <help@supercluster.org>.
 #
@@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='maui'
 PACKAGE_TARNAME='maui'
-PACKAGE_VERSION='3.3.2'
-PACKAGE_STRING='maui 3.3.2'
+PACKAGE_VERSION='3.3.1'
+PACKAGE_STRING='maui 3.3.1'
 PACKAGE_BUGREPORT='help@supercluster.org'
 
 ac_unique_file="src/mcom/MConst.c"
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures maui 3.3.2 to adapt to many kinds of systems.
+\`configure' configures maui 3.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -837,7 +837,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of maui 3.3.2:";;
+     short | recursive ) echo "Configuration of maui 3.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -939,7 +939,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-maui configure 3.3.2
+maui configure 3.3.1
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -954,7 +954,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by maui $as_me 3.3.2, which was
+It was created by maui $as_me 3.3.1, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -6949,7 +6949,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by maui $as_me 3.3.2, which was
+This file was extended by maui $as_me 3.3.1, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7004,7 +7004,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-maui config.status 3.3.2
+maui config.status 3.3.1
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(maui, 3.3.2, help@supercluster.org)
+AC_INIT(maui, 3.3.1, help@supercluster.org)
 AC_CONFIG_SRCDIR([src/mcom/MConst.c])
 #AC_CONFIG_HEADER([config.h])
 

include/header.cfg

@@ -1,4 +1,4 @@
-VERSION 3.3.2
+VERSION 3.3.1
 PACKAGE moab
 AUTHOR Cluster Resources, Inc
 

include/moab-proto.h

@@ -485,8 +485,7 @@ int MFSInitialize(mfsc_t *);
 double MFSCalcFactor(mfsc_t *,double *);
 char *MFSTargetToString(double,int);
 int MFSShutdown(mfsc_t *);
-/* Added the DiagOpt, of type char */
-int MFSShow(char *,int,char *,int);
+int MFSShow(char *,int,int);
 
 
 

include/moab.h

@@ -7,7 +7,7 @@
 #include "moab-local.h"
 #include "mcom.h"
 
-#define MOAB_VERSION "3.3.2"
+#define MOAB_VERSION "3.3.1"
 
 /* elemental objects */
 

include/msched-version.h

@@ -1 +1 @@
-#define MSCHED_VERSION "3.3.2"
+#define MSCHED_VERSION "3.3.1"

src/mcom/MSU.c

@@ -809,11 +809,6 @@ int MSUAcceptClient(
 
   if ((sd = accept(S->sd,(struct sockaddr *)&c_sockaddr,&addrlen)) == -1)
     { 
-    if (errno == EAGAIN || errno == EWOULDBLOCK)
-      {
-      return(FAILURE);
-      }
-
     MDB(9,fSOCK) MLog("INFO:     accept call failed, errno: %d (%s)\n",
       errno,
       strerror(errno));

src/mcom/header.cfg

@@ -1,4 +1,4 @@
-VERSION 3.3.2
+VERSION 3.3.1
 PACKAGE moab
 AUTHOR Cluster Resources, Inc
 

src/moab/MFS.c

@@ -1038,8 +1038,6 @@ int MFSShow(
 
   char *Buf,      /* O */
   int   BufSize,  /* I */
-  /* Added this so we can asked what we want to see */
-  char *Opts,
   int   Mode)     /* I */
 
   {
@@ -1078,34 +1076,6 @@ int MFSShow(
     BufSize,
     Mode);
 
-  /** DsT Show the given option in the logfile **/
-  DBG(3,fFS) DPrint("%s(Opts,%s)\n",
-    FName,
-    Opts);
-
-  /** DsT Begin check if given option is supported, else just skip and show all  **/
-  int LIMITOUTPUT = FALSE;
-
-  if ( strcmp( Opts, "user" ) == 0 ) {
-    LIMITOUTPUT = TRUE;
-  } else if( strcmp( Opts, "group" ) == 0 ) {
-	LIMITOUTPUT = TRUE;
-  } else if( strcmp( Opts, "acct" ) == 0 ) {
-	LIMITOUTPUT = TRUE;
-  } else if( strcmp( Opts, "class" ) == 0 ) {
-	LIMITOUTPUT = TRUE;
-  } else if( strcmp( Opts, "qos" ) == 0 ) {
-	LIMITOUTPUT = TRUE;
-  }
-
-  /** DsT Always show if we are going to LIMIT the output **/
-  DBG(3,fFS) DPrint("%s(LIMIT,%d),(WHAT,%s)\n",
-	FName,
-	LIMITOUTPUT,
-	Opts);
-
-  /** Dst End check options **/
-
   if (Buf == NULL)
     {
     return(FAILURE);
@@ -1214,10 +1184,6 @@ int MFSShow(
         {
         case mxoUser:
 
-		  /** DsT if limit is true but Opts does not compare to users, skip **/
-          if (LIMITOUTPUT == TRUE && strcmp( Opts, "user" ) != 0 )
-			continue;
-
           if (MSched.DefaultU != NULL)
             DF = &MSched.DefaultU->F;
 
@@ -1225,10 +1191,6 @@ int MFSShow(
 
         case mxoGroup:
 
-		  /** DsT if limit is true but Opts does not compare to group, skip **/
-          if (LIMITOUTPUT == TRUE && strcmp( Opts, "group" ) != 0 )
-			continue;
-
           if (MSched.DefaultG != NULL)
             DF = &MSched.DefaultG->F;
 
@@ -1236,10 +1198,6 @@ int MFSShow(
 
         case mxoAcct:
 
-		  /** DsT if limit is true but Opts does not compare to acct, skip **/
-          if (LIMITOUTPUT == TRUE && strcmp( Opts, "acct" ) != 0 )
-			continue;
-
           if (MSched.DefaultA != NULL)
             DF = &MSched.DefaultA->F;
 
@@ -1247,10 +1205,6 @@ int MFSShow(
 
         case mxoClass:
 
-		  /** DsT if limit is true but Opts does not compare to class, skip **/
-          if (LIMITOUTPUT == TRUE && strcmp( Opts, "class" ) != 0 )
-			continue;
-
           if (MSched.DefaultC != NULL)
             DF = &MSched.DefaultC->F;
 
@@ -1258,10 +1212,6 @@ int MFSShow(
 
         case mxoQOS:
 
-		  /** DsT if limit is true but Opts does not compare to qos, skip **/
-          if (LIMITOUTPUT == TRUE && strcmp( Opts, "qos" ) != 0 )
-			continue;
-
           if (MSched.DefaultQ != NULL)
             DF = &MSched.DefaultQ->F;
 

src/moab/MSched.c

@@ -3981,6 +3981,9 @@ int MSchedStatToString(
 
       /* build stat buffer */
 
+      sprintf(Buf,"%ld\n",
+        S->Time);
+
       /* set up scheduler run time */
 
       RunTime = MStat.SchedRunTime;
@@ -3988,10 +3991,10 @@ int MSchedStatToString(
       GP = &MPar[0];
       T  = &GP->S;
 
-      /*            CTM STM ITM RTM IJ EJ AJ UN UP UM IN IP IM CT SJ TPA TPB SPH TMA TMD QP AQP NJA JAC PSX IT RPI WEF WI MXF ABP MBP AQT MQT PSR PSD PSU MSA MSD JE */
+      /*            STM ITM RTM IJ EJ AJ UN UP UM IN IP IM CT SJ TPA TPB SPH TMA TMD QP AQP NJA JAC PSX IT RPI WEF WI MXF ABP MBP AQT MQT PSR PSD PSU MSA MSD JE */
 
-      sprintf(Buf,"%ld\n%ld %ld %ld %d %d %d %d %d %d %d %d %d %d %d %lf %lf %lf %lf %lf %d %lu %lf %lf %lf %d %ld %lf %d %lf %lf %d %lf %lu %lf %lf %lf %lf %lf %d %d %lf\n",
-        S->Time,
+      sprintf(Buf,"%s%ld %ld %ld %d %d %d %d %d %d %d %d %d %d %d %lf %lf %lf %lf %lf %d %lu %lf %lf %lf %d %ld %lf %d %lf %lf %d %lf %lu %lf %lf %lf %lf %lf %d %d %lf\n",
+        Buf,
         S->StartTime,
         MStat.InitTime,
         RunTime,

src/moab/header.cfg

@@ -1,4 +1,4 @@
-VERSION 3.3.2
+VERSION 3.3.1
 PACKAGE moab
 AUTHOR Cluster Resources, Inc
 

src/server/Makefile

@@ -1,4 +1,4 @@
-# Makefile for Maui 3.3.2
+# Makefile for Maui 3.3.1
 # Copyright 1999 - 2010  Cluster Resources, Inc, All Rights Reserved
 
    TOP =../..

src/server/UserI.c

@@ -6157,8 +6157,7 @@ int UIDiagnose(
       {
       int BufSize = MAX_MBUFFER;
 
-      /* DsT Added DiagOpt, so we can limit the output */
-      MFSShow(SBuffer,BufSize,DiagOpt,IFlags);
+      MFSShow(SBuffer,BufSize,IFlags);
 
       *SBufSize = strlen(SBuffer);
       }  /* END BLOCK */
@@ -10139,7 +10138,7 @@ int UIQueueShowAJobs(
       J->PSUtilized,
       P->Name,
       RQ->TaskCount * RQ->DRes.Mem,
-      ((J->NodeList != NULL) && (J->NodeList[0].N != NULL) && (J->NodeList[0].N->Name[0] != '\0')) ?
+      ((J->NodeList != NULL) && (J->NodeList[0].N->Name[0] != '\0')) ?
         MNodeAdjustName(J->NodeList[0].N->Name,0) : NONE,
       J->Flags,
       J->AWallTime,

src/server/header.cfg

@@ -1,4 +1,4 @@
-VERSION 3.3.2
+VERSION 3.3.1
 PACKAGE maui
 AUTHOR Cluster Resources, Inc
 

src/server/mclient.c

@@ -4236,8 +4236,7 @@ int MCShowUsage(
  
       fprintf(stderr,"  -a [ACCOUNTID]\n");
       fprintf(stderr,"  -c [CLASSID]\n");
-	  /** DsT added the possible options for f **/
-      fprintf(stderr,"  -f [user|group|acct|class|qos] // fairshare\n");
+      fprintf(stderr,"  -f // fairshare\n");
       fprintf(stderr,"  -g [GROUPID]\n");
       fprintf(stderr,"  -j [JOBID]\n");
       fprintf(stderr,"  -m // frame\n");