Skip to content

Commit 2ffb228

Browse files
authored
Merge pull request #6844 from chaen/v7r3_FIX_reqProxy
[v7r3] ReqProxy does not immediately forward to central service
2 parents 387649e + d6d76ef commit 2ffb228

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

src/DIRAC/RequestManagementSystem/Service/ReqProxyHandler.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ def export_getStatus(self):
186186
types_putRequest = [six.string_types]
187187

188188
def export_putRequest(self, requestJSON):
189-
"""forward request from local RequestDB to central RequestManager
189+
"""Dump the request in a local cache for later forwarding
190190
191191
:param self: self reference
192-
:param str requestType: request type
192+
:param str requestJSON: json dump of the request
193193
"""
194194

195195
gMonitor.addMark("reqReceived", 1)
@@ -210,21 +210,13 @@ def export_putRequest(self, requestJSON):
210210
if not forwardable["OK"]:
211211
gLogger.warn("putRequest: %s" % forwardable["Message"])
212212

213-
setRequest = self.requestManager().putRequest(requestJSON)
214-
if not setRequest["OK"]:
215-
gLogger.error(
216-
"setReqeuest: unable to set request '%s' @ RequestManager: %s" % (requestName, setRequest["Message"])
217-
)
218-
# # put request to the request file cache
219-
save = self.__saveRequest(requestName, requestJSON)
220-
if not save["OK"]:
221-
gLogger.error("setRequest: unable to save request to the cache: %s" % save["Message"])
222-
return save
223-
gLogger.info("setRequest: %s is saved to %s file" % (requestName, save["Value"]))
224-
return S_OK({"set": False, "saved": True})
225-
226-
gLogger.info("setRequest: request '%s' has been set to the ReqManager" % (requestName))
227-
return S_OK({"set": True, "saved": False})
213+
# # put request to the request file cache
214+
save = self.__saveRequest(requestName, requestJSON)
215+
if not save["OK"]:
216+
gLogger.error("setRequest: unable to save request to the cache: %s" % save["Message"])
217+
return save
218+
gLogger.info("setRequest: %s is saved to %s file" % (requestName, save["Value"]))
219+
return S_OK({"set": False, "saved": True})
228220

229221
@staticmethod
230222
def __forwardable(requestDict):

0 commit comments

Comments
 (0)