Commit 55a9ef78 authored by Carla Guillen's avatar Carla Guillen

Merge branch 'development' of gitlab.lrz.de:dcdb/dcdb into development

parents 08cb0131 c0d3523c
......@@ -397,8 +397,9 @@ public:
}
if(_unitCache->size() >= _unitCacheLimit) {
U_Ptr oldest = _insertionLUT->begin()->second;
_unitCache->erase(oldest->getName());
auto oldest = _insertionLUT->begin();
_unitCache->erase(oldest->second->getName());
_insertionLUT->erase(oldest->first);
}
_unitCache->insert(make_pair(unit->getName(), unit));
// The template unit must never be deleted, even if the cache is full; therefore, we omit its entry from
......
......@@ -452,7 +452,8 @@ int mqttCallback(SimpleMQTTMessage *msg)
#endif
//store JobData into Storage Backend
if (jd.endTime == DCDB::TimeStamp((uint64_t)0)) {
//dcdbslurmjob start inserts the endTime as startTime + max job length + 1, i.e. the last digit will be 1
if ((jd.endTime == DCDB::TimeStamp((uint64_t)0)) || ((jd.endTime.getRaw() & 0x1) == 1)) {
//starting job data
if (myJobDataStore->insertJob(jd) != DCDB::JD_OK) {
LOG(error) << "Job data insert failed!";
......
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