diff --git a/objectstore/BackendRados.cpp b/objectstore/BackendRados.cpp index 2d848b27edfa33461187ec0410e9b409dce1f663..1e21a6f3537f1c9a21dbcb3dc60b18143605e44d 100644 --- a/objectstore/BackendRados.cpp +++ b/objectstore/BackendRados.cpp @@ -154,7 +154,9 @@ std::string BackendRados::createUniqueClientId() { BackendRados::ScopedLock* BackendRados::lockExclusive(std::string name) { // In Rados, locking a non-existing object will create it. This is not our intended // behavior. So we test for existence beforehand. - if (!exists(name)) throw cta::exception::Errnum(ENOENT, "In BackendRados::lockExclusive(): trying to lock a non-existing object"); + if (!exists(name)) { + throw cta::exception::Errnum(ENOENT, "In BackendRados::lockExclusive(): trying to lock a non-existing object"); + } std::string client = createUniqueClientId(); struct timeval tv; tv.tv_usec = 0; diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp index 15b6169bc099cf0354a4500a33c7361e8f7eb7a9..f53ae89f62ad1a07d7a9bd9035cda041940e3f3d 100644 --- a/scheduler/OStoreDB/OStoreDB.cpp +++ b/scheduler/OStoreDB/OStoreDB.cpp @@ -1592,7 +1592,8 @@ auto OStoreDB::ArchiveMount::getNextJob(log::LogContext &logContext) -> std::uni log::ScopedParamContainer params(logContext); params.add("tapepool", mountInfo.tapePool) .add("queueObject", aq.getAddressIfSet()) - .add("jobObject", privateRet->m_archiveRequest.getAddressIfSet()); + .add("jobObject", privateRet->m_archiveRequest.getAddressIfSet()) + .add("fileID", privateRet->m_archiveRequest.getArchiveFile().archiveFileID); logContext.log(log::INFO, "In ArchiveMount::getNextJob(): popped job from queue"); return std::unique_ptr<SchedulerDatabase::ArchiveJob> (privateRet.release()); }