diff --git a/doc/execo_g5k.rst b/doc/execo_g5k.rst
index 052b497e85b98d953325faf9806441e766938129..c439f70f6cd7bd7aaedc391b2d82c7facc964426 100644
--- a/doc/execo_g5k.rst
+++ b/doc/execo_g5k.rst
@@ -60,37 +60,6 @@ oarsubgrid
----------
.. autofunction:: execo_g5k.oar.oarsubgrid
-OARGRID functions
-=================
-
-oargridsub
-----------
-.. autofunction:: execo_g5k.oargrid.oargridsub
-
-oargriddel
-----------
-.. autofunction:: execo_g5k.oargrid.oargriddel
-
-get_current_oargrid_jobs
-------------------------
-.. autofunction:: execo_g5k.oargrid.get_current_oargrid_jobs
-
-get_oargrid_job_info
---------------------
-.. autofunction:: execo_g5k.oargrid.get_oargrid_job_info
-
-get_oargrid_job_oar_jobs
-------------------------
-.. autofunction:: execo_g5k.oargrid.get_oargrid_job_oar_jobs
-
-wait_oargrid_job_start
-----------------------
-.. autofunction:: execo_g5k.oargrid.wait_oargrid_job_start
-
-get_oargrid_job_nodes
----------------------
-.. autofunction:: execo_g5k.oargrid.get_oargrid_job_nodes
-
kadeploy3
=========
@@ -341,17 +310,15 @@ Its default values are:
OAR keys
========
-Oar/oargrid by default generate job specific ssh keys. So by default,
-one has to retrieve these keys and explicitely use them for connecting
-to the jobs, which is painfull. Another possibility is to tell
-oar/oargrid to use specific keys. Oar can automatically use the key
-pointed to by the environement variable ``OAR_JOB_KEY_FILE`` if it is
-defined. Oargrid does not automatically use this key, but execo also
-takes care of explicitely telling oargrid to use it if it is
-defined. So the most convenient way to use execo/oar/oargrid, is to
-set ``OAR_JOB_KEY_FILE`` in your ``~/.profile`` to point to your
-internal Grid5000 ssh key and export this environment variable, or use
-the ``oar_job_key_file`` in `execo_g5k.config.g5k_configuration`.
+Oar by default generate job specific ssh keys. So by default, one has
+to retrieve these keys and explicitely use them for connecting to the
+jobs, which is painfull. Another possibility is to tell oar to use
+specific keys. Oar can automatically use the key pointed to by the
+environement variable ``OAR_JOB_KEY_FILE`` if it is defined. So the
+most convenient way to use execo/oar, is to set ``OAR_JOB_KEY_FILE``
+in your ``~/.profile`` to point to your internal Grid5000 ssh key and
+export this environment variable, or use the ``oar_job_key_file`` in
+`execo_g5k.config.g5k_configuration`.
Running from another host than a frontend
=========================================
diff --git a/doc/userguide.rst b/doc/userguide.rst
index fd05c398ea4a65a5ab9c12ef172f3daab2ae608e..25d3413ceb68643773c5a2cf4de5b153cda4ffdc 100644
--- a/doc/userguide.rst
+++ b/doc/userguide.rst
@@ -359,14 +359,6 @@ API to use Grid5000 services:
- wait oar job start, get oar job nodes
-- oargrid
-
- - oargridsub, oargriddel
-
- - get current oargrid jobs
-
- - wait oargrid job start, get oargrid job nodes
-
- kadeploy3
- deploy: clever kadeploy: automatically avoids to deploy already
@@ -499,8 +491,7 @@ This code shows:
- how to append a `execo.process.Process` ``stdout_handler`` which
redirects output to a file.
-- how to take care of releasing the oargridjob with a try/finally
- block.
+- how to take care of releasing the oar job with a try/finally block.
After running this code, you get in the current directory on localhost
a file for each remote hosts containing the scaling governors,
@@ -508,10 +499,9 @@ hyperthreading state, c-states state, turboboost state (easy to check
if they are all the same with ``cat * | sort -u``)
Note that with this kind of code, there is still the possibility that
-the oar or oargrid reservation fails, since oar is not transactional,
-and someone can still reserve some resources between the moment we
-inquire the available resources and the moment we perform the
-reservation.
+the oar reservations fails, since oar is not transactional, and
+someone can still reserve some resources between the moment we inquire
+the available resources and the moment we perform the reservation.
The planning module has several possibilities and modes, see its
documentation for further reference.
@@ -545,8 +535,9 @@ could probably be increased on a node where you have root
permissions).
This example also show using `execo_g5k.oar.oarsubgrid` instead of
-`execo_g5k.oargrid.oargridsub`. They are similar but oarsubgrid
-bypasses oargrid and directly performs parallel oar submissions.
+oargridsub (a tool that existed in g5k a long time ago). They are
+similar but oarsubgrid bypasses oargrid and directly performs parallel
+oar submissions.
Compare ChainPut and parallel scp performances on many hosts on Grid5000
@@ -567,9 +558,9 @@ hosts, you should run this code from a compute node, not the frontend
In this example, we use ``oarsh``. One of the constraints imposed by
``Taktuk`` is that any node of the connection tree must be able to
-connect to any other. As the oargrid job key is only available on the
-frontend on which the oargrid submission was done, we must propagate
-this key to all nodes. This can be done with ``Taktuk`` option
+connect to any other. As the oar job key is only available on the
+frontend on which the oar submission was done, we must propagate this
+key to all nodes. This can be done with ``Taktuk`` option
``-S``. Alternatively, this is not needed if setting
``$OAR_JOB_KEY_FILE`` in your environnement, or setting
``g5k_configuration['oar_job_key_file']``, as described in
@@ -728,11 +719,11 @@ and debugger.
Using yaml for storing the results allows incrementally appending to
the file, and has the benefit of a human readable file. If there is an
-error during the experiment (such as the end of the oargrid
-reservation), the experiment can later be restarted in the same result
-directory with option ``-C``, continuing from where it stopped. It is
-even possible to change the parameter combinations, only the yet
-undone combinations will be done.
+error during the experiment (such as the end of the oar reservation),
+the experiment can later be restarted in the same result directory
+with option ``-C``, continuing from where it stopped. It is even
+possible to change the parameter combinations, only the yet undone
+combinations will be done.
Below is an example showing how to load the results and draw a graph:
diff --git a/src/execo_g5k/__init__.py b/src/execo_g5k/__init__.py
index dc4ac39f13279e052178bb6afc55e49c89a76582..4ef9a30e3e8b6e4be5faf6feed77c1d41d68a488 100644
--- a/src/execo_g5k/__init__.py
+++ b/src/execo_g5k/__init__.py
@@ -25,11 +25,6 @@ from .oar import OarSubmission, oarsub, oardel, get_current_oar_jobs, \
get_oar_job_info, wait_oar_job_start, get_oar_job_nodes, \
get_oar_job_subnets, get_oar_job_kavlan, oarsubgrid
-from .oargrid import oargridsub, oargriddel, \
- get_current_oargrid_jobs, get_oargrid_job_info, \
- get_oargrid_job_oar_jobs, wait_oargrid_job_start, \
- get_oargrid_job_nodes, get_oargrid_job_key
-
from .kadeploy import Deployment, Kadeployer, deploy, KaconsoleProcess
from .utils import get_kavlan_host_name, G5kAutoPortForwarder
diff --git a/src/execo_g5k/charter.py b/src/execo_g5k/charter.py
index 48c6d0a23ce725a4e407e83fe1a0e0f5aba6731d..a648b374719f8101272c878f60f639331c791d52 100644
--- a/src/execo_g5k/charter.py
+++ b/src/execo_g5k/charter.py
@@ -93,11 +93,11 @@ def _next_work_day(d):
return d
def unixts_to_oar_datetime(ts):
- """Convert a timestamp to a naive datetime (no tz attached) in the g5k oar/oargrid timezone Europe/Paris."""
+ """Convert a timestamp to a naive datetime (no tz attached) in the g5k oar timezone Europe/Paris."""
return datetime.datetime.strptime(format_oar_date(ts), "%Y-%m-%d %H:%M:%S")
def oar_datetime_to_unixts(dt):
- """Convert a naive datetime (no tz attached) in the g5k oar/oargrid timezone Europe/Paris to a unix timestamp."""
+ """Convert a naive datetime (no tz attached) in the g5k oar timezone Europe/Paris to a unix timestamp."""
# forking code because modifying os.environ["TZ"] and calling
# time.tzset() is not thread-safe
rend, wend = os.pipe()
diff --git a/src/execo_g5k/oar.py b/src/execo_g5k/oar.py
index dc9c6781dfdd7c462e78b17ed0d35b50b1d77eff..75a3ee5a066850855ca252fe031c3dde0f713ddd 100644
--- a/src/execo_g5k/oar.py
+++ b/src/execo_g5k/oar.py
@@ -39,9 +39,9 @@ def _date_in_range(date, date_range):
return True
def format_oar_date(ts):
- """Return a string with the formatted date (year, month, day, hour, min, sec, ms) formatted for oar/oargrid.
+ """Return a string with the formatted date (year, month, day, hour, min, sec, ms) formatted for oar.
- timezone is forced to Europe/Paris, and timezone info is discarded, for g5k oar/oargrid.
+ timezone is forced to Europe/Paris, and timezone info is discarded, for g5k oar.
:param tz: a date in one of the formats handled.
"""
@@ -66,7 +66,7 @@ def format_oar_date(ts):
return formatted_time
def format_oar_duration(duration):
- """Return a string with a formatted duration (hours, mins, secs, ms) formatted for oar/oargrid.
+ """Return a string with a formatted duration (hours, mins, secs, ms) formatted for oar.
:param duration: a duration in one of the formats handled.
"""
@@ -90,9 +90,9 @@ def format_oar_duration(duration):
return formatted_duration
def oar_date_to_unixts(date):
- """Convert a date in the format returned by oar/oargrid to an unix timestamp.
+ """Convert a date in the format returned by oar to an unix timestamp.
- Timezone of g5k oar/oargrid timestamps is Europe/Paris."""
+ Timezone of g5k oar timestamps is Europe/Paris."""
# forking code because modifying os.environ["TZ"] and calling
# time.tzset() is not thread-safe
rend, wend = os.pipe()
@@ -112,7 +112,7 @@ def oar_date_to_unixts(date):
return ts
def oar_duration_to_seconds(duration):
- """Convert a duration in the format returned by oar/oargrid to a number of seconds."""
+ """Convert a duration in the format returned by oar to a number of seconds."""
return str_duration_to_seconds(duration)
class OarSubmission(object):
@@ -712,21 +712,18 @@ def oarsubgrid(job_specs, reservation_date = None,
additional_options = None,
frontend_connection_params = None,
timeout = False):
- """Similar to `execo_g5k.oargrid.oargridsub`, but instead of performing an oargrid reservation, it performs parallel oar submissions.
+ """Similar to oargrid, but with parallel oar submissions.
The only difference for the user is that it returns a list of
- tuples (oarjob id, frontend) (as `execo_g5k.oar.oarsub`) instead
+ tuples (oarjob id, frontend) instead
of an oargrid job id. It should run faster (since oar submission
are performed in parallel instead of sequentially, and also
- because it bypasses the oargrid layer). As with
- `execo_g5k.oargrid.oargridsub`, all parameters reservation_date,
+ because it bypasses the oargrid layer). All parameters reservation_date,
walltime, job_type, queue, directory, additional_options from
job_specs are ignored and replaced by the arguments passed. As for
oargridsub, all job submissions must succeed. If at least one job
submission fails, all other jobs are deleted, and it returns an
empty list.
-
- for parameter details, see `execo_g5k.oargrid.oargridsub`.
"""
for job in job_specs:
job[0].reservation_date = reservation_date
diff --git a/src/execo_g5k/oargrid.py b/src/execo_g5k/oargrid.py
deleted file mode 100644
index cf76bbdcbeb1671d6cda9fe3876eb1fe88f0be47..0000000000000000000000000000000000000000
--- a/src/execo_g5k/oargrid.py
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 2009-2024 INRIA Rhone-Alpes, Service Experimentation et
-# Developpement
-#
-# This file is part of Execo.
-#
-# Execo 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 3 of the License, or
-# (at your option) any later version.
-#
-# Execo 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with Execo. If not, see <http://www.gnu.org/licenses/>
-
-from .config import g5k_configuration
-from execo.config import make_connection_params
-from execo.exception import ProcessesFailed
-from execo.host import Host
-from execo.process import get_process
-from execo.time_utils import get_unixts, sleep
-from execo_g5k.config import default_frontend_connection_params
-from execo_g5k.utils import get_frontend_host
-from .oar import format_oar_date, format_oar_duration, _date_in_range, \
- oar_date_to_unixts, oar_duration_to_seconds
-from .api_utils import get_g5k_sites, get_cluster_site
-import os
-import re
-
-def _quote_hack(rdef):
- return rdef.replace('{', '{\\\\\\\\\\\\\\"').replace('}', '\\\\\\\\\\\\\\"}')
-
-def get_oargridsub_commandline(job_specs, reservation_date = None,
- walltime = None, job_type = None,
- queue = None, directory = None,
- additional_options = None):
- oargridsub_cmdline = 'oargridsub -v'
- key = g5k_configuration.get('oar_job_key_file')
- if key == None:
- key = os.environ.get('OAR_JOB_KEY_FILE')
- if key != None:
- oargridsub_cmdline += ' -i %s' % (key,)
- if reservation_date:
- oargridsub_cmdline += ' -s "%s"' % (format_oar_date(reservation_date),)
- if queue != None:
- oargridsub_cmdline += ' -q "%s"' % (queue,)
- if job_type != None:
- oargridsub_cmdline += ' -t "%s"' % (job_type,)
- if walltime != None:
- oargridsub_cmdline += ' -w "%s"' % (format_oar_duration(walltime),)
- if directory != None:
- oargridsub_cmdline += ' -d "%s"' % (directory,)
- if additional_options != None:
- oargridsub_cmdline += ' %s' % (additional_options,)
- firstclusteralias = True
- for (spec, clusteralias) in job_specs:
- if firstclusteralias:
- firstclusteralias = False
- oargridsub_cmdline += ' '
- else:
- oargridsub_cmdline += ','
- oargridsub_cmdline += '%s:rdef="%s"' % (clusteralias, _quote_hack(spec.resources))
- if spec.job_type != None:
- oargridsub_cmdline += ':type="%s"' % (spec.job_type,)
- if spec.sql_properties != None:
- oargridsub_cmdline += ':prop="%s"' % (spec.sql_properties,)
- if spec.name != None:
- oargridsub_cmdline += ':name="%s"' % (spec.name,)
- return oargridsub_cmdline
-
-def oargridsub(job_specs, reservation_date = None,
- walltime = None, job_type = None,
- queue = None, directory = None,
- additional_options = None,
- frontend_connection_params = None,
- timeout = False):
- """Submit oargrid jobs.
-
- :param job_specs: iterable of tuples (OarSubmission,
- clusteralias). Reservation date, walltime, queue, directory,
- project, additional_options, command of the OarSubmission are
- ignored.
-
- :param reservation_date: grid job reservation date. Default: now.
-
- :param walltime: grid job walltime.
-
- :param job_type: type of job for all clusters: deploy, besteffort,
- cosystem, checkpoint, timesharing.
-
- :param queue: oar queue to use.
-
- :param directory: directory where the reservation will be
- launched.
-
- :param additional_options: passed directly to oargridsub on the
- command line.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
-
- Returns a tuple (oargrid_job_id, ssh_key), or (None, None) if
- error.
-
- Note that, as oargrid does not handle correctly quoting sql
- clauses enclosed inside braces, this function tries to
- automatically overcome this limitation by adding some, with the
- right escaping (backslashes). Also, note that oargrid's command
- line parser does not handle correctly commas in sql clauses
- enclosed inside braces, as it considers it as a rdef
- separator. This prevents, for example, using comma separated list
- values for ``NOT IN`` clauses.
- """
- if isinstance(timeout, bool) and timeout == False:
- timeout = g5k_configuration.get('default_timeout')
- oargridsub_cmdline = get_oargridsub_commandline(job_specs, reservation_date,
- walltime, job_type, queue,
- directory, additional_options)
- process = get_process(oargridsub_cmdline,
- host = get_frontend_host(),
- connection_params = make_connection_params(frontend_connection_params,
- default_frontend_connection_params))
- process.timeout = timeout
- process.pty = True
- process.run()
- job_id = None
- ssh_key = None
- if process.ok:
- mo = re.search(r'^\[OAR_GRIDSUB\] Grid reservation id = (\d+)\s*$', process.stdout, re.MULTILINE)
- if mo != None:
- job_id = int(mo.group(1))
- mo = re.search(r'^\[OAR_GRIDSUB\] SSH KEY : (\S*)\s*$', process.stdout, re.MULTILINE)
- if mo != None:
- ssh_key = mo.group(1)
- if job_id != None:
- return (job_id, ssh_key)
- else:
- return (None, None)
-
-def oargriddel(job_ids, frontend_connection_params = None, timeout = False):
- """Delete oargrid jobs.
-
- Ignores any error, so you can delete inexistant jobs, already
- deleted jobs, or jobs that you don't own. Those deletions will be
- ignored.
-
- :param job_ids: iterable of oar grid job ids.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use ``g5k_configuration['default_timeout']``. None means no
- timeout.
- """
- if isinstance(timeout, bool) and timeout == False:
- timeout = g5k_configuration.get('default_timeout')
- processes = []
- for job_id in job_ids:
- p = get_process("oargriddel %i" % (job_id,),
- host = get_frontend_host(),
- connection_params = make_connection_params(frontend_connection_params,
- default_frontend_connection_params))
- p.timeout = timeout
- p.nolog_exit_code = True
- p.pty = True
- processes.append(p)
- for process in processes: process.start()
- for process in processes: process.wait()
-
-def get_current_oargrid_jobs(start_between = None,
- end_between = None,
- frontend_connection_params = None,
- timeout = False):
- """Return a list of current active oargrid job ids.
-
- :param start_between: a tuple (low, high) of endpoints. Filters
- and returns only jobs whose start date is in between these
- endpoints.
-
- :param end_between: a tuple (low, high) of endpoints. Filters and
- returns only jobs whose end date is in between these endpoints.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
- """
- if isinstance(timeout, bool) and timeout == False:
- timeout = g5k_configuration.get('default_timeout')
- if start_between: start_between = [ get_unixts(t) for t in start_between ]
- if end_between: end_between = [ get_unixts(t) for t in end_between ]
- process = get_process("oargridstat",
- host = get_frontend_host(),
- connection_params = make_connection_params(frontend_connection_params,
- default_frontend_connection_params))
- process.timeout = timeout
- process.pty = True
- process.run()
- if process.ok:
- jobs = re.findall(r'Reservation # (\d+):', process.stdout, re.MULTILINE)
- oargrid_job_ids = [ int(j) for j in jobs ]
- if start_between or end_between:
- filtered_job_ids = []
- for job in oargrid_job_ids:
- info = get_oargrid_job_info(job, timeout)
- if (_date_in_range(info['start_date'], start_between)
- and _date_in_range(info['start_date'] + info['walltime'], end_between)):
- filtered_job_ids.append(job)
- oargrid_job_ids = filtered_job_ids
- return oargrid_job_ids
- else:
- raise ProcessesFailed([process])
-
-def get_oargrid_job_info(oargrid_job_id = None, frontend_connection_params = None, timeout = False):
- """Return a dict with informations about an oargrid job.
-
- :param oargrid_job_id: the oargrid job id.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
-
- Hash returned contains these keys:
-
- - ``start_date``: unix timestamp of job's start date
-
- - ``walltime``: job's walltime in seconds
-
- - ``user``: job's user
- """
- if isinstance(timeout, bool) and timeout == False:
- timeout = g5k_configuration.get('default_timeout')
- process = get_process("oargridstat %i" % (oargrid_job_id,),
- host = get_frontend_host(),
- connection_params = make_connection_params(frontend_connection_params,
- default_frontend_connection_params))
- process.timeout = timeout
- process.pty = True
- process.run()
- job_info = dict()
- start_date_result = re.search(r'start date : (\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)', process.stdout, re.MULTILINE)
- if start_date_result:
- start_date = oar_date_to_unixts(start_date_result.group(1))
- job_info['start_date'] = start_date
- walltime_result = re.search(r'walltime : (\d+:\d?\d:\d?\d)', process.stdout, re.MULTILINE)
- if walltime_result:
- walltime = oar_duration_to_seconds(walltime_result.group(1))
- job_info['walltime'] = walltime
- user_result = re.search(r'user : (\S+)', process.stdout, re.MULTILINE)
- if user_result:
- user = user_result.group(1)
- job_info['user'] = user
- return job_info
-
-def get_oargrid_job_oar_jobs(oargrid_job_id = None, frontend_connection_params = None, timeout = False):
- """Return a list of tuples (oar job id, site), the list of individual oar jobs which make an oargrid job.
-
- :param oargrid_job_id: the oargrid job id.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
- """
- if isinstance(timeout, bool) and timeout == False:
- timeout = g5k_configuration.get('default_timeout')
- process = get_process("oargridstat %i" % (oargrid_job_id,),
- host = get_frontend_host(),
- connection_params = make_connection_params(frontend_connection_params,
- default_frontend_connection_params))
- process.timeout = timeout
- process.pty = True
- process.run()
- if process.ok:
- job_specs = []
- for m in re.finditer(r'^\t(\w+) --> (\d+)', process.stdout, re.MULTILINE):
- site = m.group(1)
- if site not in get_g5k_sites():
- site = get_cluster_site(site)
- job_specs.append((int(m.group(2)), site))
- return job_specs
- else:
- raise ProcessesFailed([process])
-
-def wait_oargrid_job_start(oargrid_job_id = None, frontend_connection_params = None, timeout = False):
- """Sleep until an oargrid job's start time.
-
- :param oargrid_job_id: the oargrid job id.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
- """
- sleep(until = get_oargrid_job_info(oargrid_job_id, frontend_connection_params, timeout)['start_date'])
-
-def get_oargrid_job_nodes(oargrid_job_id, frontend_connection_params = None, timeout = False):
- """Return an iterable of `execo.host.Host` containing the hosts of an oargrid job.
-
- :param oargrid_job_id: the oargrid job id.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
- """
- if isinstance(timeout, bool) and timeout == False:
- timeout = g5k_configuration.get('default_timeout')
- process = get_process("oargridstat -wl %i 2>/dev/null || oargridstat -l %i 2>/dev/null" % (oargrid_job_id, oargrid_job_id),
- host = get_frontend_host(),
- connection_params = make_connection_params(frontend_connection_params,
- default_frontend_connection_params))
- process.timeout = timeout
- process.shell = process.pty = True
- process.run()
- if process.ok:
- host_addresses = re.findall(r'(\S+)', process.stdout, re.MULTILINE)
- return list(set([ Host(host_address) for host_address in host_addresses ]))
- else:
- raise ProcessesFailed([process])
-
-def get_oargrid_job_key(oargrid_job_id = None, frontend_connection_params = None, timeout = False):
- """Return the filename of the oargrid job key
-
- :param oargrid_job_id: the oargrid job id.
-
- :param frontend_connection_params: connection params for connecting
- to frontends if needed. Values override those in
- `execo_g5k.config.default_frontend_connection_params`.
-
- :param timeout: timeout for retrieving. Default is False, which
- means use
- ``execo_g5k.config.g5k_configuration['default_timeout']``. None
- means no timeout.
- """
- return "/tmp/oargrid/oargrid_ssh_key_%s_%i" % (
- get_oargrid_job_info(
- oargrid_job_id,
- frontend_connection_params,
- timeout)['user'],
- oargrid_job_id)
diff --git a/src/execo_g5k/planning.py b/src/execo_g5k/planning.py
index 2f006fa5e612d6a9a588080904d12beb6dd81e42..6093d9856adbef1fd9fb4735b6d6beb11ffad392 100644
--- a/src/execo_g5k/planning.py
+++ b/src/execo_g5k/planning.py
@@ -25,8 +25,7 @@ from execo import logger, Host
from execo.log import style
from execo.time_utils import timedelta_to_seconds, get_seconds, \
unixts_to_datetime, get_unixts, format_date
-from execo_g5k import OarSubmission, get_current_oar_jobs, get_oar_job_info, \
- get_current_oargrid_jobs, get_oargrid_job_oar_jobs
+from execo_g5k import OarSubmission, get_current_oar_jobs, get_oar_job_info
from execo_g5k.api_utils import get_g5k_sites, get_g5k_clusters, \
get_cluster_site, get_site_clusters, get_resource_attributes, get_host_cluster, \
get_host_site, get_host_attributes, get_g5k_hosts, get_host_shortname, \
@@ -59,14 +58,6 @@ def get_job_by_name(job_name, sites=None):
logger.detail('Looking for a job named %s', style.emph(job_name))
if not sites:
sites = get_g5k_sites()
- oargrid_jobs = get_current_oargrid_jobs()
- if len(oargrid_jobs) > 0:
- for g_job in oargrid_jobs:
- for job in get_oargrid_job_oar_jobs(g_job):
- info = get_oar_job_info(job[0], job[1])
- if info['name'] == job_name:
- logger.info('Oargridjob %s found !', style.emph(g_job))
- return g_job, None
running_jobs = get_current_oar_jobs(sites)
for job in running_jobs:
info = get_oar_job_info(job[0], job[1])