2d22525098b0dc4208d9e1b7ade59fe128302d60 kent Thu Mar 10 16:03:34 2011 -0800 Doubling max queue size since we seem to actually sometimes be hitting limit and memory has more than doubled since this was set. diff --git src/parasol/para/para.c src/parasol/para/para.c index 5252766..1846c6e 100644 --- src/parasol/para/para.c +++ src/parasol/para/para.c @@ -70,31 +70,31 @@ " creating a new batch, batchDir should not have been previously used as\n" " a batch name. The batchDir must be writable by the paraHub process.\n" " This does not affect the working directory assigned to jobs. It defaults\n" " to the directory where para is run. If used, this option must be specified\n" " on all para commands for the batch. For example to run two batches in the\n" " same directory:\n" " para -batch=b1 make jobs1\n" " para -batch=b2 make jobs2\n" "para push \n" " This pushes forward the batch of jobs by submitting jobs to parasol\n" " It will limit parasol queue size to something not too big and\n" " retry failed jobs.\n" " options:\n" " -retries=N Number of retries per job - default 4.\n" " -maxQueue=N Number of jobs to allow on parasol queue. \n" - " Default 1000000.\n" + " Default 2000000.\n" " -minPush=N Minimum number of jobs to queue. \n" " Default 1. Overrides maxQueue.\n" " -maxPush=N Maximum number of jobs to queue - default 100000.\n" " -warnTime=N Number of minutes job runs before hang warning. \n" " Default 4320 (3 days).\n" " -killTime=N Number of minutes hung job runs before push kills it.\n" " By default kill off for backwards compatibility.\n" /* originally to be 2 weeks */ " -delayTime=N Number of seconds to delay before submitting next job \n" " to minimize i/o load at startup - default 0.\n" " -priority=x Set batch priority to high, medium, or low.\n" " Default medium (use high only with approval).\n" " If needed, use with make, push, create, shove, or try.\n" " Or, set batch priority to a specific numeric value - default %d.\n" " 1 is emergency high priority, \n" " %d is normal medium, \n" @@ -161,31 +161,31 @@ " Clear sick nodes statistics and consecutive crash counts of batch.\n" "\n" "Common options\n" " -verbose=1 - set verbosity level.\n", version, NORMAL_PRIORITY, NORMAL_PRIORITY, NORMAL_PRIORITY * NORMAL_PRIORITY, NORMAL_PRIORITY-1 ); } /* Variables that can be set from command line. */ int retries = 4; -int maxQueue = 1000000; +int maxQueue = 2000000; int minPush = 1; int maxPush = 100000; int warnTime = 3*24*60; int killTime = 0; /* 0 = off, was originally going to be 2 weeks or 14*24*60; */ int sleepTime = 5*60; int delayTime = 0; int priority = NORMAL_PRIORITY; int maxJob = -1; float cpuUsage = 0; long long ramUsage = 0; char *batchDir = NULL; char *jobCwd = NULL; char resultsName[PATH_LEN]; char errDir[PATH_LEN];