Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by andrew from
([email protected])
2. Linux-HA CVS: include by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: heartbeat by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Apr 2006 10:18:09 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
utils.c
Log Message:
remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- utils.c 10 Apr 2006 12:49:15 -0000 1.45
+++ utils.c 10 Apr 2006 16:18:08 -0000 1.46
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.45 2006/04/10 12:49:15 andrew Exp $ */
+/* $Id: utils.c,v 1.46 2006/04/10 16:18:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -673,85 +673,6 @@
}
-void
-crm_set_ha_options(ll_cluster_t *hb_cluster)
-{
-#if 0
- int facility;
- char *param_val = NULL;
- const char *param_name = NULL;
-
- if(hb_cluster == NULL) {
- crm_set_env_options();
- return;
- }
-
- /* change the logging facility to the one used by heartbeat daemon */
- crm_debug("Switching to Heartbeat logger");
- if (( facility =
- hb_cluster->llc_ops->get_logfacility(hb_cluster)) > 0) {
- cl_log_set_facility(facility);
- }
- crm_debug_2("Facility: %d", facility);
-
- param_name = KEY_LOGFILE;
- param_val = hb_cluster->llc_ops->get_parameter(hb_cluster, param_name);
- crm_debug_3("%s = %s", param_name, param_val);
- if(param_val != NULL) {
- cl_log_set_logfile(param_val);
- cl_free(param_val);
- param_val = NULL;
- }
-
- param_name = KEY_DBGFILE;
- param_val = hb_cluster->llc_ops->get_parameter(hb_cluster, param_name);
- crm_debug_3("%s = %s", param_name, param_val);
- if(param_val != NULL) {
- cl_log_set_debugfile(param_val);
- cl_free(param_val);
- param_val = NULL;
- }
-
- param_name = KEY_DEBUGLEVEL;
- param_val = hb_cluster->llc_ops->get_parameter(hb_cluster, param_name);
- crm_debug_3("%s = %s", param_name, param_val);
- if(param_val != NULL) {
- int debug_level = crm_parse_int(param_val, NULL);
- if(debug_level > 0 && (debug_level+LOG_INFO) >
(int)crm_log_level) {
- set_crm_log_level(LOG_INFO + debug_level);
- }
- cl_free(param_val);
- param_val = NULL;
- }
-
- param_name = KEY_LOGDAEMON;
- param_val = hb_cluster->llc_ops->get_parameter(hb_cluster, param_name);
- crm_debug_3("%s = %s", param_name, param_val);
- if(param_val != NULL) {
- int uselogd;
- cl_str_to_boolean(param_val, &uselogd);
- cl_log_set_uselogd(uselogd);
- if(cl_log_get_uselogd()) {
- cl_set_logging_wqueue_maxlen(500);
- }
- cl_free(param_val);
- param_val = NULL;
- }
-
- param_name = KEY_CONNINTVAL;
- param_val = hb_cluster->llc_ops->get_parameter(hb_cluster, param_name);
- crm_debug_3("%s = %s", param_name, param_val);
- if(param_val != NULL) {
- int logdtime;
- logdtime = crm_get_msec(param_val);
- cl_log_set_logdtime(logdtime);
- cl_free(param_val);
- param_val = NULL;
- }
-#endif
-}
-
-
#define ENV_PREFIX "HA_"
void
crm_set_env_options(void)
------------------------------
Message: 2
Date: Mon, 10 Apr 2006 10:18:26 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
util.h
Log Message:
remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- util.h 10 Apr 2006 12:49:15 -0000 1.32
+++ util.h 10 Apr 2006 16:18:25 -0000 1.33
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.32 2006/04/10 12:49:15 andrew Exp $ */
+/* $Id: util.h,v 1.33 2006/04/10 16:18:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -69,8 +69,6 @@
extern void set_uuid(
ll_cluster_t* hb, crm_data_t *node, const char *attr, const char
*uname);
-extern void crm_set_ha_options(ll_cluster_t *hb_cluster);
-
extern gboolean crm_is_true(const char * s);
extern int crm_str_to_boolean(const char * s, int * ret);
------------------------------
Message: 3
Date: Mon, 10 Apr 2006 10:19:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
join_dc.c
Log Message:
Flush attrd to the CIB during the join process to prevent anything from
being lost while there was no DC
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- join_dc.c 9 Apr 2006 14:38:05 -0000 1.87
+++ join_dc.c 10 Apr 2006 16:19:53 -0000 1.88
@@ -47,6 +47,32 @@
static int current_join_id = 0;
+static void
+update_attrd(void)
+{
+ static IPC_Channel *attrd = NULL;
+ if(attrd == NULL) {
+ crm_info("Connecting to attrd...");
+ attrd = init_client_ipc_comms_nodispatch(T_ATTRD);
+ }
+
+ if(attrd != NULL) {
+ HA_Message *update = ha_msg_new(3);
+ ha_msg_add(update, F_TYPE, T_ATTRD);
+ ha_msg_add(update, F_ORIG, "crmd");
+ ha_msg_add(update, "task", "refresh");
+ if(send_ipc_message(attrd, update) == FALSE) {
+ crm_err("attrd refresh failed");
+ attrd = NULL;
+ } else {
+ crm_debug("sent attrd refresh");
+ }
+
+ } else {
+ crm_err("Couldn't connect to attrd");
+ }
+}
+
void
initialize_join(gboolean before)
{
@@ -349,6 +375,7 @@
/* Send _our_ CIB out to everyone */
fsa_cib_conn->cmds->sync_from(
fsa_cib_conn, fsa_our_uname, NULL,cib_quorum_override);
+ update_attrd();
}
finalize_join(__FUNCTION__);
@@ -373,7 +400,8 @@
} else if(AM_I_DC && fsa_state == S_FINALIZE_JOIN) {
finalize_join(__FUNCTION__);
-
+ update_attrd();
+
} else {
crm_debug("No longer the DC in S_FINALIZE_JOIN: %s/%s",
AM_I_DC?"DC":"CRMd", fsa_state2string(fsa_state));
------------------------------
Message: 4
Date: Mon, 10 Apr 2006 10:46:17 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
Include pingd in the CRM's BSC cluster
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- BasicSanityCheck.in 10 Mar 2006 16:29:10 -0000 1.95
+++ BasicSanityCheck.in 10 Apr 2006 16:46:16 -0000 1.96
@@ -195,6 +195,7 @@
crm yes
apiauth cibmon uid=hacluster
respawn hacluster $HBLIB/cibmon -d
+ respawn hacluster $HBLIB/pingd
!
chmod 644 $1
# conn_logd_time 60
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 69
********************************************
