Merge branch 'tickets/DM-42770'

lsst · Feb 3, 2024 · 94a5698 · 94a5698
2 parents 6e91abe + 2cb57ae
commit 94a5698
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/admin/templates/xrootd/etc/xrdssi.cf.jinja b/src/admin/templates/xrootd/etc/xrdssi.cf.jinja
@@ -15,7 +15,7 @@ password =
 [memman]
 
 # MemMan class to use for managing memory for tables
-# can be "MemManReal" or "MemManNone"
+# can be "MemManReal", "MemManNone" or "MemManNoneRelaxed"
 # class = MemManReal
 
 # Memory available for locking tables, in MB

diff --git 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<memman::MemManNone>(1, false);
+    } else if (cfgMemMan == "MemManNoneRelaxed") {
+        bool const alwaysLock = true;
+        memMan = make_shared<memman::MemManNone>(1, alwaysLock);
     } else {
         LOGS(_log, LOG_LVL_ERROR, "Unrecognized memory manager " << cfgMemMan);
         throw wconfig::WorkerConfigError("Unrecognized memory manager.");