From 83e5974301ec047a27b56421335b010c83809d64 Mon Sep 17 00:00:00 2001
From: Albert Louis Rossi <arossi@fnal.gov>
Date: Mon, 14 Aug 2023 08:35:41 -0500
Subject: [PATCH] dcache-qos:  remove singleton service configuration

Motivation:

As originally conceived, the qos service suite
could be run as a single component.

The added maintenance overhead for configuration
duplication and testing is not really justified;
not much is gained by doing this and I imagine
the option has not yet even been tried.

Modification:

Deprecate/eliminate the option.

Result:

Less to maintain and test.

Target:  master
Patch: https://rb.dcache.org/r/14053/
Requires-notes: yes
Requires-book: yes (included)
Acked-by: Tigran
---
 .../src/main/markdown/config-qos-engine.md    |   4 +
 .../clients/LocalQoSAdjustmentClient.java     |  89 ---
 .../clients/LocalQoSVerificationClient.java   | 114 ----
 .../src/main/resources/org/dcache/qos/qos.xml | 620 ------------------
 skel/share/defaults/qos.properties            |  34 +-
 skel/share/services/qos.batch                 |  88 ---
 6 files changed, 21 insertions(+), 928 deletions(-)
 delete mode 100644 modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSAdjustmentClient.java
 delete mode 100644 modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSVerificationClient.java
 delete mode 100644 modules/dcache-qos/src/main/resources/org/dcache/qos/qos.xml
 delete mode 100644 skel/share/services/qos.batch

diff --git a/docs/TheBook/src/main/markdown/config-qos-engine.md b/docs/TheBook/src/main/markdown/config-qos-engine.md
index a231930da3c..f910275cfb5 100644
--- a/docs/TheBook/src/main/markdown/config-qos-engine.md
+++ b/docs/TheBook/src/main/markdown/config-qos-engine.md
@@ -146,6 +146,10 @@ With respect to the example scanner domain: the scanner communicates directly wi
 so `chimera.db.host` should be set explicitly if it is not running on the same host
 as the database.
 
+> NOTE:  As of dCache 9.2, the singleton configuration has been removed.  Each of the
+> separate services can be run together in one domain or in separate domains, but it is
+> no longer possible to run the entire QoS component suite as a single service.
+
 ### Memory requirements
 
 While it is possible to run QoS in the same domain as other services,
