Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: include by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 03:06:31 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
allocate.c group.c main.c pengine.c
Log Message:
Finish creating generic, self-documenting option processing code
Use the above to impliment the meta-data command for the pengine and crmd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- group.c 3 Jul 2006 11:47:38 -0000 1.68
+++ group.c 14 Aug 2006 09:06:31 -0000 1.69
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.68 2006/07/03 11:47:38 andrew Exp $ */
+/* $Id: group.c,v 1.69 2006/08/14 09:06:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -73,7 +73,7 @@
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
if(group_data->colocated == FALSE) {
- pe_config_err("Cannot clone non-colocated group: %s", rsc->id);
+ crm_config_err("Cannot clone non-colocated group: %s", rsc->id);
return 0;
}
return group_data->self->cmds->num_allowed_nodes(group_data->self);
@@ -297,7 +297,7 @@
}
if(constraint->strength != pecs_must_not) {
- pe_config_err("Cannot colocate resources with"
+ crm_config_err("Cannot colocate resources with"
" non-colocated group: %s", rsc_lh->id);
return;
}
@@ -326,7 +326,7 @@
}
if(constraint->strength != pecs_must_not) {
- pe_config_err("Cannot colocate resources with"
+ crm_config_err("Cannot colocate resources with"
" non-colocated group: %s", rsc_rh->id);
return;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- main.c 14 Feb 2006 12:02:53 -0000 1.21
+++ main.c 14 Aug 2006 09:06:31 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.21 2006/02/14 12:02:53 andrew Exp $ */
+/* $Id: main.c,v 1.22 2006/08/14 09:06:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -36,6 +36,7 @@
#include <crm/common/ipc.h>
#include <crm/common/ctrl.h>
+#include <crm/pengine/common.h>
#include <crm/dmalloc_wrapper.h>
@@ -81,7 +82,12 @@
break;
}
}
-
+
+ if(argc - optind == 1 && safe_str_eq("metadata", argv[optind])) {
+ pe_metadata();
+ return 0;
+ }
+
if (optind > argc) {
++argerr;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- pengine.c 18 Jul 2006 06:18:23 -0000 1.119
+++ pengine.c 14 Aug 2006 09:06:31 -0000 1.120
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.119 2006/07/18 06:18:23 andrew Exp $ */
+/* $Id: pengine.c,v 1.120 2006/08/14 09:06:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -100,10 +100,12 @@
#else
gboolean compress = FALSE;
#endif
-
copy_in_properties(generation, xml_data);
crm_log_xml_info(generation, "[generation]");
+ crm_config_error = FALSE;
+ crm_config_warning = FALSE;
+
was_processing_error = FALSE;
was_processing_warning = FALSE;
@@ -116,8 +118,7 @@
series_id = get_series();
series_wrap = series[series_id].wrap;
- value = g_hash_table_lookup(
- data_set.config_hash, series[series_id].param);
+ value = pe_pref(data_set.config_hash, series[series_id].param);
if(value != NULL) {
series_wrap = crm_int_helper(value, NULL);
@@ -177,11 +178,11 @@
transition_id, filename);
}
- if(was_config_error) {
+ if(crm_config_error) {
crm_info("Configuration ERRORs found during PE
processing."
" Please run \"crm_verify -L\" to identify
issues.");
- } else if(was_processing_warning) {
+ } else if(crm_config_warning) {
crm_info("Configuration WARNINGs found during PE
processing."
" Please run \"crm_verify -L\" to identify
issues.");
}
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 03:06:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Finish creating generic, self-documenting option processing code
Use the above to impliment the meta-data command for the pengine and crmd
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 03:06:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
common.h
Log Message:
Finish creating generic, self-documenting option processing code
Use the above to impliment the meta-data command for the pengine and crmd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/pengine/common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- common.h 14 Aug 2006 09:00:57 -0000 1.3
+++ common.h 14 Aug 2006 09:06:31 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: common.h,v 1.3 2006/08/14 09:00:57 andrew Exp $ */
+/* $Id: common.h,v 1.4 2006/08/14 09:06:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -46,8 +46,6 @@
extern gboolean was_processing_error;
extern gboolean was_processing_warning;
-extern gboolean was_config_error;
-extern gboolean was_config_warning;
extern unsigned int pengine_input_loglevel;
/* order is significant here
@@ -141,21 +139,18 @@
extern char *score2char(int score);
extern void add_hash_param(GHashTable *hash, const char *name, const char
*value);
-extern const char *default_action_timeout(GHashTable* options);
-extern const char *cluster_option(
- GHashTable* options, gboolean(*validate)(const char*),
- const char *name, const char *old_name, const char *def_value);
+extern void pe_metadata(void);
+extern void verify_pe_options(GHashTable *options);
+extern const char *pe_pref(GHashTable *options, const char *name);
/* Helper macros to avoid NULL pointers */
#define safe_val3(def, t,u,v) (t?t->u?t->u->v:def:def)
#define safe_val5(def, t,u,v,w,x)
(t?t->u?t->u->v?t->u->v->w?t->u->v->w->x:def:def:def:def)
-#define pe_err(fmt...) { was_processing_error = TRUE; was_config_error = TRUE;
crm_err(fmt); }
-#define pe_warn(fmt...) { was_processing_warning = TRUE; was_config_warning =
TRUE; crm_warn(fmt); }
+#define pe_err(fmt...) { was_processing_error = TRUE; crm_config_error = TRUE;
crm_err(fmt); }
+#define pe_warn(fmt...) { was_processing_warning = TRUE; crm_config_warning =
TRUE; crm_warn(fmt); }
#define pe_proc_err(fmt...) { was_processing_error = TRUE; crm_err(fmt); }
#define pe_proc_warn(fmt...) { was_processing_warning = TRUE; crm_warn(fmt); }
-#define pe_config_err(fmt...) { was_config_error = TRUE; crm_err(fmt); }
-#define pe_config_warn(fmt...) { was_config_warning = TRUE; crm_warn(fmt); }
#endif
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 19
********************************************
