diff options
| author | Reza Sabdar <Reza.Sabdar@Sun.COM> | 2009-09-22 13:34:03 -0700 |
|---|---|---|
| committer | Reza Sabdar <Reza.Sabdar@Sun.COM> | 2009-09-22 13:34:03 -0700 |
| commit | 674cb4b09c0706bc1cb658e79f39997d43bad8a0 (patch) | |
| tree | 6c35b07f567a626896e204a2631cfc54a96b3174 /usr/src | |
| parent | ebe15f48e9897d68d978938414a5c16cb0ceb049 (diff) | |
| download | illumos-joyent-674cb4b09c0706bc1cb658e79f39997d43bad8a0.tar.gz | |
6874501 Need a way to limit the message from ndmp_door_server when running ndmpd in debug mode.
6851103 System logs reported daemon.error I/O error failed to send command
6867239 ndmpd backs up ZFS properties invalid for filesystems
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/ndmpd/ndmp/ndmpd_door.c | 5 | ||||
| -rw-r--r-- | usr/src/cmd/ndmpd/ndmp/ndmpd_util.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_door.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_door.c index 96426ab95b..cd300817bb 100644 --- a/usr/src/cmd/ndmpd/ndmp/ndmpd_door.c +++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_door.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -182,7 +182,8 @@ ndmp_door_server(void *cookie, char *ptr, size_t size, return; } - NDMP_LOG(LOG_DEBUG, "ndmp_door_server: req_type=%d", req_type); + if (req_type != NDMP_GET_STAT) + NDMP_LOG(LOG_DEBUG, "ndmp_door_server: req_type=%d", req_type); switch (req_type) { case NDMP_GET_DOOR_STATUS: { diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_util.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_util.c index 71da716f42..80a08e55a8 100644 --- a/usr/src/cmd/ndmpd/ndmp/ndmpd_util.c +++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_util.c @@ -1409,7 +1409,9 @@ ndmp_execute_cdb(ndmpd_session_t *session, char *adapter_name, int sid, int lun, } if (ioctl(fd, USCSICMD, &cmd) < 0) { - NDMP_LOG(LOG_ERR, "Failed to send command to device: %m"); + if (errno != EIO && errno != 0) + NDMP_LOG(LOG_ERR, + "Failed to send command to device: %m"); NDMP_LOG(LOG_DEBUG, "ioctl(USCSICMD) error: %m"); if (cmd.uscsi_status == 0) reply.error = NDMP_IO_ERR; diff --git a/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c b/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c index a80787ad3f..c5e75450ca 100644 --- a/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c +++ b/usr/src/cmd/ndmpd/tlm/tlm_backup_reader.c @@ -1191,11 +1191,13 @@ zfs_put_prop_cb(int prop, void *pp) return (ZPROP_INVAL); mhp = (ndmp_metadata_header_t *)pp; - mpp = &mhp->nh_property[mhp->nh_count++]; + if (zfs_prop_get(mhp->nh_handle, prop, buf, sizeof (buf), + &stype, sbuf, sizeof (sbuf), B_TRUE) != 0) + return (ZPROP_CONT); + + mpp = &mhp->nh_property[mhp->nh_count++]; (void) strlcpy(mpp->mp_name, zfs_prop_to_name(prop), NAME_MAX); - (void) zfs_prop_get(mhp->nh_handle, - prop, buf, sizeof (buf), &stype, sbuf, sizeof (sbuf), B_TRUE); (void) strlcpy(mpp->mp_value, buf, NAME_MAX); switch (stype) { |