Remove granularity

tardis/adapters/sites/cloudstack.py

@@ -94,17 +94,17 @@ def handle_exceptions(self):
             yield
         except asyncio.TimeoutError as te:
             raise TardisTimeout from te
-        except ClientConnectionError:
+        except ClientConnectionError as err:
             logger.warning("Connection reset error")
-            raise TardisResourceStatusUpdateFailed
+            raise TardisResourceStatusUpdateFailed from err
         except CloudStackClientException as ce:
             log_msg = (
                 f"Error code: {ce.error_code}, error text: {ce.error_text}, "
                 f"response: {ce.response}"
             )
             if ce.error_code == 535:
                 logger.warning(f"Quota exceeded: {log_msg}")
-                raise TardisQuotaExceeded
+                raise TardisQuotaExceeded from ce
             elif ce.error_code == 500:
                 if "timed out" in ce.response["message"]:
                     logger.warning(f"Timed out: {log_msg}")

tardis/adapters/sites/htcondor.py

@@ -140,7 +140,7 @@ async def resource_status(
             if (
                 self._htcondor_queue.last_update - resource_attributes.created
             ).total_seconds() < 0:
-                raise TardisResourceStatusUpdateFailed
+                raise TardisResourceStatusUpdateFailed from None
             else:
                 return AttributeDict(resource_status=ResourceStatus.Deleted)
         else:

tardis/adapters/sites/moab.py

@@ -157,11 +157,11 @@ async def resource_status(
         try:
             resource_uuid = resource_attributes.remote_resource_uuid
             resource_status = self._moab_status[str(resource_uuid)]
-        except KeyError:
+        except KeyError as err:
             if (
                 self._moab_status._last_update - resource_attributes.created
             ).total_seconds() < 0:
-                raise TardisResourceStatusUpdateFailed
+                raise TardisResourceStatusUpdateFailed from err
             else:
                 resource_status = {
                     "JobID": resource_attributes.remote_resource_uuid,
@@ -234,7 +234,7 @@ def handle_exceptions(self):
             raise TardisTimeout from te
         except asyncssh.Error as exc:
             logger.warning("SSH connection failed: " + str(exc))
-            raise TardisResourceStatusUpdateFailed
+            raise TardisResourceStatusUpdateFailed from exc
         except IndexError as ide:
             raise TardisResourceStatusUpdateFailed from ide
         except TardisResourceStatusUpdateFailed:

tardis/adapters/sites/openstack.py

@@ -105,14 +105,14 @@ def handle_exceptions(self):
             raise TardisTimeout from te
         except AuthError as ae:
             raise TardisAuthError from ae
-        except ContentTypeError:
+        except ContentTypeError as cte:
             logger.warning("OpenStack: content Type Error")
-            raise TardisResourceStatusUpdateFailed
-        except ClientError:
+            raise TardisResourceStatusUpdateFailed from cte
+        except ClientError as ce:
             logger.warning("REST client error")
-            raise TardisDroneCrashed
-        except ClientConnectionError:
+            raise TardisDroneCrashed from ce
+        except ClientConnectionError as cde:
             logger.warning("Connection reset error")
-            raise TardisResourceStatusUpdateFailed
+            raise TardisResourceStatusUpdateFailed from cde
         except Exception as ex:
             raise TardisError from ex

tardis/adapters/sites/slurm.py

@@ -143,7 +143,7 @@ async def resource_status(
                 # In case the created timestamp is after last update timestamp of the
                 # asynccachemap, no decision about the current state can be given,
                 # since map is updated asynchronously. Just retry later on.
-                raise TardisResourceStatusUpdateFailed
+                raise TardisResourceStatusUpdateFailed from None
             else:
                 resource_status = {
                     "JobID": resource_attributes.remote_resource_uuid,
@@ -209,7 +209,7 @@ def handle_exceptions(self):
             yield
         except CommandExecutionFailure as ex:
             logger.warning("Execute command failed: %s" % str(ex))
-            raise TardisResourceStatusUpdateFailed
+            raise TardisResourceStatusUpdateFailed from ex
         except TardisResourceStatusUpdateFailed:
             raise
         except TimeoutError as te:

tardis/resources/dronestates.py

@@ -59,12 +59,12 @@ async def resource_status(state_transition, drone: "Drone", current_state: Type[
             await drone.site_agent.resource_status(drone.resource_attributes)
         )
         logger.debug(f"Resource attributes: {drone.resource_attributes}")
-    except (TardisAuthError, TardisTimeout, TardisResourceStatusUpdateFailed):
+    except (TardisAuthError, TardisTimeout, TardisResourceStatusUpdateFailed) as err:
         #  Retry to get current state of the resource
-        raise StopProcessing(last_result=current_state())
-    except TardisDroneCrashed:
+        raise StopProcessing(last_result=current_state()) from err
+    except TardisDroneCrashed as tdc:
         #  Try to cleanup crashed resources
-        raise StopProcessing(last_result=CleanupState())
+        raise StopProcessing(last_result=CleanupState()) from tdc
     else:
         return state_transition[drone.resource_attributes.resource_status]()
 

tardis/resources/poolfactory.py

@@ -80,7 +80,6 @@ def create_composite_pool(configuration: str = None) -> WeightedComposite:
                     Standardiser(
                         FactoryPool(*check_pointed_drones, factory=drone_factory),
                         minimum=cpu_cores,
-                        granularity=cpu_cores,
                     ),
                     name=f"{site.name.lower()}_{machine_type.lower()}",
                 )

tardis/utilities/attributedict.py

@@ -16,7 +16,7 @@ def __getattr__(self, item):
         except KeyError:
             raise AttributeError(
                 f"{item} is not a valid attribute. Dict contains {str(self)}."
-            )
+            ) from None
 
     def __setattr__(self, key, value):
         self[key] = value
@@ -27,4 +27,4 @@ def __delattr__(self, item):
         except KeyError:
             raise AttributeError(
                 f"{item} is not a valid attribute. Dict contains {str(self)}."
-            )
+            ) from None

tests/resources_t/test_poolfactory.py

@@ -100,7 +100,7 @@ def test_create_composite(
         self.assertEqual(
             mock_standardiser.mock_calls,
             [
-                call(mock_factory_pool(), minimum=cpu_cores, granularity=cpu_cores),
+                call(mock_factory_pool(), minimum=cpu_cores),
                 call(mock_weighted_composite(), maximum=self.config.Sites[0].quota),
             ],
         )