Commit 9c5d53fe authored by Jozsef Makai's avatar Jozsef Makai

MGM: trying without s queue

parent a06dda8a
......@@ -294,8 +294,8 @@ WFE::WFEr()
XrdSysMutexHelper sLock(gSchedulerMutex);
time_t storetime = 0;
// move job into the scheduled queue
// job->Move(job->mActions[0].mQueue, "s", storetime);
// job->mActions[0].mQueue = "s";
job->Move(job->mActions[0].mQueue, "r", storetime);
job->mActions[0].mQueue = "r";
job->mActions[0].mTime = storetime;
XrdOucString tst;
job->mActions[0].mWhen = eos::common::StringConversion::GetSizeString(tst,
......@@ -783,7 +783,7 @@ WFE::Job::DoIt(bool issync)
int retc = 0;
time_t storetime = 0;
if (mActions[0].mQueue == "s" || mActions[0].mQueue == "e") {
if (mActions[0].mQueue == "r" || mActions[0].mQueue == "e") {
bool actionParsed = false;
if (mActions[0].mAction.find(':') == std::string::npos) {
method = mActions[0].mAction;
......@@ -1622,7 +1622,7 @@ WFE::Job::DoIt(bool issync)
}
} else if (method == "proto") {
storetime = (time_t) mActions[0].mTime;
Move(mActions[0].mQueue, "r", storetime, mRetry);
// Move(mActions[0].mQueue, "r", storetime, mRetry);
auto event = mActions[0].mEvent;
......
......@@ -199,27 +199,22 @@ Workflow::Create(eos::common::Mapping::VirtualIdentity& vid, const std::string&
WFE::Job job(mFid, vid, errorMessage);
time_t t = time(nullptr);
if (job.IsSync(mEvent)) {
job.AddAction(mAction, mEvent, t, mWorkflow, "s");
retc = job.Save("s", t);
} else {
job.AddAction(mAction, mEvent, t, mWorkflow, "q");
if (WfeRecordingEnabled()) {
retc = job.Save("q", t);
}
}
if (retc) {
eos_static_err("failed to save");
return retc;
}
if (job.IsSync(mEvent)) {
if (WfeEnabled()) {
job.AddAction(mAction, mEvent, t, mWorkflow, "r");
job.Save("r", t);
eos_static_info("running synchronous workflow");
return job.DoIt(true);
}
} else {
if (WfeRecordingEnabled()) {
job.AddAction(mAction, mEvent, t, mWorkflow, "q");
retc = job.Save("q", t);
if (retc) {
eos_static_err("failed to save");
return retc;
}
}
}
return 0;
......
Markdown is supported
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