SW-657: changed rpc timeouts to sane values, so scheduling does not hang on...

SW-657: changed rpc timeouts to sane values, so scheduling does not hang on long-term blocking rpc calls

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,