Skip to content

Commit a9704ee

Browse files
committed
[doc] fix documentation
fix formating fix missing bist after the last changes add links to OAR wiki
1 parent ef6ea83 commit a9704ee

File tree

5 files changed

+48
-53
lines changed

5 files changed

+48
-53
lines changed

COPYRIGHT

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
1-
Unless stated differently in a file itself, all files in this directory and all
2-
subdirectories are:
3-
- Copyright 2003-2016 Laboratoire d'Informatique de Grenoble
4-
(http://www.liglab.fr)
1+
COPYRIGHT AND LICENSE
2+
=====================
3+
4+
Unless stated differently in a file itself, all files in OAR source tree are:
5+
- Copyright 2003-2016 Laboratoire d'Informatique de Grenoble (http://www.liglab.fr)
56
- Licensed under the GNU General Public License Version 2 or above (GPL-2+)
67

78

89
License: GPL-2+
9-
This program is free software; you can redistribute it and/or modify it under
10-
the terms of the GNU General Public License as published by the Free Software
11-
Foundation; either version 2 of the License, or (at your option) any later
12-
version.
10+
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.
1311

14-
This program is distributed in the hope that it will be useful, but WITHOUT
15-
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16-
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
12+
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
1713

18-
You should have received a copy of the GNU General Public License along with
19-
this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
20-
St, Fifth Floor, Boston, MA 02110-1301 USA
14+
You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2115

2216

23-
The full text of the GNU General Public License version 2 can be found at:
24-
http://www.gnu.org/licenses/gpl-2.0.html
17+
The full text of the GNU General Public License version 2 can be found at: http://www.gnu.org/licenses/gpl-2.0.html

INSTALL

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ Installation
44
Overview
55
--------
66

7-
There are currently 3 methods to install OAR::
7+
There are currently 3 methods to install OAR:
88

9-
- from the Debian packages
10-
- from the RPM packages
11-
- from sources
9+
- from the Debian packages
10+
- from the RPM packages
11+
- from sources
1212

1313

1414
Before going further, please have in mind OAR's architecture. A common OAR
15-
installation is composed of::
15+
installation is composed of:
1616

17-
- a **server** which will hold all of OAR "smartness". That host will run
18-
the OAR server daemon;
19-
- one or more **frontends**, which users will have to login to, in order
20-
to reserve computing nodes (oarsub, oarstat, oarnodes, ...);
21-
- **computing nodes** (or basically *nodes*), where the jobs will execute;
22-
- optionally a **visualisation server** which will host the
23-
visualisation webapps (monika, drawgantt, ...);
24-
- optionally an **API server**, which will host OAR restful API service.
17+
- a **server** which will hold all of OAR "smartness". That host will run
18+
the OAR server daemon;
19+
- one or more **frontends**, which users will have to login to, in order
20+
to reserve computing nodes (oarsub, oarstat, oarnodes, ...);
21+
- **computing nodes** (or basically *nodes*), where the jobs will execute;
22+
- optionally a **visualisation server** which will host the
23+
visualisation webapps (monika, drawgantt, ...);
24+
- optionally an **API server**, which will host OAR restful API service.
2525

2626
Many OAR data are stored and archived in a database: you have the choice to use
2727
either PostgreSQL or MySQL. We recommend using **PostgreSQL**.
@@ -291,9 +291,9 @@ In case you've installed a PostgreSQL database remotely, if your PostgreSQL
291291
installation doesn't authorize the local connections by default, you need to
292292
enable the connections to this database for the oar users. Assuming the OAR
293293
server has the address <OAR_SERVER>, you can add the following lines in the
294-
``pg_hba.conf`` file:
294+
``pg_hba.conf`` file::
295295

296-
# in /etc/postgresql/8.1/main/pg_hba.conf or /var/lib/pgsql/data/pg_hba.conf
296+
# in /etc/postgresql/8.1/main/pg_hba.conf or /var/lib/pgsql/data/pg_hba.conf
297297
host oar oar_ro <OAR_SERVER>/32 md5
298298
host oar oar <OAR_SERVER>/32 md5
299299

@@ -307,9 +307,9 @@ http://taktuk.gforge.inria.fr.
307307
Then, you have to edit your oar configuration file and fill in the related
308308
parameters:
309309

310-
- TAKTUK_CMD (the path to the taktuk command)
311-
- PINGCHECKER_TAKTUK_ARG_COMMAND (the command used to check resources states)
312-
- SCHEDULER_NODE_MANAGER_SLEEP_CMD (command used for halting nodes)
310+
- ``TAKTUK_CMD`` (the path to the taktuk command)
311+
- ``PINGCHECKER_TAKTUK_ARG_COMMAND`` (the command used to check resources states)
312+
- ``SCHEDULER_NODE_MANAGER_SLEEP_CMD`` (command used for halting nodes)
313313

314314
CPUSET feature
315315
~~~~~~~~~~~~~~
@@ -330,31 +330,31 @@ To activate this feature, you have to:
330330
- provide 2 commands or scripts which will be executed on the oar server
331331
to shutdown (or set into standby) some nodes and to wake-up some nodes
332332
(configure the path of those commands into the
333-
ENERGY_SAVING_NODE_MANAGER_WAKE_UP_CMD and
334-
ENERGY_SAVING_NODE_MANAGER_SHUT_DOWN_CMD variables into oar.conf)
333+
``ENERGY_SAVING_NODE_MANAGER_WAKE_UP_CMD`` and
334+
``ENERGY_SAVING_NODE_MANAGER_SHUT_DOWN_CMD`` variables in oar.conf)
335335
Thes 2 commands are executed by the oar user.
336-
- configure the "available_upto" property of all your nodes:
336+
- configure the ``available_upto`` property of all your nodes:
337337

