Mdmonitor improvements
cover Mdmonitor improvements
Series of patches contains fix segfault for running monitor for devices different than md devices. Also logging was improved to have informations about monitor in verbose mode.
Kinga Tanska (2):
Mdmonitor: Fix segfault
Mdmonitor: Improve logging method
Monitor.c | 36 ++++++++++++++++++++++++------------ mdadm.h | 1 + mdopen.c | 17 +++++++++++++++++ util.c | 2 +- 4 files changed, 43 insertions(+), 13 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 Mdmonitor: Fix segfault
Check that devices passed to mdmonitor are md arrays.
--- Monitor.c | 11 ++++++++++- mdadm.h | 1 + mdopen.c | 17 +++++++++++++++++ util.c | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-)
Monitor.c +10 -1
@@ -183,6 +183,10 @@ int Monitor(struct mddev_dev *devlist,continue ;if (strcasecmp (mdlist->devname,"<ignore>" ) ==0 )continue ; + +if (!is_mddev (mdlist->devname)) +return 1 ; + st =xcalloc (1 ,sizeof *st);if (mdlist->devname[0 ] =='/' ) st->devname =xstrdup (mdlist->devname);
@@ -204,7 +208,12 @@ int Monitor(struct mddev_dev *devlist,struct mddev_dev *dv;for (dv = devlist; dv; dv = dv->next) { -struct state *st =xcalloc (1 ,sizeof *st); +struct state *st; + +if (!is_mddev (dv->devname)) +return 1 ; + + st =xcalloc (1 ,sizeof *st); mdlist =conf_get_ident (dv->devname); st->devname =xstrdup (dv->devname); st->next = statelist;
mdadm.h +1 -0
@@ -1607,6 +1607,7 @@ extern int create_mddev(char *dev, char *name, int autof, int trustworthy,#define FOREIGN 2#define METADATA 3extern int open_mddev (char *dev,int report_errors); +extern int is_mddev (char *dev);extern int open_container (int fd);extern int metadata_container_matches (char *metadata,char *devnm);extern int metadata_subdev_matches (char *metadata,char *devnm);
mdopen.c +17 -0
@@ -475,6 +475,23 @@ int open_mddev(char *dev, int report_errors)return mdfd; } +/** +* is_mddev() - check that file name passed is an md device. +* @dev: file name that has to be checked. +* Return: 1 if file passed is an md device, 0 if not. +*/ +int is_mddev (char *dev) +{ +int fd =open_mddev (dev,1 ); + +if (fd >=0 ) { +close (fd); +return 1 ; + } + +return 0 ; +} +char *find_free_devnm (int use_partitions) {static char devnm[32 ];
util.c +1 -1
@@ -268,7 +268,7 @@ int md_array_active(int fd)* GET_ARRAY_INFO doesn't provide access to the proper state * information, so fallback to a basic check for raid_disks != 0 */ - ret =ioctl (fd,GET_ARRAY_INFO , &array); + ret =md_get_array_info (fd, &array); }return !ret;
Signature · 1 line
2.26.2
Re: [PATCH 1/2] Mdmonitor: Fix segfault
Quoted 85 lines · Kinga Tanska
Check that devices passed to mdmonitor are md arrays.
Signed-off-by Oleksandr Shchirskyi <[email protected]>Signed-off-by Kinga Tanska <[email protected]>--- Monitor.c | 11 ++++++++++- mdadm.h | 1 + mdopen.c | 17 +++++++++++++++++ util.c | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-)Monitor.c +10
-1@@ -183,6 +183,10 @@ int Monitor(struct mddev_dev *devlist,continue ;if (strcasecmp (mdlist->devname,"<ignore>" ) ==0 )continue ; + +if (!is_mddev (mdlist->devname)) +return 1 ; + st =xcalloc (1 ,sizeof *st);if (mdlist->devname[0 ] =='/' ) st->devname =xstrdup (mdlist->devname);@@ -204,7 +208,12 @@ int Monitor(struct mddev_dev *devlist,struct mddev_dev *dv;for (dv = devlist; dv; dv = dv->next) { -struct state *st =xcalloc (1 ,sizeof *st); +struct state *st; + +if (!is_mddev (dv->devname)) +return 1 ; + + st =xcalloc (1 ,sizeof *st); mdlist =conf_get_ident (dv->devname); st->devname =xstrdup (dv->devname); st->next = statelist;mdadm.h +1
-0@@ -1607,6 +1607,7 @@ extern int create_mddev(char *dev, char *name, int autof, int trustworthy,#define FOREIGN 2#define METADATA 3extern int open_mddev (char *dev,int report_errors); +extern int is_mddev (char *dev);extern int open_container (int fd);extern int metadata_container_matches (char *metadata,char *devnm);extern int metadata_subdev_matches (char *metadata,char *devnm);mdopen.c +17
-0@@ -475,6 +475,23 @@ int open_mddev(char *dev, int report_errors)return mdfd; } +/** +* is_mddev() - check that file name passed is an md device. +* @dev: file name that has to be checked. +* Return: 1 if file passed is an md device, 0 if not. +*/ +int is_mddev (char *dev) +{ +int fd =open_mddev (dev,1 ); + +if (fd >=0 ) { +close (fd); +return 1 ; + } + +return 0 ; +} +char *find_free_devnm (int use_partitions) {static char devnm[32 ];util.c +0
-0
util.c int md_array_active(int fd) · line 274
Quoted 8 lines
util.c +1
-1@@ -268,7 +268,7 @@ int md_array_active(int fd)* GET_ARRAY_INFO doesn't provide access to the proper state * information, so fallback to a basic check for raid_disks != 0 */ - ret =ioctl (fd,GET_ARRAY_INFO , &array); + ret =md_get_array_info (fd, &array); }return !ret;
Hi Kinga,
The last code block is irrelative to the main idea of this patch. Could you please remove it from this patch, and maybe post another separated one for it?
Thanks.
Coly Li
PATCH 2/2 Mdmonitor: Improve logging method
In reply to Kinga TanskaChange logging, and as a result, mdmonitor in verbose mode will report its configuration.
--- Monitor.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
Monitor.c +14 -11
@@ -137,24 +137,27 @@ int Monitor(struct mddev_dev *devlist,struct mddev_ident *mdlist;int delay_for_event = c->delay; -if (!mailaddr) { +if (!mailaddr) mailaddr =conf_get_mailaddr (); -if (mailaddr && ! c->scan) -pr_err ("Monitor using email address \"%s\" from config file\n" , - mailaddr); - } - mailfrom =conf_get_mailfrom (); -if (!alert_cmd) { +if (!alert_cmd) alert_cmd =conf_get_program (); -if (alert_cmd && !c->scan) -pr_err ("Monitor using program \"%s\" from config file\n" , - alert_cmd); - } + + mailfrom =conf_get_mailfrom (); +if (c->scan && !mailaddr && !alert_cmd && !dosyslog) {pr_err ("No mail address or alert command - not monitoring.\n" );return 1 ; } + +if (c->verbose) { +pr_err ("Monitor is started with delay %ds\n" , c->delay); +if (mailaddr) +pr_err ("Monitor using email address %s\n" , mailaddr); +if (alert_cmd) +pr_err ("Monitor using program %s\n" , alert_cmd); + } + info.alert_cmd = alert_cmd; info.mailaddr = mailaddr; info.mailfrom = mailfrom;
Signature · 1 line
2.26.2
Re: [PATCH 2/2] Mdmonitor: Improve logging method
Quoted 41 lines · Kinga Tanska
Change logging, and as a result, mdmonitor in verbose mode will report its configuration.
Signed-off-by Kinga Tanska <[email protected]>--- Monitor.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)Monitor.c +7
-11@@ -137,24 +137,27 @@ int Monitor(struct mddev_dev *devlist,struct mddev_ident *mdlist;int delay_for_event = c->delay; -if (!mailaddr) { +if (!mailaddr) mailaddr =conf_get_mailaddr (); -if (mailaddr && ! c->scan) -pr_err ("Monitor using email address \"%s\" from config file\n" , - mailaddr); - } - mailfrom =conf_get_mailfrom (); -if (!alert_cmd) { +if (!alert_cmd) alert_cmd =conf_get_program (); -if (alert_cmd && !c->scan) -pr_err ("Monitor using program \"%s\" from config file\n" , - alert_cmd); - } + + mailfrom =conf_get_mailfrom (); +if (c->scan && !mailaddr && !alert_cmd && !dosyslog) {pr_err ("No mail address or alert command - not monitoring.\n" );return 1 ; } + +if (c->verbose) {
Monitor.c int Monitor(struct mddev_dev *devlist, · line 163
Quoted 10 lines
Monitor.c +7
-0+pr_err ("Monitor is started with delay %ds\n" , c->delay); +if (mailaddr) +pr_err ("Monitor using email address %s\n" , mailaddr); +if (alert_cmd) +pr_err ("Monitor using program %s\n" , alert_cmd); + } + info.alert_cmd = alert_cmd; info.mailaddr = mailaddr; info.mailfrom = mailfrom;
Thanks.
Coly Li