Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not shutdown if UPS is performing calibration #817

Merged
merged 2 commits into from
Oct 7, 2020
Merged

Do not shutdown if UPS is performing calibration #817

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b2697
Do not shutdown if UPS is performing calibration
overhacked Sep 22, 2020
6b43dbb
Update upsmon.c
jimklimov Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions clients/upsmon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,10 @@ static int is_ups_critical(utype_t *ups)

/* must be OB+LB now */

/* if UPS is calibrating, don't declare it critical */
if (flag_isset(ups->status, ST_CAL))
return 0;

/* if we're a master, declare it critical so we set FSD on it */
if (flag_isset(ups->status, ST_MASTER))
return 1;
Expand Down Expand Up @@ -743,6 +747,21 @@ static void upsreplbatt(utype_t *ups)
}
}

static void ups_cal(utype_t *ups)
{
if (flag_isset(ups->status, ST_CAL)) { /* no change */
upsdebugx(4, "%s: %s (no change)", __func__, ups->sys);
return;
}

upsdebugx(3, "%s: %s (first time)", __func__, ups->sys);

/* must have changed from !CAL to CAL, so notify */

do_notify(ups, NOTIFY_CAL);
setflag(&ups->status, ST_CAL);
}

static void ups_fsd(utype_t *ups)
{
if (flag_isset(ups->status, ST_FSD)) { /* no change */
Expand Down Expand Up @@ -1372,9 +1391,10 @@ static void setup_signals(void)
/* remember the last time the ups was not critical (OB + LB) */
static void update_crittimer(utype_t *ups)
{
/* if !OB or !LB, then it's not critical, so log the time */
if ((!flag_isset(ups->status, ST_ONBATT)) ||
(!flag_isset(ups->status, ST_LOWBATT))) {
/* if !OB, !LB, or CAL, then it's not critical, so log the time */
if ((!flag_isset(ups->status, ST_ONBATT)) ||
(!flag_isset(ups->status, ST_LOWBATT)) ||
(flag_isset(ups->status, ST_CAL))) {

time(&ups->lastnoncrit);
return;
Expand Down Expand Up @@ -1492,6 +1512,8 @@ static void parse_status(utype_t *ups, char *status)
ups_low_batt(ups);
if (!strcasecmp(statword, "RB"))
upsreplbatt(ups);
if (!strcasecmp(statword, "CAL"))
ups_cal(ups);

/* do it last to override any possible OL */
if (!strcasecmp(statword, "FSD"))
Expand Down
3 changes: 3 additions & 0 deletions clients/upsmon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#define ST_MASTER (1 << 4) /* we are the master on this UPS */
#define ST_LOGIN (1 << 5) /* we are logged into this UPS */
#define ST_CONNECTED (1 << 6) /* upscli_connect returned OK */
#define ST_CAL (1 << 7) /* UPS calibration in progress (CAL) */

/* required contents of flag file */
#define SDMAGIC "upsmon-shutdown-file"
Expand Down Expand Up @@ -75,6 +76,7 @@ typedef struct {
#define NOTIFY_REPLBATT 7 /* UPS battery needs to be replaced */
#define NOTIFY_NOCOMM 8 /* UPS hasn't been contacted in awhile */
#define NOTIFY_NOPARENT 9 /* privileged parent process died */
#define NOTIFY_CAL 10 /* UPS is performing calibration */

/* notify flag values */

Expand Down Expand Up @@ -104,6 +106,7 @@ struct {
{ NOTIFY_REPLBATT, "REPLBATT", NULL, "UPS %s battery needs to be replaced", NOTIFY_SYSLOG | NOTIFY_WALL },
{ NOTIFY_NOCOMM, "NOCOMM", NULL, "UPS %s is unavailable", NOTIFY_SYSLOG | NOTIFY_WALL },
{ NOTIFY_NOPARENT, "NOPARENT", NULL, "upsmon parent process died - shutdown impossible", NOTIFY_SYSLOG | NOTIFY_WALL },
{ NOTIFY_CAL, "CAL", NULL, "UPS %s: calibration in progress", NOTIFY_SYSLOG },
{ 0, NULL, NULL, NULL, 0 }
};

Expand Down