Skip to content

Commit 8e6f87d

Browse files
authored
Merge pull request #8235 from chaen/v9.0_real_random
[9.0] Respect PrefferedURLPatterns
2 parents 7781d39 + b844c5a commit 8e6f87d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/DIRAC/Core/DISET/private/BaseClient.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ def __findServiceURL(self):
323323
pass
324324

325325
# We randomize the list, and add at the end the failover URLs (System/FailoverURLs/Component)
326-
urlsList = List.randomize(List.fromChar(urls, ",")) + failoverUrls
326+
urlsList = List.fromChar(urls, ",") + failoverUrls
327327
self.__nbOfUrls = len(urlsList)
328328
self.__nbOfRetry = (
329329
2 if self.__nbOfUrls > 2 else 3
@@ -445,7 +445,6 @@ def _connect(self):
445445
return self.__initStatus
446446
if self.__enableThreadCheck:
447447
self.__checkThreadID()
448-
449448
gLogger.debug(f"Trying to connect to: {self.serviceURL}")
450449
try:
451450
# Calls the transport method of the apropriate protocol.

src/DIRAC/DataManagementSystem/Utilities/DMSHelpers.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"""
2-
This module contains helper methods for accessing operational attributes or parameters of DMS objects
2+
This module contains helper methods for accessing operational attributes or parameters of DMS objects
33
44
"""
5+
56
from collections import defaultdict
67
from DIRAC import gConfig, gLogger, S_OK, S_ERROR
78
from DIRAC.ConfigurationSystem.Client.Helpers.Path import cfgPath
@@ -17,6 +18,9 @@
1718
def resolveSEGroup(seGroupList, allSEs=None):
1819
"""
1920
Resolves recursively a (list of) SEs that can be groupSEs
21+
For modules, JobWrapper or whatever runs at a given site,
22+
prefer using :py:func:`~DIRAC.DataManagementSystem.Utilities.ResolveSE.getDestinationSEList`
23+
2024
2125
:param seGroupList: list of SEs to resolve or comma-separated SEs
2226
:type seGroupList: list or string

0 commit comments

Comments
 (0)