mirror of
https://github.com/openzfs/zfs.git
synced 2025-10-01 02:46:29 +00:00
35ec4b14ab
When running zpool iostat in interval mode, it would not notice any new
pools created or imported, and would forget any destroyed or exported,
so would not notice if they came back. This leads to outputting "no
pools available" every interval until killed.
It looks like this was at least intended to work; the comment above
zpool_do_iostat() indicates that it is expected to "deal with pool
creation/destruction" and that pool_list_update() would detect new
pools. That call however was removed in 3e43edd2c5, though its unclear
if that broke this behaviour and it wasn't noticed, or if it never
worked, or if something later broke it. That said, the lack of
pool_list_update() is only part of the reason it doesn't work properly.
The fundamental problem is that the various things involved in
refreshing or updating the list of pools would aggressively ignore,
remove, skip or fail on pools that stop existing, or that already exist.
Mostly this meant that once a pool is removed from the list, it will
never be seen again. Restoring pool_list_update() to the
zpool_do_iostat() loop only partially fixes this - it would find "new"
pools again, but only in the "all pools" (no args) mode, and because its
iterator callback add_pool() would abort the iterator if it already has
a pool listed, it would only add pools if there weren't any already.
So, this commit reworks the structure somewhat. pool_list_update()
becomes pool_list_refresh(), and will ensure the state of all pools in
the list are updated. In the "all pools" mode, it will also add new
pools and remove pools that disappear, but when a fixed list of pools is
used, the list doesn't change, only the state of the pools within it.
The rest of the commit is adjusting things for this much simpler
structure. Regardless of the mode in use, pool_list_refresh() will
always do the right thing, so the driver code can just get on with the
display.
Now that pools can appear and disappear, I've made it so the header (if
enabled) is re-printed when the list changes, so that its easier to see
what's happening if the column widths change.
Since this is all rather complicated, I've included tests for the "all
pools" and "set of pools" modes.
Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Closes #17786
149 lines
4.3 KiB
C
149 lines
4.3 KiB
C
// SPDX-License-Identifier: CDDL-1.0
|
|
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or https://opensource.org/licenses/CDDL-1.0.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
*/
|
|
|
|
#ifndef ZPOOL_UTIL_H
|
|
#define ZPOOL_UTIL_H
|
|
|
|
#include <libnvpair.h>
|
|
#include <libzfs.h>
|
|
#include <libzutil.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Path to scripts you can run with "zpool status/iostat -c" */
|
|
#define ZPOOL_SCRIPTS_DIR SYSCONFDIR"/zfs/zpool.d"
|
|
|
|
/*
|
|
* Basic utility functions
|
|
*/
|
|
void *safe_malloc(size_t);
|
|
void *safe_realloc(void *, size_t);
|
|
void zpool_no_memory(void);
|
|
uint_t num_logs(nvlist_t *nv);
|
|
uint64_t array64_max(uint64_t array[], unsigned int len);
|
|
int highbit64(uint64_t i);
|
|
int lowbit64(uint64_t i);
|
|
|
|
/*
|
|
* Misc utility functions
|
|
*/
|
|
char *zpool_get_cmd_search_path(void);
|
|
|
|
/*
|
|
* Virtual device functions
|
|
*/
|
|
|
|
nvlist_t *make_root_vdev(zpool_handle_t *zhp, nvlist_t *props, int force,
|
|
int check_rep, boolean_t replacing, boolean_t dryrun, int argc,
|
|
char **argv);
|
|
nvlist_t *split_mirror_vdev(zpool_handle_t *zhp, char *newname,
|
|
nvlist_t *props, splitflags_t flags, int argc, char **argv);
|
|
|
|
/*
|
|
* Pool list functions
|
|
*/
|
|
int for_each_pool(int, char **, boolean_t unavail, zprop_list_t **, zfs_type_t,
|
|
boolean_t, zpool_iter_f, void *);
|
|
|
|
/* Vdev list functions */
|
|
int for_each_vdev(zpool_handle_t *zhp, pool_vdev_iter_f func, void *data);
|
|
|
|
typedef struct zpool_list zpool_list_t;
|
|
|
|
zpool_list_t *pool_list_get(int, char **, zprop_list_t **, zfs_type_t,
|
|
boolean_t, int *);
|
|
int pool_list_refresh(zpool_list_t *);
|
|
int pool_list_iter(zpool_list_t *, int unavail, zpool_iter_f, void *);
|
|
void pool_list_free(zpool_list_t *);
|
|
int pool_list_count(zpool_list_t *);
|
|
|
|
extern libzfs_handle_t *g_zfs;
|
|
|
|
|
|
typedef struct vdev_cmd_data
|
|
{
|
|
char **lines; /* Array of lines of output, minus the column name */
|
|
int lines_cnt; /* Number of lines in the array */
|
|
|
|
char **cols; /* Array of column names */
|
|
int cols_cnt; /* Number of column names */
|
|
|
|
|
|
char *path; /* vdev path */
|
|
char *upath; /* vdev underlying path */
|
|
char *pool; /* Pool name */
|
|
char *cmd; /* backpointer to cmd */
|
|
char *vdev_enc_sysfs_path; /* enclosure sysfs path (if any) */
|
|
} vdev_cmd_data_t;
|
|
|
|
typedef struct vdev_cmd_data_list
|
|
{
|
|
char *cmd; /* Command to run */
|
|
unsigned int count; /* Number of vdev_cmd_data items (vdevs) */
|
|
|
|
/* fields used to select only certain vdevs, if requested */
|
|
libzfs_handle_t *g_zfs;
|
|
char **vdev_names;
|
|
int vdev_names_count;
|
|
int cb_name_flags;
|
|
|
|
vdev_cmd_data_t *data; /* Array of vdevs */
|
|
|
|
/* List of unique column names and widths */
|
|
char **uniq_cols;
|
|
int uniq_cols_cnt;
|
|
int *uniq_cols_width;
|
|
|
|
} vdev_cmd_data_list_t;
|
|
|
|
vdev_cmd_data_list_t *all_pools_for_each_vdev_run(int argc, char **argv,
|
|
char *cmd, libzfs_handle_t *g_zfs, char **vdev_names, int vdev_names_count,
|
|
int cb_name_flags);
|
|
|
|
void free_vdev_cmd_data_list(vdev_cmd_data_list_t *vcdl);
|
|
|
|
void free_vdev_cmd_data(vdev_cmd_data_t *data);
|
|
|
|
int vdev_run_cmd_simple(char *path, char *cmd);
|
|
|
|
int check_device(const char *path, boolean_t force,
|
|
boolean_t isspare, boolean_t iswholedisk);
|
|
boolean_t check_sector_size_database(char *path, int *sector_size);
|
|
void vdev_error(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
|
|
int check_file(const char *file, boolean_t force, boolean_t isspare);
|
|
void after_zpool_upgrade(zpool_handle_t *zhp);
|
|
int check_file_generic(const char *file, boolean_t force, boolean_t isspare);
|
|
|
|
int zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on);
|
|
int zpool_power_current_state(zpool_handle_t *zhp, char *vdev);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* ZPOOL_UTIL_H */
|