Permalink
Browse files

svn merge -r9136:9149 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

  • Loading branch information...
1 parent 3736624 commit 1d06c0804c02900409b9df6c99c1d5f1d7b254bd @jette jette committed Sep 1, 2006
Showing 377 changed files with 4,348 additions and 40 deletions.
View
13 COPYING
@@ -1,5 +1,16 @@
All SLURM code and documentation is available under the GNU General Public
-License.
+License.
+
+In addition, as a special exception, the copyright holders give permission
+to link the code of portions of this program with the OpenSSL library under
+certain conditions as described in each individual source file, and distribute
+linked combinations including the two. You must obey the GNU General Public
+License in all respects for all of the code used other than OpenSSL. If you
+modify file(s) with this exception, you may extend this exception to your
+version of the file(s), but you are not obligated to do so. If you do not
+wish to do so, delete this exception statement from your version. If you
+delete this exception statement from all source files in the program, then
+also delete it here.
=============================================================================
View
@@ -0,0 +1,169 @@
+/*
+ * (c) 2002, 2003, 2004 by Jason McLaughlin and Riadh Elloumi
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL. If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so. If you
+ * do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+Certain source files in this program permit linking with the OpenSSL
+library (http://www.openssl.org), which otherwise wouldn't be allowed
+under the GPL. For purposes of identifying OpenSSL, most source files
+giving this permission limit it to versions of OpenSSL having a license
+identical to that listed in this file (LICENSE.OpenSSL). It is not
+necessary for the copyright years to match between this file and the
+OpenSSL version in question. However, note that because this file is
+an extension of the license statements of these source files, this file
+may not be changed except with permission from all copyright holders
+of source files in this program which reference this file.
+
+
+ LICENSE ISSUES
+ ==============
+
+ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+ the OpenSSL License and the original SSLeay license apply to the toolkit.
+ See below for the actual license texts. Actually both licenses are BSD-style
+ Open Source licenses. In case of any license issues related to OpenSSL
+ please contact openssl-core@openssl.org.
+
+ OpenSSL License
+ ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to. The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * "This product includes cryptographic software written by
+ * Eric Young (eay@cryptsoft.com)"
+ * The word 'cryptographic' can be left out if the rouines from the library
+ * being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ * the apps directory (application code) you must include an acknowledgement:
+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed. i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
View
@@ -18,6 +18,7 @@ EXTRA_DIST = \
COPYING \
AUTHORS \
INSTALL \
+ LICENSE.OpenSSL \
NEWS \
ChangeLog \
META \
View
@@ -297,6 +297,7 @@ EXTRA_DIST = \
COPYING \
AUTHORS \
INSTALL \
+ LICENSE.OpenSSL \
NEWS \
ChangeLog \
META \
View
5 NEWS
@@ -32,6 +32,11 @@ documents those changes that are of interest to users and admins.
the code)
-- Added support for OSX build.
+* Changes in SLURM 1.1.11
+=========================
+ - Update file headers adding permission to link with OpenSSL.
+ - Enable sched/wiki2 message authentication.
+
* Changes in SLURM 1.1.10
=========================
-- task distribution fix for steps that are smaller than job allocation.
View
2 README
@@ -13,7 +13,7 @@ managing a queue of pending work.
SLURM is provided "as is" and with no warranty. This software is
distributed under the GNU General Public License, please see the files
-COPYING and DISCLAIMER for details.
+COPYING, DISCLAIMER, and LICENSE.OpenSSL for details.
This README presents an introduction to compiling, installing, and
using SLURM.
View
@@ -33,7 +33,7 @@ See the file NEWS for more details.
- Support added for configuration file ("wiki.conf" in same directory
as "slurm.conf" file, see "man wiki.conf" for details)
- Support added for job suspend/resume
- - Authentication of communcations now supported
+ - Authentication of communications now supported
- Improved performance
- Memory leaks fixed
View
@@ -22,32 +22,47 @@ SchedulerType=sched/wiki2 (NOTE: "sched/wiki" in slurm version 1.2)
SchedulerPort=7321
</pre>
Running multiple jobs per mode can be accomplished using the
-<i>SelectType=select/cons_res</i> and/or specifying
-<i>Shared=yes</i> on selected partitions.</p>
+<i>Shared=yes</i> parameter on partitions.
+The <i>SelectType=select/cons_res</i> parameter is not compatable
+with the <i>sched/wiki</i> plugin (both would try to schedule the
+individual processors within a node).</p>
-<p>The wiki-specific configuration is stored in a file
+<p>SLURM's wiki configuration is stored in a file
specific to the wiki-plugin. This file should be protected
from reading by users. It only needs to be readable by
<i>SlurmUser</i> (as configured in <i>slurm.conf</i>) and
only needs to exist on computers where the <i>slurmctld</i>
daemon executes.</p>
-<p>SLURM can either place all newly arriving jobs in a HELD state
+<p>The currently supported keywords include:<br>
+<dt><i>AuthKey</i>
+<dd>an encryption key for communctions between
+SLURM and Maui or Moab
+<dt><i>JobPriority</i>
+<dd>controls execution of newly arriving jobs in SLURM
+</dt></p>
+
+<p><i>AuthKey</i> is a DES based encryption key used to sign
+communctions between SLURM and Maui or Moab.
+This use of this key is essential to insure that a user
+not build his own program to cancel other user's jobs in
+SLURM.
+This should be a numeric value and match the the
+encryption key in Maui (<i>--with-key</i> on the
+configure line) or Moab (<i>KEY</i> parameter in the
+<i>moab-private.cfg</i> file).
+Note that SLURM's wiki plugin does not include a mechanism
+to submit new jobs, so even without this key nobody could
+run jobs as another user.</p>
+
+<p><i>JobPriority</i> controls the scheduling of newly arriving
+jobs in SLURM.
+SLURM can either place all newly arriving jobs in a HELD state
(priority = 0) and let Moab decide when and where to run the jobs
or SLURM can control when and where to run jobs.
-In the later case, Moab can modify the priorities of
-pending jobs to re-order the job queue or just monitor system state.
-The mode of operation is controlled by a wiki-plugin
-specific configuration file.
-The name of this file is <i>wiki.conf</i> and it will be
-in the same directory as the <i>slurm.conf</i> file.</p>
-
-<p>The currently supported keywords include:<br>
-<i>JobPriority</i>, which can be given a value of "run" or
-"hold" with a default value of "hold";<br>
-<i>AuthKey</i> which contains a numeric value that should
-match the <i>KEY</i> parameter in the <i>moab-private.cfg</i>
-file.</p>
+In the later case, Moab can modify the priorities of pending jobs
+to re-order the job queue or just monitor system state.
+Possible values are "hold" and "run" with "hold" being the default.</p>
<p>Here is a sample <i>wiki.conf</i> file
<pre>
View
@@ -77,11 +77,13 @@ Major enhancements include:
<li>More complete support for resource management down to the core level
on a node.</li>
<li>Treat memory as a consumable resource on a compute node.</li>
-<li>Perl API to SLURM.</li>
+<li>Perl API to SLURM available.</li>
<li>Graphical User Interfaces provided.</li>
<li>Added support for OS X.</li>
-<li>Add Kerberos credential support including credential forwarding and refresh.</li>
<li>Permit batch jobs to be requeued.</li>
+<li>Expanded support of Moab and Maui schedulers.</li>
+<li><i>Srun</i> command augmented by new commands for each operation:
+<i>salloc</i>, <i>slaunch</i>, <i>sbatch</i>, and <i>sattach</i>.</li>
</ul>
<h2><a name="13">Major Updates in SLURM Version 1.3 and beyond</a></h2>
@@ -92,9 +94,11 @@ to coordinate activies. Future development plans includes:
<ul>
<li>Permit resource allocations (jobs) to change size.</li>
<li>Convert state save functions to plugins for use of various databases.</li>
+<li>Add Kerberos credential support including credential forwarding
+and refresh.</li>
</ul>
-<p style="text-align:center;">Last modified 9 June 2006</p>
+<p style="text-align:center;">Last modified 31 August 2006</p>
<!--#include virtual="footer.txt"-->
View
@@ -33,6 +33,7 @@
<li>David Jackson (Cluster Resources)</li>
<li>Greg Johnson (LANL) </li>
<li>Jason King (LLNL)</li>
+<li>Bernard Li (Genome Sciences Centre, Canada)</li>
<li>Donna Mecozzi (LLNL)</li>
<li>Bryan O'Sullivan (Pathscale)</li>
<li>Dan Phung (LLNL/Columbia University)</li>
@@ -41,6 +42,6 @@
<li>Jay Windley (Linux NetworX)</li>
</ul>
-<p style="text-align:center;">Last modified 17 July 2006</p>
+<p style="text-align:center;">Last modified 31 August 2006</p>
<!--#include virtual="footer.txt"-->
Oops, something went wrong.

0 comments on commit 1d06c08

Please sign in to comment.