SCHEDULING-2004 data/ and logs/ folder

src/docs/admin/ProActiveAdminGuide.adoc

@@ -53,17 +53,17 @@ TIP: If the command +jrunscript+ cannot be found, http://docs.oracle.com/javase/
 Running Resource Manager process ...
 > Starting the resource manager...
 > The resource manager with 4 local nodes created on pnp://SCHEDULER_ADDRESS:64738/
-Resource Manager stdout/stderr redirected into /home/user/proactive_scheduling/.logs/RM-stdout.log
+Resource Manager stdout/stderr redirected into /home/user/proactive_scheduling/logs/RM-stdout.log
 
 Running Scheduler process ...
 > RM URL : pnp://SCHEDULER_ADDRESS:64738
 > Starting the scheduler...
 > Connecting to the resource manager on pnp://SCHEDULER_ADDRESS:64738
 > The scheduler created on pnp://SCHEDULER_ADDRESS:52845/
-Scheduler stdout/stderr redirected into /home/user/proactive_scheduling/.logs/Scheduler-stdout.log
+Scheduler stdout/stderr redirected into /home/user/proactive_scheduling/logs/Scheduler-stdout.log
 
 Running Jetty process ...
-Jetty stdout/stderr redirected into /home/user/proactive_scheduling/.logs/Jetty-stdout.log
+Jetty stdout/stderr redirected into /home/user/proactive_scheduling/logs/Jetty-stdout.log
 Waiting for jetty to start ...
 Rest Server webapp deployed at      http://SCHEDULER_ADDRESS:8080/rest
 Resource Manager webapp deployed at http://SCHEDULER_ADDRESS:8080/rm
@@ -739,7 +739,7 @@ MBean server can be accessed by remote applications using one of the two availab
 
 The name of the connector (JMXRMAgent by default) is defined by the property +rm.jmx.connectorname+.
 
-The JMX url to connect to can be obtained from the Authentication API of the Resource Manager or by reading the log file located in +PROACTIVE_HOME/.logs/RM.log+.
+The JMX url to connect to can be obtained from the Authentication API of the Resource Manager or by reading the log file located in +PROACTIVE_HOME/logs/RM.log+.
 In that log file, the address you have to retrieve is the one where the JMX RMI connector server has been started
 
 [source]
@@ -788,11 +788,11 @@ The accounting information can be accessed only through a *JMX client* or the Pr
 === Logs
 
 If something goes wrong the first place to look for the problem are the Scheduler logs. By default all logs are in
-+PROACTIVE_HOME/.logs+ directory :
++PROACTIVE_HOME/logs+ directory :
 
 * for problems related to nodes deployment or permissions please check
-+PROACTIVE_HOME/.logs/RM.log+
-* for the problems related to jobs execution please check +PROACTIVE_HOME/.logs/Scheduler.log+
++PROACTIVE_HOME/logs/RM.log+
+* for the problems related to jobs execution please check +PROACTIVE_HOME/logs/Scheduler.log+
 
 Users submitting jobs have access to server logs of their jobs through the *Scheduler Web interface*
 

src/docs/admin/references/RMPropertiesReference.adoc

@@ -166,5 +166,5 @@ pa.rm.topology.pinger.class=org.ow2.proactive.resourcemanager.frontend.topology.
 #pa.rm.topology.pinger.class=org.ow2.proactive.resourcemanager.frontend.topology.pinging.NodesPinger
 
 # Location of selection scripts logs (comment to disable job logging to separate files). Can be an absolute path.
-pa.rm.logs.selection.location=.logs/jobs/
+pa.rm.logs.selection.location=logs/jobs/
 ----
\ No newline at end of file

src/docs/admin/references/SchedulerPropertiesReference.adoc

@@ -130,7 +130,7 @@ pa.scheduler.task.scripttasks.fork=true
 # 2) If a "pa.scheduler.dataspace.defaultinput.url" is not provided, the defaultinput.path property will tell the scheduler
 #   to start a FileSystemServer on the provided defaultinput.path instead of its default location
 
-### the default location is TEMP/scheduling/defaultinput
+### the default location is SCHEDULER_HOME/data/defaultinput
 #pa.scheduler.dataspace.defaultinput.localpath=
 
 # Host name from which the localpath is accessible, it must be provided if the localpath property is provided
@@ -139,14 +139,14 @@ pa.scheduler.task.scripttasks.fork=true
 # The same for the OUPUT (see above explanations in the INPUT SPACE section)
 # (concerning the syntax, see above explanations in the INPUT SPACE section)
 #pa.scheduler.dataspace.defaultoutput.url=
-### the default location is TEMP/scheduling/defaultoutput
+### the default location is SCHEDULER_HOME/data/defaultoutput
 #pa.scheduler.dataspace.defaultoutput.localpath=
 #pa.scheduler.dataspace.defaultoutput.hostname=
 
 # The same for the GLOBAL space. The GLOBAL space is shared between each users and each jobs.
 # (concerning the syntax, see above explanations in the INPUT SPACE section)
 #pa.scheduler.dataspace.defaultglobal.url=
-### the default location is TEMP/scheduling/defaultglobal
+### the default location is SCHEDULER_HOME/data/defaultglobal
 #pa.scheduler.dataspace.defaultglobal.localpath=
 #pa.scheduler.dataspace.defaultglobal.hostname
 
