If an NFS server has no network connectivity when it reboots,
it will block in sm-notify waiting for DNS lookup for a potentially
large number of hosts. This is not helpful and just annoys the
sysadmin.
So do the DNS lookup in the backgrounded phase of sm-notify,
before sending off the NOTIFY requests.
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Steve Dickson <steved@redhat.com>
#include <errno.h>
#include <grp.h>
#include <errno.h>
#include <grp.h>
#ifndef BASEDIR
# ifdef NFS_STATEDIR
# define BASEDIR NFS_STATEDIR
#ifndef BASEDIR
# ifdef NFS_STATEDIR
# define BASEDIR NFS_STATEDIR
static unsigned int nsm_get_state(int);
static void notify(void);
static unsigned int nsm_get_state(int);
static void notify(void);
-static void notify_host(int, struct nsm_host *);
+static int notify_host(int, struct nsm_host *);
static void recv_reply(int);
static void backup_hosts(const char *, const char *);
static void get_hosts(const char *);
static void recv_reply(int);
static void backup_hosts(const char *, const char *);
static void get_hosts(const char *);
if (failtime && now >= failtime)
break;
if (failtime && now >= failtime)
break;
- while ((wait = hosts->send_next - now) <= 0) {
+ while (hosts && ((wait = hosts->send_next - now) <= 0)) {
/* Never send more than 10 packets at once */
if (sent++ >= 10)
break;
/* Never send more than 10 packets at once */
if (sent++ >= 10)
break;
hp = hosts;
hosts = hp->next;
hp = hosts;
hosts = hp->next;
+ if (notify_host(sock, hp)){
+ unlink(hp->path);
+ free(hp->name);
+ free(hp->path);
+ free(hp);
+ continue;
+ }
/* Set the timeout for this call, using an
exponential timeout strategy */
/* Set the timeout for this call, using an
exponential timeout strategy */
+ if (hosts == NULL)
+ return;
nsm_log(LOG_DEBUG, "Host %s due in %ld seconds",
hosts->name, wait);
nsm_log(LOG_DEBUG, "Host %s due in %ld seconds",
hosts->name, wait);
/*
* Send notification to a single host
*/
/*
* Send notification to a single host
*/
notify_host(int sock, struct nsm_host *host)
{
static unsigned int xid = 0;
notify_host(int sock, struct nsm_host *host)
{
static unsigned int xid = 0;
if (!host->xid)
host->xid = xid++;
if (!host->xid)
host->xid = xid++;
+ if (host->ai == NULL) {
+ host->ai = host_lookup(AF_UNSPEC, host->name);
+ if (host->ai == NULL) {
+ nsm_log(LOG_WARNING,
+ "%s doesn't seem to be a valid address,"
+ " skipped", host->name);
+ return 1;
+ }
+ }
+
memset(msgbuf, 0, sizeof(msgbuf));
p = msgbuf;
*p++ = htonl(host->xid);
memset(msgbuf, 0, sizeof(msgbuf));
p = msgbuf;
*p++ = htonl(host->xid);
* point.
*/
if (host->retries >= 4) {
* point.
*/
if (host->retries >= 4) {
- struct addrinfo *hold = host->ai;
+ struct addrinfo *first = host->ai;
struct addrinfo **next = &host->ai;
struct addrinfo **next = &host->ai;
+
+ /* remove the first entry from the list */
+ host->ai = first->ai_next;
+ first->ai_next = NULL;
+ /* find the end of the list */
+ next = &first->ai_next;
while ( *next )
next = & (*next)->ai_next;
while ( *next )
next = & (*next)->ai_next;
- *next = hold;
- hold->ai_next = NULL;
- memcpy(&host->addr, hold->ai_addr, hold->ai_addrlen);
+ /* put first entry at end */
+ *next = first;
+ memcpy(&host->addr, first->ai_addr, first->ai_addrlen);
addr_set_port(&host->addr, 0);
host->retries = 0;
}
addr_set_port(&host->addr, 0);
host->retries = 0;
}
}
len = (p - msgbuf) << 2;
}
len = (p - msgbuf) << 2;
- sendto(sock, msgbuf, len, 0, (struct sockaddr *) &dest, sizeof(dest));
+ if (sendto(sock, msgbuf, len, 0, (struct sockaddr *) &dest, sizeof(dest)) < 0)
+ nsm_log(LOG_WARNING, "Sending Reboot Notification to "
+ "'%s' failed: errno %d (%s)", host->name, errno, strerror(errno));
+
+ return 0;
- * Get all entries from sm.bak and convert them to host names
+ * Get all entries from sm.bak and convert them to host entries
*/
static void
get_hosts(const char *dirname)
*/
static void
get_hosts(const char *dirname)
if (stat(path, &stb) < 0)
continue;
if (stat(path, &stb) < 0)
continue;
- host->ai = host_lookup(AF_UNSPEC, de->d_name);
- if (! host->ai) {
- nsm_log(LOG_WARNING,
- "%s doesn't seem to be a valid address, skipped",
- de->d_name);
- unlink(path);
- continue;
- }
-
host->last_used = stb.st_mtime;
host->timeout = NSM_TIMEOUT;
host->path = strdup(path);
host->last_used = stb.st_mtime;
host->timeout = NSM_TIMEOUT;
host->path = strdup(path);