From 656a1423de3fe491e35fa18cebff84de7a44316d Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 26 Apr 2019 09:18:51 +0000
Subject: [PATCH] SW-657: changed rpc timeouts to sane values, so scheduling
does not hang on long-term blocking rpc calls
---
.../ResourceAssigner/lib/resource_assigner.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py
index 955890d8ad9..7d873bad86a 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py
@@ -116,12 +116,12 @@ class ResourceAssigner(object):
:param radb_dbcreds: the credentials to be used for accessing the RADB (default: None, which means default)
"""
- self.radbrpc = RARPC(servicename=radb_servicename, busname=radb_busname, broker=broker, timeout=180)
- self.rerpc = RPC(re_servicename, busname=re_busname, broker=broker, ForwardExceptions=True, timeout=180)
- self.otdbrpc = OTDBRPC(busname=otdb_busname, servicename=otdb_servicename, broker=broker, timeout=180)
- self.momrpc = MoMQueryRPC(servicename=mom_servicename, busname=mom_busname, broker=broker, timeout=180)
- self.sqrpc = StorageQueryRPC(busname=storagequery_busname, servicename=storagequery_servicename, broker=broker)
- self.curpc = CleanupRPC(busname=cleanup_busname, servicename=cleanup_servicename, broker=broker)
+ self.radbrpc = RARPC(servicename=radb_servicename, busname=radb_busname, broker=broker, timeout=30)
+ self.rerpc = RPC(re_servicename, busname=re_busname, broker=broker, ForwardExceptions=True, timeout=30)
+ self.otdbrpc = OTDBRPC(busname=otdb_busname, servicename=otdb_servicename, broker=broker, timeout=30)
+ self.momrpc = MoMQueryRPC(servicename=mom_servicename, busname=mom_busname, broker=broker, timeout=30)
+ self.sqrpc = StorageQueryRPC(busname=storagequery_busname, servicename=storagequery_servicename, broker=broker, timeout=30)
+ self.curpc = CleanupRPC(busname=cleanup_busname, servicename=cleanup_servicename, broker=broker, timeout=120)
self.ra_notification_bus = ToBus(address=ra_notification_busname, broker=broker)
self.ra_notification_prefix = ra_notification_prefix
self.obscontrol = ObservationControlRPCClient(busname=observation_control_busname,
--
GitLab