Commit 8faec0be authored by Huff, Israel's avatar Huff, Israel
Browse files

- changed queue method names to be more descriptive

- changed executables and/or arguments for queue commands based on some quick testing for both PBS and SGE
parent 3b6b10b9
Pipeline #96696 passed with stages
in 5 minutes and 23 seconds
...@@ -9,12 +9,13 @@ class QueueBase ...@@ -9,12 +9,13 @@ class QueueBase
{ {
public: public:
virtual ~QueueBase(); virtual ~QueueBase();
virtual QString allnodeinfo() = 0; virtual QString listallnodeinfo() = 0;
virtual QString checkjob(QString params) = 0; virtual QString listallqueues() = 0;
virtual QString qdel(QString params) = 0; virtual QString checkjob(QString params) = 0;
virtual QString qstat(QString params) = 0; virtual QString deletejob(QString params) = 0;
virtual QString qsub(QString params) = 0; virtual QString submitjob(QString params) = 0;
virtual QString showq(QString params) = 0; virtual QString showqueueinfo(QString params) = 0;
virtual QString showfreeprocs(QString params) = 0;
}; // class QueueBase }; // class QueueBase
} // namespace rsm } // namespace rsm
......
...@@ -3,10 +3,15 @@ ...@@ -3,10 +3,15 @@
namespace rsm namespace rsm
{ {
// QueuePBS::~QueuePBS() {} // QueuePBS::~QueuePBS() {}
QString QueuePBS::allnodeinfo() { return "qstat -F"; } QString QueuePBS::listallnodeinfo() { return "pbsnodes -a"; }
QString QueuePBS::checkjob(QString params) { return "qstat " + params; } QString QueuePBS::listallqueues() { return "qstat -q"; }
QString QueuePBS::qdel(QString params) { return "qdel " + params; } QString QueuePBS::checkjob(QString params)
QString QueuePBS::qstat(QString params) { return "qstat " + params; } {
QString QueuePBS::qsub(QString params) { return "qsub " + params; } // TODO: optional -f job_id
QString QueuePBS::showq(QString params) { return "asdf " + params; } return "qstat " + params;
}
QString QueuePBS::deletejob(QString params) { return "qdel " + params; }
QString QueuePBS::submitjob(QString params) { return "qsub " + params; }
QString QueuePBS::showqueueinfo(QString params) { return "showq " + params; }
QString QueuePBS::showfreeprocs(QString params) { return "showbf " + params; }
} // namespace rsm } // namespace rsm
...@@ -9,12 +9,13 @@ class QueuePBS : public QueueBase ...@@ -9,12 +9,13 @@ class QueuePBS : public QueueBase
{ {
public: public:
// ~QueuePBS() override; // ~QueuePBS() override;
QString allnodeinfo() override; QString listallnodeinfo() override;
QString listallqueues() override;
QString checkjob(QString params) override; QString checkjob(QString params) override;
QString qdel(QString params) override; QString deletejob(QString params) override;
QString qstat(QString params) override; QString submitjob(QString params) override;
QString qsub(QString params) override; QString showqueueinfo(QString params) override;
QString showq(QString params) override; QString showfreeprocs(QString params) override;
}; // class QueuePBS }; // class QueuePBS
} // namespace rsm } // namespace rsm
......
...@@ -3,10 +3,22 @@ ...@@ -3,10 +3,22 @@
namespace rsm namespace rsm
{ {
// QueueSGE::~QueueSGE() {} // QueueSGE::~QueueSGE() {}
QString QueueSGE::allnodeinfo() { return "qstat -F"; } QString QueueSGE::listallnodeinfo() { return "qstat -F"; }
QString QueueSGE::checkjob(QString params) { return "qstat " + params; } QString QueueSGE::listallqueues() { return "qstat -g c"; }
QString QueueSGE::qdel(QString params) { return "qdel " + params; } QString QueueSGE::checkjob(QString params)
QString QueueSGE::qstat(QString params) { return "qstat " + params; } { // TODO: optional -j job_id
QString QueueSGE::qsub(QString params) { return "qsub " + params; } return "qstat " + params;
QString QueueSGE::showq(QString params) { return "asdf " + params; } }
QString QueueSGE::deletejob(QString params) { return "qdel " + params; }
QString QueueSGE::submitjob(QString params) { return "qsub " + params; }
QString QueueSGE::showqueueinfo(QString params)
{ // TODO: optional -q queue_name
return "qstat " + params;
}
// TODO: how best to handle unsupported features?
QString QueueSGE::showfreeprocs(QString params)
{
(void)sizeof(params);
return "";
}
} // namespace rsm } // namespace rsm
...@@ -9,12 +9,13 @@ class QueueSGE : public QueueBase ...@@ -9,12 +9,13 @@ class QueueSGE : public QueueBase
{ {
public: public:
// ~QueueSGE() override; // ~QueueSGE() override;
QString allnodeinfo() override; QString listallnodeinfo() override;
QString listallqueues() override;
QString checkjob(QString params) override; QString checkjob(QString params) override;
QString qdel(QString params) override; QString deletejob(QString params) override;
QString qstat(QString params) override; QString submitjob(QString params) override;
QString qsub(QString params) override; QString showqueueinfo(QString params) override;
QString showq(QString params) override; QString showfreeprocs(QString params) override;
}; // class QueueSGE }; // class QueueSGE
} // namespace rsm } // namespace rsm
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment