68301ba20e
This commit adds two features to zed, that macOS desires. The first is that when you unload the kernel module, zed would enter into a cpubusy loop calling zfs_events_next() repeatedly. We now look for ENODEV, returned by kernel, so zed can exit gracefully. Second feature is -I (idle) (alas -P persist was taken) is for the deamon to; 1; if started without ZFS kernel module, stick around waiting for it. 2; if kernel module is unloaded, go back to 1. This is due to daemons in macOS is started by launchctl, and is expected to stick around. Currently, the busy loop only exists when errno is ENODEV. This is to ensure that functionality that upstream expects is not changed. It did not care about errors before, and it still does not. (with the exception of ENODEV). However, it is probably better that all errors (ERESTART notwithstanding) exits the loop, and the issues complaining about zed taking all CPU will go away. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Jorgen Lundman <lundman@lundman.net> Closes #10476
63 lines
2.2 KiB
C
63 lines
2.2 KiB
C
/*
|
|
* This file is part of the ZFS Event Daemon (ZED)
|
|
* for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
|
|
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
|
|
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
|
|
* Refer to the ZoL git commit log for authoritative copyright attribution.
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License Version 1.0 (CDDL-1.0).
|
|
* You can obtain a copy of the license from the top-level file
|
|
* "OPENSOLARIS.LICENSE" or at <http://opensource.org/licenses/CDDL-1.0>.
|
|
* You may not use this file except in compliance with the license.
|
|
*/
|
|
|
|
#ifndef ZED_CONF_H
|
|
#define ZED_CONF_H
|
|
|
|
#include <libzfs.h>
|
|
#include <stdint.h>
|
|
#include "zed_strings.h"
|
|
|
|
struct zed_conf {
|
|
unsigned do_force:1; /* true if force enabled */
|
|
unsigned do_foreground:1; /* true if run in foreground */
|
|
unsigned do_memlock:1; /* true if locking memory */
|
|
unsigned do_verbose:1; /* true if verbosity enabled */
|
|
unsigned do_zero:1; /* true if zeroing state */
|
|
unsigned do_idle:1; /* true if idle enabled */
|
|
int syslog_facility; /* syslog facility value */
|
|
int min_events; /* RESERVED FOR FUTURE USE */
|
|
int max_events; /* RESERVED FOR FUTURE USE */
|
|
char *conf_file; /* abs path to config file */
|
|
char *pid_file; /* abs path to pid file */
|
|
int pid_fd; /* fd to pid file for lock */
|
|
char *zedlet_dir; /* abs path to zedlet dir */
|
|
zed_strings_t *zedlets; /* names of enabled zedlets */
|
|
char *state_file; /* abs path to state file */
|
|
int state_fd; /* fd to state file */
|
|
libzfs_handle_t *zfs_hdl; /* handle to libzfs */
|
|
int zevent_fd; /* fd for access to zevents */
|
|
char *path; /* custom $PATH for zedlets to use */
|
|
};
|
|
|
|
struct zed_conf *zed_conf_create(void);
|
|
|
|
void zed_conf_destroy(struct zed_conf *zcp);
|
|
|
|
void zed_conf_parse_opts(struct zed_conf *zcp, int argc, char **argv);
|
|
|
|
void zed_conf_parse_file(struct zed_conf *zcp);
|
|
|
|
int zed_conf_scan_dir(struct zed_conf *zcp);
|
|
|
|
int zed_conf_write_pid(struct zed_conf *zcp);
|
|
|
|
int zed_conf_open_state(struct zed_conf *zcp);
|
|
|
|
int zed_conf_read_state(struct zed_conf *zcp, uint64_t *eidp, int64_t etime[]);
|
|
|
|
int zed_conf_write_state(struct zed_conf *zcp, uint64_t eid, int64_t etime[]);
|
|
|
|
#endif /* !ZED_CONF_H */
|