338-
- available_upto=0 : to disable the wake-up and halt
339-
- available_upto=1 : to disable the wake-up (but not the halt)
340-
- available_upto=2147483647 : to disable the halt (but not the wake-up)
341-
- available_upto=2147483646 : to enable wake-up/halt forever
342-
- available_upto=<timestamp> : to enable the halt, and the wake-up until
338+
- ``available_upto=0`` : to disable the wake-up and halt
339+
- ``available_upto=1`` : to disable the wake-up (but not the halt)
340+
- ``available_upto=2147483647`` : to disable the halt (but not the wake-up)
341+
- ``available_upto=2147483646`` : to enable wake-up/halt forever
342+
- ``available_upto=<timestamp>`` : to enable the halt, and the wake-up until
343343
the date given by <timestamp>
344344

345345
Ex: to enable the feature on every nodes forever:
346346
::
347347

348348
oarnodesetting --sql true -p available_upto=2147483646
349349

350-
- activate the energy saving module by setting ENERGY_SAVING_INTERNAL="yes"
351-
and configuring the ENERGY_* variables into oar.conf
352-
- configure the metascheduler time values into SCHEDULER_NODE_MANAGER_IDLE_TIME,
353-
SCHEDULER_NODE_MANAGER_SLEEP_TIME and SCHEDULER_NODE_MANAGER_WAKEUP_TIME
350+
- activate the energy saving module by setting ``ENERGY_SAVING_INTERNAL="yes"``
351+
and configuring the ``ENERGY_*`` variables into oar.conf
352+
- configure the metascheduler time values into ``SCHEDULER_NODE_MANAGER_IDLE_TIME``,
353+
``SCHEDULER_NODE_MANAGER_SLEEP_TIME`` and ``SCHEDULER_NODE_MANAGER_WAKEUP_TIME``
354354
variables of the oar.conf file.
355355
- restart the oar server (you should see an "Almighty" process more).
356356

357-
You need to restart OAR each time you change an ENERGY_* variable.
357+
You need to restart OAR each time you change an ``ENERGY_*`` variable.
358358
More informations are available inside the oar.conf file itself. For more
359359
details about the mechanism, take a look at the "Hulot" module documentation.
360360

@@ -618,8 +618,8 @@ ___________
618618

619619
OAR provides two webapp tools for visualizing the resources utilization::
620620

621-
- monika which displays the current state of resources as well as all running and waiting jobs
622-
- drawgantt-svg which displays gantt chart of nodes and jobs for the past and future.
621+
- monika which displays the current state of resources as well as all running and waiting jobs
622+
- drawgantt-svg which displays gantt chart of nodes and jobs for the past and future.
623623

624624
Installation from the packages
625625
______________________________

docs/source/changelog.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33

44
.. _changelogfile-anchor:
55

6+
.. note::
7+
For information about OAR release versions with changelogs along with errata and known bugs, see https://oar.imag.fr/oar_versions. This page only shows changelogs.
8+
69
.. include:: ../../CHANGELOG

docs/source/index.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This documentation is organized into a few different sections below:
1414
* :ref:`ref-admin-docs`
1515
* :ref:`ref-dev-docs`
1616
* :ref:`Changelog <changelogfile-anchor>`.
17-
* :ref:`License <licensefile-anchor>`.
17+
* :ref:`Copyright and license <licensefile-anchor>`.
1818

1919
.. _ref-user-docs:
2020

@@ -56,6 +56,5 @@ Admin Documentation
5656
Developer Documentation
5757
=======================
5858

59-
.. note::
60-
This documentation is currently being written...
59+
See the wiki section of OAR website: http://oar.imag.fr/wiki:start
6160

docs/source/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
.. _licensefile-anchor:
55

6-
.. include:: ../../LICENSE
6+
.. include:: ../../COPYRIGHT

0 commit comments

Comments
 (0)