diff --git a/src/admin/templates/xrootd/etc/xrdssi.cf.jinja b/src/admin/templates/xrootd/etc/xrdssi.cf.jinja index 440d30518..1d2ff4d2a 100644 --- a/src/admin/templates/xrootd/etc/xrdssi.cf.jinja +++ b/src/admin/templates/xrootd/etc/xrdssi.cf.jinja @@ -15,8 +15,9 @@ password = [memman] # MemMan class to use for managing memory for tables -# can be "MemManReal" or "MemManNone" +# can be "MemManReal", "MemManNone" or "MemManNoneRelaxed" # class = MemManReal +class = MemManNoneRelaxed # Memory available for locking tables, in MB # memory = 1000 diff --git a/src/xrdsvc/SsiService.cc b/src/xrdsvc/SsiService.cc index 2217c20ac..a7c206bf0 100644 --- a/src/xrdsvc/SsiService.cc +++ b/src/xrdsvc/SsiService.cc @@ -168,6 +168,9 @@ SsiService::SsiService(XrdSsiLogger* log) { memman::MemMan::create(memManSize, workerConfig->getMemManLocation())); } else if (cfgMemMan == "MemManNone") { memMan = make_shared(1, false); + } else if (cfgMemMan == "MemManNoneRelaxed") { + bool const alwaysLock = true; + memMan = make_shared(1, alwaysLock); } else { LOGS(_log, LOG_LVL_ERROR, "Unrecognized memory manager " << cfgMemMan); throw wconfig::WorkerConfigError("Unrecognized memory manager.");