Use xlog() for statd/sm-notify syslogging
Subsystems (2)
cover Use xlog() for statd/sm-notify syslogging
Steve -
As requested, here are the two patches that convert statd and sm-notify to use the nfs-utils' xlog() facility, replacing local variants.
---
Chuck Lever (2):
statd: Replace nsm_log() with xlog() in sm-notify command
statd: Replace note() with xlog() in rpc.statd
support/include/ha-callout.h | 4 - utils/statd/Makefile.am | 7 +- utils/statd/callback.c | 4 + utils/statd/log.c | 95 ------------------------ utils/statd/log.h | 42 ----------- utils/statd/misc.c | 12 +-- utils/statd/monitor.c | 47 ++++++------ utils/statd/rmtcall.c | 36 ++++----- utils/statd/simu.c | 10 ++- utils/statd/simulate.c | 52 +++++++------ utils/statd/sm-notify.c | 163 ++++++++++++++++-------------------------- utils/statd/sm-notify.man | 6 -- utils/statd/stat.c | 8 +- utils/statd/statd.c | 57 +++++++-------- utils/statd/statd.h | 9 -- utils/statd/svc_run.c | 7 +- utils/statd/version.h | 7 -- 17 files changed, 185 insertions(+), 381 deletions(-) delete mode 100644 utils/statd/log.c delete mode 100644 utils/statd/log.h delete mode 100644 utils/statd/version.h
Signature · 1 line
Chuck Lever <[email protected]>
A message that is not in the archive (sent off-list or not yet received): 20091123215833.26806.28348.stgit-07a7zB5ZJzbwdl/1UfZZQIVfYA8g3rJ/@public.gmane.org
PATCH 1/2 statd: Replace note() with xlog() in rpc.statd
To facilitate code sharing between statd and sm-notify (and with other components of nfs-utils), replace rpc.statd's note() with xlog().
Bonus: add debugging xlog() messages to report incoming RPC requests. These additional messages are enabled when "-d" is specified on the statd command line.
---
support/include/ha-callout.h | 4 -- utils/statd/Makefile.am | 4 +- utils/statd/callback.c | 4 +- utils/statd/log.c | 95 ------------------------------------------ utils/statd/log.h | 42 ------------------- utils/statd/misc.c | 12 ++--- utils/statd/monitor.c | 47 +++++++++++---------- utils/statd/rmtcall.c | 36 ++++++++-------- utils/statd/simu.c | 10 +++- utils/statd/simulate.c | 52 +++++++++++------------ utils/statd/stat.c | 8 ++-- utils/statd/statd.c | 57 +++++++++++-------------- utils/statd/statd.h | 9 ---- utils/statd/svc_run.c | 7 +-- utils/statd/version.h | 7 --- 15 files changed, 118 insertions(+), 276 deletions(-) delete mode 100644 utils/statd/log.c delete mode 100644 utils/statd/log.h delete mode 100644 utils/statd/version.h
support/include/ha-callout.h +0 -4
@@ -53,11 +53,7 @@ ha_callout(char *event, char *arg1, char *arg2, int arg3) default: pid = waitpid(pid, &ret, 0); }sigaction (SIGCHLD , &oldact, &newact); -#ifdef dprintf -dprintf (N_DEBUG ,"ha callout returned %d\n" ,WEXITSTATUS (ret)); -#else xlog (D_GENERAL ,"ha callout returned %d\n" ,WEXITSTATUS (ret)); -#endif }#endif
utils/statd/Makefile.am +2 -2
@@ -13,9 +13,9 @@ RPCPREFIX = rpc. KPREFIX = @kprefix@ sbin_PROGRAMS = statd sm-notify dist_sbin_SCRIPTS = start-statd -statd_SOURCES = callback.c notlist.c log.c misc.c monitor.c \ +statd_SOURCES = callback.c notlist.c misc.c monitor.c \ simu.c stat.c statd.c svc_run.c rmtcall.c \ - sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c log.h \ + sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c \ notlist.h statd.h system.h version.h sm_inter.h sm_notify_SOURCES = sm-notify.c
utils/statd/callback.c +2 -2
@@ -35,12 +35,12 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)struct sockaddr_in *sin =nfs_getrpccaller_in (rqstp->rq_xprt);char *ip_addr =xstrdup (inet_ntoa (sin->sin_addr)); -dprintf (N_DEBUG ,"Received SM_NOTIFY from %s, state: %d" , +xlog (D_CALL ,"Received SM_NOTIFY from %s, state: %d" , argp->mon_name, argp->state);/* quick check - don't bother if we're not monitoring anyone */ if (rtnl ==NULL ) { -note (N_WARNING ,"SM_NOTIFY from %s while not monitoring any hosts." , +xlog_warn ("SM_NOTIFY from %s while not monitoring any hosts" , argp->mon_name);return ((void *) &result); }
utils/statd/log.c deleted +0 -95
95 lines not on this page · raw message
utils/statd/log.h deleted +0 -42
42 lines not on this page · raw message
utils/statd/misc.c +5 -7
@@ -29,8 +29,7 @@ xmalloc (size_t size)return ((void *)NULL );if (!(ptr =malloc (size))) -/* SHIT! SHIT! SHIT! */ -die ("malloc failed" ); +xlog_err ("malloc failed" );return (ptr); }
@@ -46,7 +45,7 @@ xstrdup (const char *string)/* Will only fail if underlying malloc() fails (ENOMEM). */ if (!(result =strdup (string))) -die ("strdup failed" ); +xlog_err ("strdup failed" );return (result); }
@@ -62,16 +61,15 @@ xunlink (char *path, char *host) tozap =malloc (strlen (path)+strlen (host)+2 );if (tozap ==NULL ) { -note (N_ERROR ,"xunlink: malloc failed: errno %d (%s)" , - errno,strerror (errno)); +xlog (L_ERROR ,"xunlink: malloc failed: errno %d (%m)" , errno);return ; }sprintf (tozap,"%s/%s" , path, host);if (unlink (tozap) ==-1 ) -note (N_ERROR ,"unlink (%s): %s" , tozap,strerror (errno)); +xlog (L_ERROR ,"unlink (%s): %m" , tozap);else -dprintf (N_DEBUG ,"Unlinked %s" , tozap); +xlog (D_GENERAL ,"Unlinked %s" , tozap);free (tozap); }
utils/statd/monitor.c +25 -22
158 lines not on this page · raw message
utils/statd/rmtcall.c +17 -19
@@ -43,7 +43,6 @@#include "sm_inter.h" #include "statd.h" #include "notlist.h" -#include "log.h" #include "ha-callout.h" #if SIZEOF_SOCKLEN_T -0 ==0
@@ -81,7 +80,7 @@ statd_get_socket(void)if (sockfd >=0 )close (sockfd);if ((sockfd =socket (AF_INET ,SOCK_DGRAM ,IPPROTO_UDP )) <0 ) { -note (N_CRIT ,"%s: Can't create socket: %m" , __func__); +xlog (L_ERROR ,"%s: Can't create socket: %m" , __func__);return -1 ; }
@@ -91,7 +90,7 @@ statd_get_socket(void) sin.sin_addr.s_addr =INADDR_ANY ;if (bindresvport (sockfd, &sin) <0 ) { -dprintf (N_WARNING ,"%s: can't bind to reserved port" , +xlog (D_GENERAL ,"%s: can't bind to reserved port" , __func__);break ; }
@@ -150,7 +149,7 @@ xmit_call(struct sockaddr_in *sin,/* Encode the RPC header part and payload */ if (!xdr_callmsg (xdrs, &mesg) || !func (xdrs, obj)) { -dprintf (N_WARNING ,"%s: can't encode RPC message!" , __func__); +xlog (D_GENERAL ,"%s: can't encode RPC message!" , __func__);xdr_destroy (xdrs);return 0 ; }
@@ -160,9 +159,9 @@ xmit_call(struct sockaddr_in *sin,if ((err =sendto (sockfd, msgbuf, msglen,0 , (struct sockaddr *) sin,sizeof (*sin))) <0 ) { -dprintf (N_WARNING ,"%s: sendto failed: %m" , __func__); +xlog_warn ("%s: sendto failed: %m" , __func__); }else if (err != msglen) { -dprintf (N_WARNING ,"%s: short write: %m" , __func__); +xlog_warn ("%s: short write: %m" , __func__); }xdr_destroy (xdrs);
@@ -182,7 +181,7 @@ recv_rply(struct sockaddr_in *sin, u_long *portp)/* Receive message */ if ((msglen =recvfrom (sockfd, msgbuf,sizeof (msgbuf),0 , (struct sockaddr *) sin, &alen)) <0 ) { -dprintf (N_WARNING ,"%s: recvfrom failed: %m" , __func__); +xlog_warn ("%s: recvfrom failed: %m" , __func__);return NULL ; }
@@ -194,19 +193,19 @@ recv_rply(struct sockaddr_in *sin, u_long *portp) mesg.rm_reply.rp_acpt.ar_results.proc = (xdrproc_t ) xdr_void;if (!xdr_replymsg (xdrs, &mesg)) { -note (N_WARNING ,"%s: can't decode RPC message!" , __func__); +xlog_warn ("%s: can't decode RPC message!" , __func__); goto done; }if (mesg.rm_reply.rp_stat !=0 ) { -note (N_WARNING ,"%s: [%s] RPC status %d" , +xlog_warn ("%s: [%s] RPC status %d" , __func__,inet_ntoa (sin->sin_addr), mesg.rm_reply.rp_stat); goto done; }if (mesg.rm_reply.rp_acpt.ar_stat !=0 ) { -note (N_WARNING ,"%s: [%s] RPC status %d" , +xlog_warn ("%s: [%s] RPC status %d" , __func__,inet_ntoa (sin->sin_addr), mesg.rm_reply.rp_acpt.ar_stat);
@@ -224,14 +223,13 @@ recv_rply(struct sockaddr_in *sin, u_long *portp)strncpy (addr,inet_ntoa (lp->addr),sizeof (addr) -1 ); addr [sizeof (addr) -1 ] ='\0' ; -dprintf (N_WARNING ,"%s: address mismatch: " +xlog_warn ("%s: address mismatch: " "expected %s, got %s" , __func__, addr,inet_ntoa (sin->sin_addr)); }if (lp->port ==0 ) {if (!xdr_u_long (xdrs, portp)) { -note (N_WARNING , -"%s: [%s] can't decode reply body!" , +xlog_warn ("%s: [%s] can't decode reply body!" , __func__,inet_ntoa (sin->sin_addr)); lp =NULL ;
@@ -260,7 +258,7 @@ process_entry(notify_list *lp)/* __u32 proc, vers, prog; */ if (NL_TIMES (lp) ==0 ) { -note (N_DEBUG ,"%s: Cannot notify %s, giving up." , +xlog (D_GENERAL ,"%s: Cannot notify %s, giving up" , __func__,inet_ntoa (NL_ADDR (lp)));return 0 ; }
@@ -286,7 +284,7 @@ process_entry(notify_list *lp) lp->xid =xmit_call (&sin, prog, vers, proc, func, objp);if (!lp->xid) { -note (N_WARNING ,"%s: failed to notify port %d" , +xlog_warn ("%s: failed to notify port %d" , __func__,ntohs (lp->port)); }NL_TIMES (lp) -=1 ;
@@ -319,10 +317,10 @@ process_reply(FD_SET_TYPE *rfds)nlist_insert_timer (¬ify, lp);return 1 ; } -note (N_WARNING ,"%s: [%s] service %d not registered" , +xlog_warn ("%s: [%s] service %d not registered" , __func__,inet_ntoa (lp->addr),NL_MY_PROG (lp)); }else { -dprintf (N_DEBUG ,"%s: Callback to %s (for %d) succeeded." , +xlog (D_GENERAL ,"%s: Callback to %s (for %d) succeeded" , __func__,NL_MY_NAME (lp),NL_MON_NAME (lp)); }nlist_free (¬ify, lp);
@@ -346,8 +344,8 @@ process_notify_list(void)nlist_remove (¬ify, entry);nlist_insert_timer (¬ify, entry); }else { - note(N_ERROR, - "%s: Can't callback %s (%d,%d), giving up.", + xlog(L_ERROR, + "%s: Can't callback %s (%d,%d), giving up", __func__, NL_MY_NAME(entry), NL_MY_PROG(entry),
utils/statd/simu.c +6 -4
@@ -27,24 +27,26 @@ sm_simu_crash_1_svc (void *argp, struct svc_req *rqstp)static char *result =NULL ;struct in_addr caller; +xlog (D_CALL ,"Received SM_SIMU_CRASH" ); +if (sin->sin_family !=AF_INET ) { -note (N_WARNING ,"Call to statd from non-AF_INET address" ); +xlog_warn ("Call to statd from non-AF_INET address" ); goto failure; } caller = sin->sin_addr;if (caller.s_addr !=htonl (INADDR_LOOPBACK )) { -note (N_WARNING ,"Call to statd from non-local host %s" , +xlog_warn ("Call to statd from non-local host %s" ,inet_ntoa (caller)); goto failure; }if (ntohs (sin->sin_port) >=1024 ) { -note (N_WARNING ,"Call to statd-simu-crash from unprivileged port" ); +xlog_warn ("Call to statd-simu-crash from unprivileged port" ); goto failure; } -note (N_WARNING ,"*** SIMULATING CRASH! ***" ); +xlog_warn ("*** SIMULATING CRASH! ***" );my_svc_exit ();if (rtnl)
utils/statd/simulate.c +26 -26
152 lines not on this page · raw message
utils/statd/stat.c +5 -3
@@ -42,13 +42,15 @@ sm_stat_1_svc (struct sm_name *argp, struct svc_req *rqstp) {static sm_stat_res result; +xlog (D_CALL ,"Received SM_STAT from %s" , argp->mon_name); +if (gethostbyname (argp->mon_name) ==NULL ) { -note (N_WARNING ,"gethostbyname error for %s" , argp->mon_name); +xlog_warn ("gethostbyname error for %s" , argp->mon_name); result.res_stat =STAT_FAIL ; -dprintf (N_DEBUG ,"STAT_FAIL for %s" , argp->mon_name); +xlog (D_GENERAL ,"STAT_FAIL for %s" , argp->mon_name); }else { result.res_stat =STAT_SUCC ; -dprintf (N_DEBUG ,"STAT_SUCC for %s" , argp->mon_name); +xlog (D_GENERAL ,"STAT_SUCC for %s" , argp->mon_name); } result.state =MY_STATE ;return (&result);
utils/statd/statd.c +26 -31
169 lines not on this page · raw message
utils/statd/statd.h +1 -8
@@ -11,7 +11,7 @@#include "sm_inter.h" #include "system.h" -#include "log.h" +#include "xlog.h" /* * Paths and filenames.
@@ -84,10 +84,3 @@ extern int run_mode;* another host.... */ #define STATIC_HOSTNAME 8/* Always use the hostname set by -n */ #define MODE_NO_NOTIFY 16/* Don't notify peers of a reboot */ -/* -* Program name and version pointers -- See statd.c for the reasoning -* as to why they're global. -*/ -extern char *name_p;/* program basename */ -extern const char *version_p;/* program version */ -
utils/statd/svc_run.c +3 -4
@@ -101,12 +101,12 @@ my_svc_run(void) tv.tv_sec =NL_WHEN (notify) - now; tv.tv_usec =0 ; -dprintf (N_DEBUG ,"Waiting for reply... (timeo %d)" , +xlog (D_GENERAL ,"Waiting for reply... (timeo %d)" , tv.tv_sec); selret =select (FD_SETSIZE , &readfds, (void *)0 , (void *)0 , &tv); }else { -dprintf (N_DEBUG ,"Waiting for client connections." ); +xlog (D_GENERAL ,"Waiting for client connections" ); selret =select (FD_SETSIZE , &readfds, (void *)0 , (void *)0 , (struct timeval *)0 ); }
@@ -116,8 +116,7 @@ my_svc_run(void)if (errno ==EINTR || errno ==ECONNREFUSED || errno ==ENETUNREACH || errno ==EHOSTUNREACH )continue ; -note (N_ERROR ,"my_svc_run() - select: %s" , -strerror (errno)); +xlog (L_ERROR ,"my_svc_run() - select: %m" );return ;case 0 :
utils/statd/version.h deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* Copyright (C) 1997-1999 Jeffrey A. Uphoff -* -* NSM for Linux. -*/ - -#define STATD_RELEASE "1.1.1"
PATCH 2/2 statd: Replace nsm_log() with xlog() in sm-notify command
In reply to a message not in the archiveTo facilitate code sharing between statd and sm-notify (and with other components of nfs-utils), replace sm-notify's nsm_log() with xlog().
Since opt_quiet is used in only a handful of insignificant cases, it is removed.
---
utils/statd/Makefile.am | 3 + utils/statd/sm-notify.c | 163 ++++++++++++++++++--------------------------- utils/statd/sm-notify.man | 6 -- 3 files changed, 67 insertions(+), 105 deletions(-)
utils/statd/Makefile.am +2 -1
@@ -24,7 +24,8 @@ statd_LDADD = ../../support/export/libexport.a \ ../../support/nfs/libnfs.a \ ../../support/misc/libmisc.a \ $(LIBWRAP) $(LIBNSL) -sm_notify_LDADD = $(LIBNSL) +sm_notify_LDADD = ../../support/nfs/libnfs.a \ + $(LIBNSL) EXTRA_DIST = sim_sm_inter.x sm_inter.x $(man8_MANS) COPYRIGHT simulate.c
utils/statd/sm-notify.c +64 -99
395 lines not on this page · raw message
utils/statd/sm-notify.man +1 -5
@@ -6,7 +6,7 @@ .SH NAME sm-notify \- Send out NSM reboot notifications .SH SYNOPSIS -.BI "/sbin/sm-notify [-dfq] [-m " time "] [-p " port "] [-P " path "] [-v " my_name " ] +.BI "/sbin/sm-notify [-df] [-m " time "] [-p " port "] [-P " path "] [-v " my_name " ] .SH DESCRIPTION File locking over NFS (v2 and v3) requires a facility to notify peers in case of a reboot, so that clients can reclaim locks after
@@ -101,10 +101,6 @@ to bind to the indicated IP number. If this option is not given, it will try to bind to a randomly chosen privileged port below 1024. .TP -.B -q -Be quiet. This suppresses all messages except error -messages while collecting the list of hosts. -.TP .BI -P " /path/to/state/directory If .B sm-notify
Quoted 7 lines · Chuck Lever
Steve -
As requested, here are the two patches that convert statd and sm-notify to use the nfs-utils'
xlog()facility, replacing local variants.---
Committed and thanks for breaking them up!
Question, How did you differentiate between D_CALL and D_GENERAL?
I'm thinking about rolling both those types into a new xlog_debug() function... since that what those types seem to be...
steved.
Quoted 7 lines · Steve Dickson
Quoted 6 lines · Chuck Lever
Steve -
As requested, here are the two patches that convert statd and sm-notify to use the nfs-utils'
xlog()facility, replacing local variants.
Quoted 7 lines
Quoted 1 line
---
Committed and thanks for breaking them up!
Question, How did you differentiate between
D_CALLandD_GENERAL?I'm thinking about rolling both those types into a new
xlog_debug()function... since that what those types seem to be...
These are existing enum values. See support/include/xlog.h. D_CALL is generally used for function tracing, more or less, and D_GENERAL is used as a grab bag.
The debug level is set via xlog_config() or xlog_sconfig(). It looks like mountd uses the whole range of values, and you can set them on the command line. It would be nice if statd allowed that too.
You don't need to change or eliminate any of the values. A putative xlog_debug() function might look like this:
voidxlog_debug(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
xlog_backend(D_GENERAL, fmt, args);
va_end(args);
}--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com