SW-699: getOtdbIdsFoundOnDisk

SAS/DataManagement/StorageQueryService/cache.py

@@ -191,11 +191,13 @@ class CacheManager:
             if path in path_cache:
                 path_cache[path]['needs_update'] = True
 
-    def getDiskUsagesForAllOtdbIds(self, force_update=False):
-        otdb_ids = []
+    def getOtdbIdsFoundOnDisk(self):
         with self._cacheLock:
             otdb_id2path_cache = self._cache['otdb_id2path']
-            otdb_ids = list(otdb_id2path_cache.keys())
+            return sorted(list(otdb_id2path_cache.keys()))
+
+    def getDiskUsagesForAllOtdbIds(self, force_update=False):
+        otdb_ids = self.getOtdbIdsFoundOnDisk()
 
         result = {}
         for otdb_id in otdb_ids:

SAS/DataManagement/StorageQueryService/rpc.py

@@ -52,6 +52,9 @@ class StorageQueryRPC(RPCClientContextManagerMixin):
     def getDiskUsagesForAllOtdbIds(self, force_update=False):
         return self._rpc_client.execute('GetDiskUsagesForAllOtdbIds', force_update=force_update)
 
+    def getOtdbIdsFoundOnDisk(self):
+        return self._rpc_client.execute('GetOtdbIdsFoundOnDisk')
+
 def main():
     from pprint import pprint
     import sys

SAS/DataManagement/StorageQueryService/service.py

@@ -34,6 +34,7 @@ class StorageQueryHandler(ServiceMessageHandler):
         self.register_service_method('GetDiskUsageForProjectsDirAndSubDirectories', self.cache.getDiskUsageForProjectsDirAndSubDirectories)
         self.register_service_method('GetDiskUsageForPath', self.cache.getDiskUsageForPath)
         self.register_service_method('GetDiskUsagesForAllOtdbIds', self.cache.getDiskUsagesForAllOtdbIds)
+        self.register_service_method('GetOtdbIdsFoundOnDisk', self.cache.getOtdbIdsFoundOnDisk)
 
 def createService(exchange=DEFAULT_BUSNAME, broker=DEFAULT_BROKER,
                   mountpoint=CEP4_DATA_MOUNTPOINT, cache_manager=None):