PSARC/2009/617 Software Events Notification Parameters CLI

PSARC/2009/618 snmp-notify: SNMP Notification Daemon for Software Events
PSARC/2009/619 smtp-notify: Email Notification Daemon for Software Events
PSARC/2010/225 fmd for non-global Solaris zones
PSARC/2010/226 Solaris Instance UUID
PSARC/2010/227 nvlist_nvflag(3NVPAIR)
PSARC/2010/228 libfmevent additions
PSARC/2010/257 sysevent_evc_setpropnvl and sysevent_evc_getpropnvl
PSARC/2010/265 FMRI and FMA Event Stabilty, 'ireport' category 1 event class, and the 'sw' FMRI scheme
PSARC/2010/278 FMA/SMF integration: instance state transitions
PSARC/2010/279 Modelling panics within FMA
PSARC/2010/290 logadm.conf upgrade
6392476 fmdump needs to pretty-print
6393375 userland ereport/ireport event generation interfaces
6445732 Add email notification agent for FMA and software events
6804168 RFE: Allow an efficient means to monitor SMF services status changes
6866661 scf_values_destroy(3SCF) will segfault if is passed NULL
6884709 Add snmp notification agent for FMA and software events
6884712 Add private interface to tap into libfmd_msg macro expansion capabilities
6897919 fmd to run in a non-global zone
6897937 fmd use of non-private doors is not safe
6900081 add a UUID to Solaris kernel image for use in crashdump identification
6914884 model panic events as a defect diagnosis in FMA
6944862 fmd_case_open_uuid, fmd_case_uuisresolved, fmd_nvl_create_defect
6944866 log legacy sysevents in fmd
6944867 enumerate svc scheme in topo
6944868 software-diagnosis and software-response fmd modules
6944870 model SMF maintenance state as a defect diagnosis in FMA
6944876 savecore runs in foreground for systems with zfs root and dedicated dump
6965796 Implement notification parameters for SMF state transitions and FMA events
6968287 SUN-FM-MIB.mib needs to be updated to reflect Oracle information
6972331 logadm.conf upgrade PSARC/2010/290

1 files changed, 12 insertions, 12 deletions

diff --git a/usr/src/cmd/svc/startd/method.c b/usr/src/cmd/svc/startd/method.c
index 0febc9d009..a615de643d 100644
--- a/usr/src/cmd/svc/startd/method.c
+++ b/usr/src/cmd/svc/startd/method.c
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -1025,7 +1024,7 @@ method_thread(void *arg)
 	scf_instance_t	*s_inst = NULL;
 	int r, exit_code;
 	boolean_t retryable;
-	const char *aux;
+	restarter_str_t reason;
 
 	assert(0 <= info->sf_method_type && info->sf_method_type <= 2);
 
@@ -1063,7 +1062,7 @@ rebind_retry:
 		 */
 		(void) restarter_instance_update_states(local_handle, inst,
 		    inst->ri_i.i_state, RESTARTER_STATE_NONE, RERR_NONE,
-		    NULL);
+		    restarter_str_none);
 		goto out;
 
 	case EINVAL:
@@ -1105,7 +1104,7 @@ retry:
 		 */
 		(void) restarter_instance_update_states(local_handle, inst,
 		    inst->ri_i.i_next_state, RESTARTER_STATE_NONE,
-		    info->sf_event_type, NULL);
+		    info->sf_event_type, info->sf_reason);
 
 		(void) update_fault_count(inst, FAULT_COUNT_RESET);
 
@@ -1145,16 +1144,17 @@ retry:
 	else
 		log_transition(inst, START_FAILED_OTHER);
 
-	if (r == ELOOP)
-		aux = "restarting_too_quickly";
-	else if (retryable)
-		aux = "fault_threshold_reached";
-	else
-		aux = "method_failed";
+	if (r == ELOOP) {
+		reason = restarter_str_restarting_too_quickly;
+	} else if (retryable) {
+		reason = restarter_str_fault_threshold_reached;
+	} else {
+		reason = restarter_str_method_failed;
+	}
 
 	(void) restarter_instance_update_states(local_handle, inst,
 	    RESTARTER_STATE_MAINT, RESTARTER_STATE_NONE, RERR_FAULT,
-	    (char *)aux);
+	    reason);
 
 	if (!method_is_transient(inst, info->sf_method_type) &&
 	    inst->ri_i.i_primary_ctid != 0)