Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3075 from freenas/NAS-101821-11.3
NAS-101821 / 11.3 / Do not report transport-related errors when running alerts on backup … (by themylogin)
  • Loading branch information
themylogin committed May 22, 2019
2 parents 879ffa6 + d0d3a3c commit 3ee0b79
Showing 1 changed file with 12 additions and 20 deletions.
32 changes: 12 additions & 20 deletions src/middlewared/middlewared/plugins/alert.py
Expand Up @@ -473,29 +473,21 @@ async def __run_alerts(self):
else alert["level"])))
for alert in alerts_b]
except CallError as e:
if e.errno == CallError.EALERTCHECKERUNAVAILABLE:
if e.errno in [errno.ECONNREFUSED, errno.EHOSTDOWN, errno.ETIMEDOUT,
CallError.EALERTCHECKERUNAVAILABLE]:
pass
else:
raise
except Exception as e:
if isinstance(e, CallError) and e.errno in [errno.ECONNREFUSED, errno.EHOSTDOWN, errno.ETIMEDOUT]:
alerts_b = [
Alert(AlertSourceRunFailedOnBackupNodeAlertClass,
args={
"source_name": alert_source.name,
"traceback": str(e),
},
_source=alert_source.name)
]
else:
alerts_b = [
Alert(AlertSourceRunFailedOnBackupNodeAlertClass,
args={
"source_name": alert_source.name,
"traceback": traceback.format_exc(),
},
_source=alert_source.name)
]
except Exception:
alerts_b = [
Alert(AlertSourceRunFailedOnBackupNodeAlertClass,
args={
"source_name": alert_source.name,
"traceback": traceback.format_exc(),
},
_source=alert_source.name)
]

for alert in alerts_b:
alert.node = backup_node

Expand Down

0 comments on commit 3ee0b79

Please sign in to comment.