summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorRob Johnston <rob.johnston@joyent.com>2018-02-15 17:20:09 -0800
committerDan McDonald <danmcd@joyent.com>2018-02-20 10:24:47 -0500
commita3f6a2a475fa4c811f7440bedffcf6acabbe1e0e (patch)
tree1c02f99ff6aacaadd01cd85b1440fefcf3447601 /usr/src
parent84f7925403b3bca6fbe5475f7e5fe9e20852b686 (diff)
downloadillumos-joyent-a3f6a2a475fa4c811f7440bedffcf6acabbe1e0e.tar.gz
9118 fmadm reports faults without message summary
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Yuri Pankov <yuripv@yuripv.net> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/fm/modules/common/eversholt/fme.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/cmd/fm/modules/common/eversholt/fme.c b/usr/src/cmd/fm/modules/common/eversholt/fme.c
index 096caa73db..e153385551 100644
--- a/usr/src/cmd/fm/modules/common/eversholt/fme.c
+++ b/usr/src/cmd/fm/modules/common/eversholt/fme.c
@@ -22,6 +22,7 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
*
* fme.c -- fault management exercise module
*
@@ -323,7 +324,7 @@ prune_propagations(const char *e0class, const struct ipath *e0ipp)
static struct fme *
newfme(const char *e0class, const struct ipath *e0ipp, fmd_hdl_t *hdl,
- fmd_case_t *fmcase, fmd_event_t *ffep, nvlist_t *nvl)
+ fmd_case_t *fmcase, fmd_event_t *ffep, nvlist_t *nvl)
{
struct cfgdata *cfgdata;
int init_size;
@@ -350,6 +351,7 @@ newfme(const char *e0class, const struct ipath *e0ipp, fmd_hdl_t *hdl,
out(O_ALTFP|O_VERB2, "Unable to map \"%s\" ereport "
"to component path, but silent discard allowed.",
e0class);
+ fmd_case_close(hdl, fmcase);
} else {
Undiag_reason = UD_VAL_BADEVENTPATH;
(void) nvlist_lookup_nvlist(nvl, FM_EREPORT_DETECTOR,
@@ -4153,7 +4155,7 @@ causes_test(struct fme *fmep, struct event *ep,
static enum fme_state
hypothesise(struct fme *fmep, struct event *ep,
- unsigned long long at_latest_by, unsigned long long *pdelay)
+ unsigned long long at_latest_by, unsigned long long *pdelay)
{
enum fme_state rtr, otr;
unsigned long long my_delay;