diff --git a/modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSAdjustmentClient.java b/modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSAdjustmentClient.java
deleted file mode 100644
index 10dbf979e13..00000000000
--- a/modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSAdjustmentClient.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-COPYRIGHT STATUS:
-Dec 1st 2001, Fermi National Accelerator Laboratory (FNAL) documents and
-software are sponsored by the U.S. Department of Energy under Contract No.
-DE-AC02-76CH03000. Therefore, the U.S. Government retains a  world-wide
-non-exclusive, royalty-free license to publish or reproduce these documents
-and software for U.S. Government purposes.  All documents and software
-available from this server are protected under the U.S. and Foreign
-Copyright Laws, and FNAL reserves all rights.
-
-Distribution of the software available from this server is free of
-charge subject to the user following the terms of the Fermitools
-Software Legal Information.
-
-Redistribution and/or modification of the software shall be accompanied
-by the Fermitools Software Legal Information  (including the copyright
-notice).
-
-The user is asked to feed back problems, benefits, and/or suggestions
-about the software to the Fermilab Software Providers.
-
-Neither the name of Fermilab, the  URA, nor the names of the contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-DISCLAIMER OF LIABILITY (BSD):
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED  WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED  WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FERMILAB,
-OR THE URA, OR THE U.S. DEPARTMENT of ENERGY, OR CONTRIBUTORS BE LIABLE
-FOR  ANY  DIRECT, INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY  OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT  OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE  POSSIBILITY OF SUCH DAMAGE.
-
-Liabilities of the Government:
-
-This software is provided by URA, independent from its Prime Contract
-with the U.S. Department of Energy. URA is acting independently from
-the Government and in its own private capacity and is not acting on
-behalf of the U.S. Government, nor as its contractor nor its agent.
-Correspondingly, it is understood and agreed that the U.S. Government
-has no connection to this software and in no manner whatsoever shall
-be liable for nor assume any responsibility or obligation for any claim,
-cost, or damages arising out of or resulting from the use of the software
-available from this server.
-
-Export Control:
-
-All documents and software available from this server are subject to U.S.
-export control laws.  Anyone downloading information from this server is
-obligated to secure any necessary Government licenses before exporting
-documents or software obtained from this server.
- */
-package org.dcache.qos.local.clients;
-
-import diskCacheV111.util.PnfsId;
-import org.dcache.qos.QoSException;
-import org.dcache.qos.listeners.QoSAdjustmentListener;
-import org.dcache.qos.services.adjuster.handlers.QoSAdjusterTaskHandler;
-import org.dcache.qos.vehicles.QoSAdjustmentRequest;
-
-/**
- * A pass-through to the adjuster task handler. Use this listener when plugging in directly to the
- * adjustment service.
- */
-public final class LocalQoSAdjustmentClient implements QoSAdjustmentListener {
-
-    private QoSAdjusterTaskHandler taskHandler;
-
-    @Override
-    public void fileQoSAdjustmentRequested(QoSAdjustmentRequest adjustmentRequest) {
-        taskHandler.handleAdjustmentRequest(adjustmentRequest);
-    }
-
-    @Override
-    public void fileQoSAdjustmentCancelled(PnfsId pnfsId) throws QoSException {
-        taskHandler.handleAdjustmentCancelled(pnfsId);
-    }
-
-    public void setTaskHandler(QoSAdjusterTaskHandler taskHandler) {
-        this.taskHandler = taskHandler;
-    }
-}
diff --git a/modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSVerificationClient.java b/modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSVerificationClient.java
deleted file mode 100644
index a082d006a2a..00000000000
--- a/modules/dcache-qos/src/main/java/org/dcache/qos/local/clients/LocalQoSVerificationClient.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-COPYRIGHT STATUS:
-Dec 1st 2001, Fermi National Accelerator Laboratory (FNAL) documents and
-software are sponsored by the U.S. Department of Energy under Contract No.
-DE-AC02-76CH03000. Therefore, the U.S. Government retains a  world-wide
-non-exclusive, royalty-free license to publish or reproduce these documents
-and software for U.S. Government purposes.  All documents and software
-available from this server are protected under the U.S. and Foreign
-Copyright Laws, and FNAL reserves all rights.
-
-Distribution of the software available from this server is free of
-charge subject to the user following the terms of the Fermitools
-Software Legal Information.
-
-Redistribution and/or modification of the software shall be accompanied
-by the Fermitools Software Legal Information  (including the copyright
-notice).
-
-The user is asked to feed back problems, benefits, and/or suggestions
-about the software to the Fermilab Software Providers.
-
-Neither the name of Fermilab, the  URA, nor the names of the contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-DISCLAIMER OF LIABILITY (BSD):
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED  WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED  WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FERMILAB,
-OR THE URA, OR THE U.S. DEPARTMENT of ENERGY, OR CONTRIBUTORS BE LIABLE
-FOR  ANY  DIRECT, INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY  OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT  OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE  POSSIBILITY OF SUCH DAMAGE.
-
-Liabilities of the Government:
-
-This software is provided by URA, independent from its Prime Contract
-with the U.S. Department of Energy. URA is acting independently from
-the Government and in its own private capacity and is not acting on
-behalf of the U.S. Government, nor as its contractor nor its agent.
-Correspondingly, it is understood and agreed that the U.S. Government
-has no connection to this software and in no manner whatsoever shall
-be liable for nor assume any responsibility or obligation for any claim,
-cost, or damages arising out of or resulting from the use of the software
-available from this server.
-
-Export Control:
-
-All documents and software available from this server are subject to U.S.
-export control laws.  Anyone downloading information from this server is
-obligated to secure any necessary Government licenses before exporting
-documents or software obtained from this server.
- */
-package org.dcache.qos.local.clients;
-
-import diskCacheV111.util.PnfsId;
-import javax.security.auth.Subject;
-import org.dcache.qos.QoSException;
-import org.dcache.qos.listeners.QoSVerificationListener;
-import org.dcache.qos.services.verifier.handlers.VerifyOperationHandler;
-import org.dcache.qos.vehicles.QoSAdjustmentResponse;
-import org.dcache.qos.vehicles.QoSScannerVerificationRequest;
-import org.dcache.qos.vehicles.QoSVerificationRequest;
-
-/**
- * A pass-through to the file operation handler. Use this listener when plugging in directly to the
- * verification service.
- */
-public final class LocalQoSVerificationClient implements QoSVerificationListener {
-
-    private VerifyOperationHandler fileOpHandler;
-
-    @Override
-    public void fileQoSVerificationRequested(QoSVerificationRequest request) {
-        fileOpHandler.handleUpdate(request.getUpdate());
-    }
-
-    @Override
-    public void fileQoSVerificationRequested(QoSScannerVerificationRequest request) {
-        fileOpHandler.handleVerificationRequest(request);
-    }
-
-    @Override
-    public void fileQoSAdjustmentCompleted(QoSAdjustmentResponse response) {
-        fileOpHandler.handleAdjustmentResponse(response);
-    }
-
-    @Override
-    public void fileQoSVerificationCancelled(PnfsId pnfsId, Subject subject) throws QoSException {
-        fileOpHandler.handleFileOperationCancelled(pnfsId);
-    }
-
-    public void fileQoSBatchedVerificationCancelled(String pool) {
-        fileOpHandler.handleFileOperationsCancelledForPool(pool);
-    }
-
-    public void notifyLocationExclusion(String location) {
-        fileOpHandler.handleExcludedStatusChange(location, true);
-    }
-
-    public void notifyLocationInclusion(String location) {
-        fileOpHandler.handleExcludedStatusChange(location, false);
-    }
-
-    public void setFileOpHandler(VerifyOperationHandler fileOpHandler) {
-        this.fileOpHandler = fileOpHandler;
-    }
-}
diff --git a/modules/dcache-qos/src/main/resources/org/dcache/qos/qos.xml b/modules/dcache-qos/src/main/resources/org/dcache/qos/qos.xml
deleted file mode 100644
index f8ad2461146..00000000000
--- a/modules/dcache-qos/src/main/resources/org/dcache/qos/qos.xml
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- THIS IS THE CONFIGURATION FOR A SINGLE-INSTANCE ALL-IN-ONE QOS ENGINE -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context.xsd">
-
-  <context:property-placeholder/>
-  <context:annotation-config/>
-
-  <!-- ****************************************  ENDPOINTS ***************************************** -->
-
-  <bean id="transition-topic" class="org.dcache.cells.CellStub">
-    <description>Communication stub for the QoS transition topic.</description>
-    <property name="destination" value="${qos.transition-completed-topic}"/>
-    <property name="timeout" value="${qos.service.transition.timeout}"/>
-    <property name="timeoutUnit" value="${qos.service.transition.timeout.unit}"/>
-  </bean>
-
-  <bean id="pnfs-manager" class="org.dcache.cells.CellStub">
-    <description>Communication stub for PnfsManager.</description>
-    <property name="destination" value="${qos.service.pnfsmanager}"/>
-    <property name="timeout" value="${qos.service.pnfsmanager.timeout}"/>
-    <property name="timeoutUnit" value="${qos.service.pnfsmanager.timeout.unit}"/>
-  </bean>
-
-  <bean id="pin-manager" class="org.dcache.cells.CellStub">
-    <description>Communication stub for PinManager.</description>
-    <property name="destination" value="${qos.service.pinmanager}"/>
-    <property name="timeout" value="${qos.service.pinmanager.timeout}"/>
-    <property name="timeoutUnit" value="${qos.service.pinmanager.timeout.unit}"/>
-    <property name="flags"
-      value="#{ T(dmg.cells.nucleus.CellEndpoint.SendFlag).RETRY_ON_NO_ROUTE_TO_CELL }"/>
-  </bean>
-
-  <bean id="pools" class="org.dcache.cells.CellStub">
-    <description>Communication stub for pools.</description>
-    <property name="timeout" value="${qos.service.pool.timeout}"/>
-    <property name="timeoutUnit" value="${qos.service.pool.timeout.unit}"/>
-  </bean>
-
-  <!-- ****************************************** CLIENTS ****************************************** -->
-
-  <bean id="requirements-client" class="org.dcache.qos.local.clients.LocalQoSRequirementsClient">
-    <description>Client for requesting requirements from the local requirements service.</description>
-    <property name="provider" ref="requirements-provider"/>
-  </bean>
-
-  <bean id="verifier-client" class="org.dcache.qos.local.clients.LocalQoSVerificationClient">
-    <description>Client for communicating with local verifier service.</description>
-    <property name="fileOpHandler" ref="verify-operation-handler"/>
-  </bean>
-
-  <bean id="adjuster-client" class="org.dcache.qos.local.clients.LocalQoSAdjustmentClient">
-    <description>Client for communicating with local adjuster service.</description>
-    <property name="taskHandler" ref="adjuster-task-handler"/>
-  </bean>
-
-  <bean id="scanner-client" class="org.dcache.qos.local.clients.LocalQoSScannerClient">
-    <description>Client for communicating with local scanner service.</description>
-    <property name="poolCompletionHandler" ref="pool-completion-handler"/>
-    <property name="sysCompletionHandler" ref="system-completion-handler"/>
-  </bean>
-
-  <!-- ******************************************* SHARED ******************************************* -->
-
-  <bean id="message-backlog-handler" class="org.dcache.qos.util.SerializingBacklogHandler"
-    init-method="initialize" destroy-method="shutdown">
-    <description>Handles message backlog when receivers are temporarily unavailable.</description>
-    <constructor-arg value="${qos.home}/backlogged-messages"/>
-    <property name="receivers">
-      <set>
-        <ref bean="requirements-receiver"/>
-      </set>
-    </property>
-  </bean>
-
-  <bean id="message-guard" class="org.dcache.qos.util.MessageGuard">
-    <description>Validates messages for handling; will ignore messages is message handling is
-                 paused or if they originate with the qos service itself.</description>
-    <property name="backlogHandler" ref="message-backlog-handler"/>
-  </bean>
-
-  <!-- ***************************************** QOS ENGINE ***************************************** -->
-
-  <bean id="engine-counters" class="org.dcache.qos.services.engine.util.QoSEngineCounters"
-    init-method="initialize">
-    <description>Tracks request message statistics.</description>
-    <property name="statisticsPath" value="${qos.home}/engine-statistics"/>
-    <property name="service">
-      <bean class="java.util.concurrent.ScheduledThreadPoolExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="1"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="file-status-handler" class="org.dcache.qos.services.engine.handler.FileQoSStatusHandler">
-    <description>Processes incoming request messages.</description>
-    <property name="requirementsListener" ref="requirements-client"/>
-    <property name="verificationListener" ref="verifier-client"/>
-    <property name="qosTransitionTopic" ref="transition-topic"/>
-    <property name="qoSEngineCounters" ref="engine-counters"/>
-    <property name="executor">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.requirements.submit-threads}"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="requirements-receiver" class="org.dcache.qos.remote.receivers.QoSRequirementsReceiver">
-    <description>Endpoint of this service for requests and updates; the QoS 'frontend'.</description>
-    <property name="messageGuard" ref="message-guard"/>
-    <property name="fileStatusHandler" ref="file-status-handler"/>
-  </bean>
-
-  <bean id="requirements-provider"
-    class="org.dcache.qos.services.engine.provider.ALRPStorageUnitQoSProvider">
-     <description>The implementation of the rule engine for requirements.</description>
-    <property name="pnfsManager" ref="pnfs-manager"/>
-    <!-- pool monitor is received via message -->
-  </bean>
-
-  <bean id="engine-admin" class="org.dcache.qos.services.engine.admin.QoSEngineAdmin">
-    <description>Commands for monitoring engine progress.</description>
-    <property name="messageGuard" ref="message-guard"/>
-    <property name="counters" ref="engine-counters"/>
-  </bean>
-
-  <!-- **************************************** QOS SCANNER ***************************************** -->
-
-  <bean id="namespace-permission-handler"
-    class="org.dcache.namespace.ChainedPermissionHandler">
-    <description>Permission handler for requests to the namespace database.</description>
-    <property name="chain">
-      <list>
-        <bean class="org.dcache.namespace.ACLPermissionHandler"/>
-        <bean class="org.dcache.namespace.PosixPermissionHandler"/>
-      </list>
-    </property>
-  </bean>
-
-  <bean id="namespace-data-source" class="org.dcache.db.AlarmEnabledDataSource"
-    destroy-method="close">
-    <description>Wraps the namespace connection pool with an alarm handler.</description>
-    <constructor-arg value="${qos.db.namespace.url}"/>
-    <constructor-arg value="QoSNamespaceDb"/>
-    <constructor-arg ref="namespace-connection-pool"/>
-  </bean>
-
-  <bean id="namespace-connection-pool" class="com.zaxxer.hikari.HikariDataSource"
-    destroy-method="close">
-     <description>Encapsulates the namespace database connection pool and properties.</description>
-    <constructor-arg>
-      <bean class="com.zaxxer.hikari.HikariConfig">
-        <constructor-arg>
-          <bean class="org.dcache.util.configuration.ConfigurationPropertiesFactoryBean">
-            <property name="prefix" value="qos.db.namespace.hikari-properties"/>
-            <property name="staticEnvironment">
-              <map>
-                <entry key="jdbcUrl" value="${qos.db.namespace.url}"/>
-                <entry key="username" value="${qos.db.namespace.user}"/>
-                <entry key="password"
-                  value="#{ T(diskCacheV111.util.Pgpass).getPassword('${qos.db.namespace.password.file}', '${qos.db.namespace.url}', '${qos.db.namespace.user}', '${qos.db.namespace.password}') }"/>
-                <entry key="minimumIdle" value="${qos.db.namespace.connections.idle}"/>
-                <entry key="maximumPoolSize" value="${qos.db.namespace.connections.max}"/>
-                <entry key="transactionIsolation" value="TRANSACTION_READ_COMMITTED"/>
-              </map>
-            </property>
-          </bean>
-        </constructor-arg>
-      </bean>
-    </constructor-arg>
-  </bean>
-
-  <bean id="namespace-tx-manager"
-    class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-    <description>Namespace database transaction manager.</description>
-    <property name="dataSource" ref="namespace-data-source"/>
-  </bean>
-
-  <bean id="file-system" class="org.dcache.chimera.JdbcFs" depends-on="namespace-liquibase">
-    <description>File system implementation (Chimera).</description>
-    <constructor-arg ref="namespace-data-source"/>
-    <constructor-arg ref="namespace-tx-manager"/>
-  </bean>
-
-  <bean id="extractor" class="${qos.plugins.storage-info-extractor}">
-    <description>Namespace database storage info extractor.</description>
-    <!-- these are placeholder values which do not effect how qos works,
-         so the dcache defaults are fine -->
-    <constructor-arg value="#{ T(diskCacheV111.util.AccessLatency).getAccessLatency('NEARLINE') }"/>
-    <constructor-arg
-      value="#{ T(diskCacheV111.util.RetentionPolicy).getRetentionPolicy('CUSTODIAL') }"/>
-  </bean>
-
-  <bean id="namespace-liquibase" class="org.dcache.util.SpringLiquibase">
-    <description>Namespace database schema manager.</description>
-    <property name="dataSource" ref="namespace-data-source"/>
-    <property name="changeLog" value="classpath:${qos.db.namespace.schema.changelog}"/>
-    <property name="shouldUpdate" value="${qos.db.namespace.schema.auto}"/>
-  </bean>
-
-  <bean id="name-space-provider"
-    class="org.dcache.chimera.namespace.ChimeraNameSpaceProvider">
-    <description>Implements provider API for namespace access.</description>
-    <property name="fileSystem" ref="file-system"/>
-    <property name="extractor" ref="extractor"/>
-    <property name="permissionHandler" ref="namespace-permission-handler"/>
-    <!-- these are placeholder values which do not effect how resilience works,
-          so the dcache defaults are fine -->
-    <property name="inheritFileOwnership" value="false"/>
-    <property name="verifyAllLookups" value="true"/>
-    <property name="aclEnabled" value="false"/>
-    <property name="allowMoveToDirectoryWithDifferentStorageClass" value="true"/>
-  </bean>
-
-  <bean id="scanner-namespace-access" class="org.dcache.qos.services.scanner.namespace.LocalNamespaceAccess">
-    <description>Specialized database access for qos scanning.</description>
-    <property name="connectionPool" ref="namespace-data-source"/>
-    <property name="fetchSize" value="${qos.db.namespace.fetch-size}"/>
-    <property name="verificationListener" ref="verifier-client"/>
-  </bean>
-
-  <bean id="scanner-namespace-handler" class="org.dcache.qos.services.scanner.handlers.NamespaceOpHandler">
-    <description>The main handler that manages the scanning operations.</description>
-    <property name="namespace" ref="scanner-namespace-access"/>
-    <property name="poolTaskCompletionHandler" ref="pool-completion-handler"/>
-    <property name="sysTaskCompletionHandler" ref="system-completion-handler"/>
-    <property name="scanResponseListener" ref="scanner-client"/>
-    <property name="verificationListener" ref="verifier-client"/>
-    <property name="poolTaskService">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.scanner.task-threads}"/>
-      </bean>
-    </property>
-    <property name="systemTaskService">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.scanner.task-threads}"/>
-      </bean>
-    </property>
-    <property name="updateService">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.scanner.submit-threads}"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="scanner-counters" class="org.dcache.qos.services.scanner.util.QoSScannerCounters"
-    init-method="initialize">
-    <description>Tracks pool and system operation statistics.</description>
-    <property name="statisticsPath" value="${qos.home}/scanner-statistics"/>
-  </bean>
-
-  <bean id="pool-operation-map" class="org.dcache.qos.services.scanner.data.PoolOperationMap"
-    destroy-method="shutdown">
-    <description>Map of pool-specific operations which run location scans in response to state changes.</description>
-    <property name="timeout" value="${qos.limits.scanner.scan-period}"/>
-    <property name="timeoutUnit" value="${qos.limits.scanner.scan-period.unit}"/>
-    <property name="downGracePeriod" value="${qos.limits.scanner.down-grace-period}"/>
-    <property name="downGracePeriodUnit" value="${qos.limits.scanner.down-grace-period.unit}"/>
-    <property name="restartGracePeriod" value="${qos.limits.scanner.restart-grace-period}"/>
-    <property name="restartGracePeriodUnit"
-      value="${qos.limits.scanner.restart-grace-period.unit}"/>
-    <property name="initializationGracePeriod"
-      value="${qos.limits.scanner.pool-op-init-grace-period}"/>
-    <property name="initializationGracePeriodUnit"
-      value="${qos.limits.scanner.pool-op-init-grace-period.unit}"/>
-    <property name="maxRunningIdleTime" value="${qos.limits.scanner.pool-op-max-idle-time}"/>
-    <property name="maxRunningIdleTimeUnit"
-      value="${qos.limits.scanner.pool-op-max-idle-time.unit}"/>
-    <property name="excludedPoolsFile" value="${qos.home}/excluded-pools"/>
-    <property name="maxConcurrentRunning" value="${qos.limits.scanner.task-threads}"/>
-    <property name="handler" ref="scanner-namespace-handler"/>
-    <property name="counters" ref="scanner-counters"/>
-  </bean>
-
-  <bean id="system-operation-map" class="org.dcache.qos.services.scanner.data.SystemOperationMap"
-    destroy-method="shutdown">
-    <description>Map of system-wide operations which run scans periodically.</description>
-    <property name="timeout" value="${qos.limits.scanner.scan-period}"/>
-    <property name="timeoutUnit" value="${qos.limits.scanner.scan-period.unit}"/>
-    <property name="maxConcurrentRunning" value="${qos.limits.scanner.task-threads}"/>
-    <property name="nearlineBatchSize" value="${qos.limits.scanner.nearline-batch-size}"/>
-    <property name="nearlineRescanEnabled" value="${qos.limits.scanner.enable.nearline-scan}"/>
-    <property name="nearlineRescanWindow" value="${qos.limits.scanner.nearline-window}"/>
-    <property name="nearlineRescanWindowUnit" value="${qos.limits.scanner.nearline-window.unit}"/>
-    <property name="onlineBatchSize"  value="${qos.limits.scanner.online-batch-size}"/>
-    <property name="onlineRescanWindow" value="${qos.limits.scanner.online-window}"/>
-    <property name="onlineRescanWindowUnit" value="${qos.limits.scanner.online-window.unit}"/>
-    <property name="handler" ref="scanner-namespace-handler"/>
-    <property name="counters" ref="scanner-counters"/>
-  </bean>
-
-  <bean id="system-completion-handler"
-    class="org.dcache.qos.services.scanner.handlers.SysTaskCompletionHandler">
-    <description>Handles responses updating system scans.</description>
-    <property name="map" ref="system-operation-map"/>
-  </bean>
-
-  <bean id="pool-completion-handler"
-    class="org.dcache.qos.services.scanner.handlers.PoolTaskCompletionHandler">
-    <description>Handles responses updating pool scans.</description>
-    <property name="map" ref="pool-operation-map"/>
-  </bean>
-
-  <bean id="scanner-map-initializer"
-    class="org.dcache.qos.services.scanner.util.ScannerMapInitializer"
-    init-method="initialize">
-    <description>Initializes internal maps in the proper order.</description>
-    <property name="initDelay" value="${qos.limits.startup-delay}"/>
-    <property name="initDelayUnit" value="${qos.limits.startup-delay.unit}"/>
-    <property name="initService">
-      <bean class="java.util.concurrent.ScheduledThreadPoolExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="2"/>
-      </bean>
-    </property>
-    <property name="messageGuard" ref="message-guard"/>
-    <property name="poolOperationMap" ref="pool-operation-map"/>
-    <property name="systemOperationMap" ref="system-operation-map"/>
-    <property name="changeHandler" ref="pool-operation-change-handler"/>
-  </bean>
-
-  <bean id="pool-operation-change-handler"
-    class="org.dcache.qos.services.scanner.handlers.PoolOpChangeHandler"
-    destroy-method="stopWatchdog">
-    <description>Processes Pool Monitor updates and refreshes/triggers the pool operations on that basis.</description>
-    <property name="mapInitializer" ref="scanner-map-initializer"/>
-    <property name="poolOperationMap" ref="pool-operation-map"/>
-    <property name="updateService">
-      <bean class="java.util.concurrent.Executors" factory-method="newSingleThreadExecutor"
-        destroy-method="shutdownNow">
-      </bean>
-    </property>
-    <property name="refreshTimeout" value="${qos.limits.pool-info-expiry}"/>
-    <property name="refreshTimeoutUnit" value="${qos.limits.pool-info-expiry.unit}"/>
-  </bean>
-
-  <bean id="scanner-admin" class="org.dcache.qos.services.scanner.admin.QoSScannerAdmin">
-    <description>Commands for monitoring, launching and canceling scan requests.</description>
-    <property name="executor">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="5"/>
-      </bean>
-    </property>
-    <property name="messageGuard" ref="message-guard"/>
-    <property name="initializer" ref="scanner-map-initializer"/>
-    <property name="poolOperationMap" ref="pool-operation-map"/>
-    <property name="systemScanOperationMap" ref="system-operation-map"/>
-    <property name="namespaceAccess" ref="scanner-namespace-access"/>
-    <property name="dataDir" value="${qos.home}"/>
-    <property name="counters" ref="scanner-counters"/>
-  </bean>
-
-  <!-- ***************************************** QOS ADJUSTER *************************************** -->
-
-  <bean id="adjuster-executor" class="org.dcache.util.CDCExecutorServiceDecorator">
-    <description>Preserves the QOS session id generated for the task.</description>
-    <constructor-arg>
-      <bean class="org.dcache.util.BoundedCachedExecutor">
-        <constructor-arg value="${qos.limits.adjuster.submit-threads}"/>
-      </bean>
-    </constructor-arg>
-  </bean>
-
-  <bean id="adjuster-factory" class="org.dcache.qos.services.adjuster.adjusters.QoSAdjusterFactory">
-    <description>Constructs the necessary adjustment module on the basis of the request.</description>
-    <property name="scheduledExecutor">
-      <bean class="org.dcache.util.CDCScheduledExecutorServiceDecorator">
-        <description>Preserves the QOS session id generated for the task.</description>
-        <constructor-arg>
-          <bean class="java.util.concurrent.ScheduledThreadPoolExecutor"
-            destroy-method="shutdownNow">
-            <constructor-arg value="${qos.limits.adjuster.task-threads}"/>
-          </bean>
-        </constructor-arg>
-      </bean>
-    </property>
-    <property name="pools" ref="pools"/>
-    <property name="pinManager" ref="pin-manager"/>
-    <property name="completionHandler">
-      <bean class="org.dcache.qos.services.adjuster.handlers.QoSAdjustTaskCompletionHandler">
-        <property name="map" ref="adjuster-task-map"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="adjuster-counters" class="org.dcache.qos.services.adjuster.util.QoSAdjusterCounters"
-    init-method="initialize">
-    <description>Tracks adjustment task statistics.</description>
-    <property name="statisticsPath" value="${qos.home}/adjuster-statistics"/>
-  </bean>
-
-   <bean id="adjuster-task-handler"
-    class="org.dcache.qos.services.adjuster.handlers.QoSAdjusterTaskHandler">
-    <description>Processes the running adjustment tasks.</description>
-    <property name="taskMap" ref="adjuster-task-map"/>
-    <property name="taskService" ref="adjuster-executor"/>
-    <property name="verificationListener" ref="verifier-client"/>
-  </bean>
-
-  <bean id="adjuster-task-map" class="org.dcache.qos.services.adjuster.data.QoSAdjusterTaskMap"
-    init-method="initialize" destroy-method="shutdown">
-    <description>In-memory queues for running, ready and waiting adjustment tasks.</description>
-    <property name="timeout" value="${qos.limits.adjuster.scan-period}"/>
-    <property name="timeoutUnit" value="${qos.limits.adjuster.scan-period.unit}"/>
-    <property name="maxRetries" value="${qos.limits.adjuster.task-retries}"/>
-    <property name="maxRunning" value="${qos.limits.adjuster.task-threads}"/>
-    <property name="executorService" ref="adjuster-executor"/>
-    <property name="counters" ref="adjuster-counters"/>
-    <property name="factory" ref="adjuster-factory"/>
-    <property name="history" ref="adjuster-history"/>
-    <property name="handler" ref="adjuster-task-handler"/>
-  </bean>
-
-  <bean id="adjuster-history" class="org.dcache.qos.util.QoSHistory" init-method="initialize">
-    <description>Circular buffer for holding the status of the most recently completed tasks.</description>
-    <property name="capacity" value="${qos.limits.adjuster.task-history}"/>
-  </bean>
-
-  <bean id="adjuster-admin" class="org.dcache.qos.services.adjuster.admin.QoSAdjusterAdmin">
-    <description>Commands for monitoring and canceling adjustment tasks.</description>
-    <property name="taskMap" ref="adjuster-task-map"/>
-    <property name="counters" ref="adjuster-counters"/>
-    <property name="history" ref="adjuster-history"/>
-    <property name="messageGuard" ref="message-guard"/>
-  </bean>
-
-  <!-- ***************************************** QOS VERIFIER *************************************** -->
-
-  <bean id="verifier-data-source" class="com.zaxxer.hikari.HikariDataSource"
-    destroy-method="close">
-    <description>Encapsulates the verifier database connection pool and properties.</description>
-    <constructor-arg>
-      <bean class="com.zaxxer.hikari.HikariConfig">
-        <constructor-arg>
-          <bean class="org.dcache.util.configuration.ConfigurationPropertiesFactoryBean">
-            <property name="prefix" value="qos.db.hikari-properties"/>
-            <property name="staticEnvironment">
-              <map>
-                <entry key="jdbcUrl" value="${qos.db.url}"/>
-                <entry key="username" value="${qos.db.user}"/>
-                <entry key="password"
-                  value="#{ T(diskCacheV111.util.Pgpass).getPassword('${qos.db.password.file}', '${qos.db.url}', '${qos.db.user}', '${qos.db.password}') }"/>
-                <entry key="autoCommit" value="true"/>
-                <entry key="transactionIsolation" value="TRANSACTION_READ_COMMITTED"/>
-                <entry key="minimumIdle" value="${qos.db.connections.idle}"/>
-                <entry key="maximumPoolSize" value="${qos.db.connections.max}"/>
-              </map>
-            </property>
-          </bean>
-        </constructor-arg>
-      </bean>
-    </constructor-arg>
-  </bean>
-
-  <bean id="verifier-liquibase" class="org.dcache.util.SpringLiquibase">
-    <description>Verifier database schema manager.</description>
-    <property name="dataSource" ref="verifier-data-source"/>
-    <property name="changeLog" value="classpath:${qos.db.schema.changelog}"/>
-    <property name="shouldUpdate" value="${qos.db.schema.auto}"/>
-  </bean>
-
-  <bean id="verifier-dao" class="org.dcache.qos.services.verifier.data.db.JdbcVerifyOperationDao">
-    <description>Verifier data access object handler.</description>
-    <property name="dataSource" ref="verifier-data-source"/>
-    <property name="fetchSize" value="${qos.db.fetch-size}"/>
-  </bean>
-
-  <bean id="verification-supplier-executor" class="org.dcache.util.CDCExecutorServiceDecorator">
-    <description>Preserves the QOS session id generated for the operation.</description>
-    <constructor-arg>
-      <bean class="java.util.concurrent.Executors" factory-method="newSingleThreadExecutor"
-        destroy-method="shutdownNow">
-      </bean>
-    </constructor-arg>
-  </bean>
-
-  <bean id="file-status-verifier"
-    class="org.dcache.qos.services.verifier.handlers.PoolGroupAndTagsStatusVerifier">
-    <description>Determines what action to take based on requirements and current status of file.</description>
-    <property name="locationSelector">
-      <bean class="org.dcache.qos.services.verifier.util.PoolInfoLocationSelector">
-        <property name="poolInfoMap" ref="pool-info-map"/>
-        <property name="poolSelectionStrategy">
-          <bean class="${qos.pool-selection-strategy}"/>
-        </property>
-      </bean>
-    </property>
-    <property name="poolInfoMap" ref="pool-info-map"/>
-    <property name="pools" ref="pools"/>
-  </bean>
-
-  <bean id="pool-info-map" class="org.dcache.qos.services.verifier.data.PoolInfoMap">
-     <description>Mappings based on the Pool Selection Unit and Pool Monitor information
-                  refreshed periodically, and optimized for the purposes of the verifier.</description>
-  </bean>
-
-  <bean id="verify-operation-queues" class="org.dcache.qos.services.verifier.data.VerifyOperationDaoDelegate">
-    <description>Provides an in-memory façade to the underlying store in the form of a set of queues.</description>
-    <property name="queueSupplier" ref="verification-supplier-executor"/>
-    <property name="capacity" value="${qos.limits.verifier.cache-capacity}"/>
-    <property name="maxRunning" value="${qos.limits.verifier.max-running-operations}"/>
-    <property name="dao" ref="verifier-dao"/>
-  </bean>
-
-  <bean id="verify-operation-map" class="org.dcache.qos.services.verifier.data.VerifyOperationDelegatingMap"
-    destroy-method="shutdown">
-    <description>Provides an in-memory API for accessing verification operations.</description>
-    <property name="timeout" value="${qos.limits.verifier.scan-period}"/>
-    <property name="timeoutUnit" value="${qos.limits.verifier.scan-period.unit}"/>
-    <property name="counters" ref="verify-counters"/>
-    <property name="maxRetries" value="${qos.limits.verifier.operation-retries}"/>
-    <property name="history" ref="verify-history"/>
-    <property name="poolInfoMap" ref="pool-info-map"/>
-    <property name="updateHandler" ref="verify-operation-handler"/>
-    <property name="cache" ref="verify-operation-queues"/>
-    <property name="reloadGracePeriod" value="${qos.limits.verifier.reload-grace-period}"/>
-    <property name="reloadGracePeriodUnit" value="${qos.limits.verifier.reload-grace-period.unit}"/>
-  </bean>
-
-  <bean id="verify-scan-record-map" class="org.dcache.qos.services.verifier.data.VerifyScanRecordMap">
-   <description>Maintains state for ongoing batched verification requests from the scanner.</description>
-    <property name="verifyHandler" ref="verify-operation-handler"/>
-    <property name="executor">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.verifier.bulk-threads}"/>
-      </bean>
-    </property>
-    <property name="scanResponseListener" ref="scanner-client"/>
-    <property name="batchSize" value="${qos.limits.messages.max-batch-size}"/>
-  </bean>
-
-  <bean id="verify-operation-handler"
-    class="org.dcache.qos.services.verifier.handlers.VerifyOperationHandler">
-    <description>Processes the running verification operation by obtaining requirements, 
-                 current file status and computation of the next action to be taken 
-                 (via the file-status-verifier).</description>
-    <property name="poolInfoMap" ref="pool-info-map"/>
-    <property name="fileOpMap" ref="verify-operation-map"/>
-    <property name="scanRecordMap" ref="verify-scan-record-map"/>
-    <property name="statusVerifier" ref="file-status-verifier"/>
-    <property name="updateExecutor">
-      <bean class="org.dcache.util.BoundedCachedExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.verifier.submit-threads}"/>
-      </bean>
-    </property>
-    <property name="taskExecutor">
-      <bean class="java.util.concurrent.ScheduledThreadPoolExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="${qos.limits.verifier.task-threads}"/>
-      </bean>
-    </property>
-    <property name="adjustmentListener" ref="adjuster-client"/>
-    <property name="requirementsListener" ref="requirements-client"/>
-    <property name="actionCompletedListener" ref="file-status-handler"/>
-    <property name="counters" ref="verify-counters"/>
-  </bean>
-
-  <bean id="verify-counters" class="org.dcache.qos.services.verifier.util.QoSVerifierCounters"
-    init-method="initialize">
-    <description>Tracks operation statistics.</description>
-    <property name="statisticsPath" value="${qos.home}/verifier-statistics"/>
-  </bean>
-
-  <bean id="verify-history" class="org.dcache.qos.util.QoSHistory" init-method="initialize">
-    <description>Circular buffer for holding the status of the most recently completed operations.</description>
-    <property name="capacity" value="${qos.limits.verifier.operation-history}"/>
-  </bean>
-
-  <bean id="pool-info-change-handler"
-    class="org.dcache.qos.services.verifier.handlers.PoolInfoChangeHandler"
-    destroy-method="stopWatchdog">
-    <description>Processes Pool Monitor updates and refreshes the internal pool information on that basis.</description>
-    <property name="mapInitializer" ref="verifier-map-initializer"/>
-    <property name="poolInfoMap" ref="pool-info-map"/>
-    <property name="updateHandler" ref="verify-operation-handler"/>
-    <property name="updateService">
-      <bean class="java.util.concurrent.Executors" factory-method="newSingleThreadExecutor"
-        destroy-method="shutdownNow">
-      </bean>
-    </property>
-    <property name="refreshTimeout" value="${qos.limits.pool-info-expiry}"/>
-    <property name="refreshTimeoutUnit" value="${qos.limits.pool-info-expiry.unit}"/>
-  </bean>
-
-  <bean id="verifier-map-initializer"
-    class="org.dcache.qos.services.verifier.util.VerifierMapInitializer"
-    init-method="initialize">
-    <description>Initializes internal maps in the proper order.</description>
-    <property name="initDelay" value="${qos.limits.startup-delay}"/>
-    <property name="initDelayUnit" value="${qos.limits.startup-delay.unit}"/>
-    <property name="initService">
-      <bean class="java.util.concurrent.ScheduledThreadPoolExecutor" destroy-method="shutdownNow">
-        <constructor-arg value="2"/>
-      </bean>
-    </property>
-    <property name="messageGuard" ref="message-guard"/>
-    <property name="poolInfoMap" ref="pool-info-map"/>
-    <property name="verifyOperationMap" ref="verify-operation-map"/>
-    <property name="changeHandler" ref="pool-info-change-handler"/>
-  </bean>
-
-  <bean id="verifier-admin" class="org.dcache.qos.services.verifier.admin.QoSVerifierAdmin">
-    <description>Commands for monitoring, launching and canceling verification requests.</description>
-    <property name="messageGuard" ref="message-guard"/>
-    <property name="initializer" ref="verifier-map-initializer"/>
-    <property name="counters" ref="verify-counters"/>
-    <property name="pnfsManager" ref="pnfs-manager"/>
-    <property name="fileOpHandler" ref="verify-operation-handler"/>
-    <property name="fileOpMap" ref="verify-operation-map"/>
-    <property name="poolInfoMap" ref="pool-info-map"/>
-    <property name="history" ref="verify-history"/>
-    <property name="cache" ref="verify-operation-queues"/>
-  </bean>
-
-</beans>
diff --git a/skel/share/defaults/qos.properties b/skel/share/defaults/qos.properties
index be8648b40b5..9fbe2311b4f 100644
--- a/skel/share/defaults/qos.properties
+++ b/skel/share/defaults/qos.properties
@@ -8,7 +8,7 @@
 
 #  ---- Cell names of qos services
 #