@@ -154,7 +154,7 @@ pa.scheduler.task.scripttasks.fork=true
 # Only one file server will be created (if not provided)
 # (concerning the syntax, see above explanations in the INPUT SPACE section)
 #pa.scheduler.dataspace.defaultuser.url=
-### the default location is TEMP/scheduling/defaultuser
+### the default location is SCHEDULER_HOME/data/defaultuser
 #pa.scheduler.dataspace.defaultuser.localpath=
 #pa.scheduler.dataspace.defaultuser.hostname=
 
@@ -170,7 +170,7 @@ pa.scheduler.task.scripttasks.fork=true
 # set this property to empty string to disable log forwarding alltogether
 pa.scheduler.logs.provider=org.ow2.proactive.scheduler.common.util.logforwarder.providers.ProActiveBasedForwardingProvider
 # Location of server jobs logs (comment to disable job logging to separate files). Can be an absolute path.
-pa.scheduler.job.logs.location=.logs/jobs/
+pa.scheduler.job.logs.location=logs/jobs/
 
 #-------------------------------------------------------
 #-----------   AUTHENTICATION PROPERTIES   -------------

src/docs/user/ProActiveUserGuide.adoc

@@ -165,24 +165,55 @@ them to parameterize workflow execution and use workflows as templates.
 
 During their execution, jobs and tasks go through different states:
 
-* +PENDING+: The job is waiting to be scheduled.
-* +RUNNING+: The job is running. At least one of its task has been scheduled.
-* +STALLED+: The job has been launched but no task is currently running.
-* +FINISHED+:The job is finished. All tasks are finished.
-* +PAUSED+: The job is paused waiting for user to resume it.
-* +CANCELED+: The job has been canceled because of an exception.
+.Job States
+[cols="1,10", options="header"]
+|===
+| State | Description |
+ +PENDING+| The job is waiting to be scheduled.|
+ +RUNNING+| The job is running. At least one of its task has been scheduled.|
+ +STALLED+| The job has been launched but no task is currently running.|
+ +FINISHED+|The job is finished. All tasks are finished.|
+ +PAUSED+| The job is paused waiting for user to resume it.|
+ +CANCELED+| The job has been canceled because of an exception.
 This status is used when an exception is thrown by the user code of a task
-and when the user has asked to cancel the job on exception.
-* +FAILED+: The job has failed. One or more tasks have failed (due to resources failure).
-There is no more executionOnFailure left for a task.
-* +KILLED+: The job has been killed by the user.
+and when the user has asked to cancel the job on exception.|
+ +FAILED+| The job has failed. One or more tasks have failed (due to resources failure).
+There is no more executionOnFailure left for a task.|
+ +KILLED+| The job has been killed by the user.|
+|===
+
+
+.Task States
+[cols="1,10", options="header"]
+|===
+| State | Description |
+ +SUBMITTED+| The task has just been submitted by the user.|
+ +PENDING+| The task is in the scheduler pending queue.|
+ +PAUSED+| The task is paused.|
+ +RUNNING+|The task is executing.|
+ +WAITING_ON_ERROR+| The task is waiting for restart after an error. (ie:native code != 0 or exception).|
+ +WAITING_ON_FAILURE+| The task is waiting for restart after a failure. (ie:node down). |
+ +FAILED+| The task is failed
+(only if max execution time has been reached and the node on which it was started is down).|
+ +NOT_STARTED+| The task could not be started.
+It means that the task could not be started due to
+ dependencies failure.|
+ +NOT_RESTARTED+ | The task could not be restarted.
+ It means that the task could not be restarted after an error
+ during the previous execution. |
+ +ABORTED+ | The task has been aborted by an exception on an other task while the task is running. (job is cancelOnError=true).
+ Can be also in this status if the job is killed while the concerned task was running. |
+ +FAULTY+ | The task has finished execution with error code (!=0) or exception. |
+ +FINISHED+ | The task has finished execution. |
+ +SKIPPED+ | The task was not executed: it was the non-selected branch of an IF/ELSE control flow action. |
+|===
 
 // TODO state diagram
 
 ==== Retrieve results
 
 Once a job or a task is terminated, it is possible to get its result. You can only get the result of the job that you own.
-Results can be retrieved using the Scheduler web interface or the command line tools.
+Results can be retrieved using the Scheduler Web Interface or the command line tools.
 
 Along with results you can also retrieve logs of the tasks (standard ouput and error output)
 as well as Scheduler logs that provide debugging information.
@@ -290,10 +321,10 @@ your data. It has two types of storage on the host where the server is running:
 * A *Global Space* where anyone can read/write files
 * An *User Space* which is a personal user data storage
 
-By default these spaces are linked to folders in the *temporary* directory of the ProActive Scheduler host:
+By default these spaces are linked to folders in the *data* directory of the ProActive Scheduler host:
 
- * +TEMP_DIR/scheduling/defaultglobal+
- * +TEMP_DIR/scheduling/defaultuser+
+ * +PROACTIVE_HOME/data/defaultglobal+
+ * +PROACTIVE_HOME/data/defaultuser+
 
 But it can be changed in +PROACTIVE_HOME/config/scheduler/settings.ini+.