-qos.cell.name=qos
+(deprecated)qos.cell.name=qos
 
 #  ---- Named queues to consume from
 #
@@ -19,11 +19,11 @@ qos.cell.name=qos
 #       This property contains a comma separated list of named queues to
 #       consume from.
 #
-qos.cell.consume = ${qos.cell.name}
+(deprecated)qos.cell.consume = ${qos.cell.name}
 
 #  ---- Message topics to subscribe to.
 #
-qos.cell.subscribe=${qos.cache-location-topic},\
+(deprecated)qos.cell.subscribe=${qos.cache-location-topic},\
   ${qos.corrupt-file-topic},\
   ${qos.pool-monitor-topic}
 
@@ -146,17 +146,17 @@ qos.service.scanner.timeout=1
 qos.service.verification.timeout=1
 (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)qos.service.verification.timeout.unit=MINUTES
 
-(deprecated)qos.adjuster.cell.consume=use qos-adjuster.cell.consume
-(deprecated)qos.adjuster.cell.name=use qos-adjuster.cell.name
-(deprecated)qos.db.verifier.connections.idle=use qos-verifier.db.connections.idle
-(deprecated)qos.db.verifier.connections.max=use qos-verifier.db.connections.max
-(deprecated)qos.db.verifier.fetch-size=use qos-verifier.db.fetch-size
-(deprecated)qos.engine.cell.consume=use qos-engine.cell.consume
-(deprecated)qos.engine.cell.name=use qos-engine.cell.name
-(deprecated)qos.engine.cell.subscribe=use qos-engine.cell.subscribe
-(deprecated)qos.scanner.cell.consume=use qos-scanner.cell.consume 
-(deprecated)qos.scanner.cell.name=use qos-scanner.cell.name
-(deprecated)qos.scanner.cell.subscribe=use qos-scanner.cell.subscribe
-(deprecated)qos.verifier.cell.consume=use qos-verifier.cell.consume
-(deprecated)qos.verifier.cell.name=use qos-verifier.cell.name
-(deprecated)qos.verifier.cell.subscribe=use qos-verifier.cell.subscribe
\ No newline at end of file
+(obsolete)qos.adjuster.cell.consume=use qos-adjuster.cell.consume
+(obsolete)qos.adjuster.cell.name=use qos-adjuster.cell.name
+(obsolete)qos.db.verifier.connections.idle=use qos-verifier.db.connections.idle
+(obsolete)qos.db.verifier.connections.max=use qos-verifier.db.connections.max
+(obsolete)qos.db.verifier.fetch-size=use qos-verifier.db.fetch-size
+(obsolete)qos.engine.cell.consume=use qos-engine.cell.consume
+(obsolete)qos.engine.cell.name=use qos-engine.cell.name
+(obsolete)qos.engine.cell.subscribe=use qos-engine.cell.subscribe
+(obsolete)qos.scanner.cell.consume=use qos-scanner.cell.consume
+(obsolete)qos.scanner.cell.name=use qos-scanner.cell.name
+(obsolete)qos.scanner.cell.subscribe=use qos-scanner.cell.subscribe
+(obsolete)qos.verifier.cell.consume=use qos-verifier.cell.consume
+(obsolete)qos.verifier.cell.name=use qos-verifier.cell.name
+(obsolete)qos.verifier.cell.subscribe=use qos-verifier.cell.subscribe
\ No newline at end of file
diff --git a/skel/share/services/qos.batch b/skel/share/services/qos.batch
deleted file mode 100644
index 642b0d3ea82..00000000000
--- a/skel/share/services/qos.batch
+++ /dev/null
@@ -1,88 +0,0 @@
-## QoS services
-
-onerror shutdown
-check -strong qos.cell.name
-check -strong qos.cell.consume
-check -strong qos.cell.subscribe
-check -strong qos.cache-location-topic
-check -strong qos.corrupt-file-topic
-check -strong qos.pool-monitor-topic
-check -strong qos.transition-completed-topic
-check -strong qos.home
-check -strong qos.db.namespace.connections.max
-check -strong qos.db.namespace.connections.idle
-check -strong qos.db.namespace.fetch-size
-check -strong qos.db.connections.max
-check -strong qos.db.connections.idle
-check -strong qos.db.fetch-size
-check -strong qos.plugins.storage-info-extractor
-check -strong qos.limits.requirements.submit-threads
-check -strong qos.limits.verifier.submit-threads
-check -strong qos.limits.verifier.bulk-threads
-check -strong qos.limits.verifier.task-threads
-check -strong qos.limits.verifier.remove-threads
-check -strong qos.limits.adjuster.submit-threads
-check -strong qos.limits.adjuster.task-threads
-check -strong qos.limits.scanner.submit-threads
-check -strong qos.limits.scanner.task-threads
-check -strong qos.limits.verifier.max-running-operations
-check -strong qos.limits.verifier.cache-capacity
-check -strong qos.limits.adjuster.task-history
-check -strong qos.limits.verifier.operation-history
-check -strong qos.limits.verifier.operation-retries
-check -strong qos.limits.adjuster.task-retries
-check -strong qos.limits.verifier.scan-period
-check -strong qos.limits.verifier.scan-period.unit
-check -strong qos.limits.adjuster.scan-period
-check -strong qos.limits.adjuster.scan-period.unit
-check -strong qos.limits.pool-info-expiry
-check -strong qos.limits.pool-info-expiry.unit
-check -strong qos.limits.scanner.down-grace-period
-check -strong qos.limits.scanner.down-grace-period.unit
-check -strong qos.limits.scanner.restart-grace-period
-check -strong qos.limits.scanner.restart-grace-period.unit
-check -strong qos.limits.scanner.pool-op-init-grace-period
-check -strong qos.limits.scanner.pool-op-init-grace-period.unit
-check -strong qos.limits.scanner.pool-op-max-idle-time
-check -strong qos.limits.scanner.pool-op-max-idle-time.unit
-check -strong qos.limits.scanner.scan-period
-check -strong qos.limits.scanner.scan-period.unit
-check -strong qos.limits.scanner.online-window
-check -strong qos.limits.scanner.online-window.unit
-check -strong qos.limits.scanner.enable.nearline-scan
-check -strong qos.limits.scanner.nearline-window
-check -strong qos.limits.scanner.nearline-window.unit
-check -strong qos.limits.scanner.online-batch-size
-check -strong qos.limits.scanner.nearline-batch-size
-check -strong qos.limits.startup-delay
-check -strong qos.limits.startup-delay.unit
-check -strong qos.limits.verifier.reload-grace-period
-check -strong qos.limits.verifier.reload-grace-period.unit
-check -strong qos.pool-selection-strategy
-check -strong qos.service.pinmanager
-check -strong qos.service.pinmanager.timeout
-check -strong qos.service.pinmanager.timeout.unit
-check -strong qos.service.pnfsmanager
-check -strong qos.service.pnfsmanager.timeout
-check -strong qos.service.pnfsmanager.timeout.unit
-check -strong qos.service.pool.timeout
-check -strong qos.service.pool.timeout.unit
-check -strong qos.service.transition.timeout
-check -strong qos.service.transition.timeout.unit
-check -strong qos.service.requirements
-check -strong qos.service.requirements.timeout
-check -strong qos.service.requirements.timeout.unit
-check -strong qos.service.adjustment
-check -strong qos.service.adjustment.timeout
-check -strong qos.service.adjustment.timeout.unit
-check -strong qos.service.scanner
-check -strong qos.service.scanner.timeout
-check -strong qos.service.scanner.timeout.unit
-check -strong qos.service.verification
-check -strong qos.service.verification.timeout
-check -strong qos.service.verification.timeout.unit
-
-create org.dcache.cells.UniversalSpringCell ${qos.cell.name} \
-        "classpath:org/dcache/qos/qos.xml \
-        -subscribe=${qos.cell.subscribe} \
-        -consume=${qos.cell.consume}"