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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: include by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 5 Apr 2006 22:31:27 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
we dont need free the message, send_ipc_message does
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- mgmt_crm.c 5 Apr 2006 09:01:22 -0000 1.23
+++ mgmt_crm.c 6 Apr 2006 04:31:26 -0000 1.24
@@ -631,6 +631,7 @@
HA_Message *cmd = NULL;
crm_data_t *msg_data = NULL;
crm_data_t *rsc = NULL;
+ crm_data_t *params = NULL;
char our_pid[11];
char *key = NULL;
@@ -638,12 +639,14 @@
our_pid[10] = '\0';
key = crm_concat(client_name, our_pid, '-');
-
msg_data = create_xml_node(NULL, XML_GRAPH_TAG_RSC_OP);
crm_xml_add(msg_data, XML_ATTR_TRANSITION_KEY, key);
rsc = create_xml_node(msg_data, XML_CIB_TAG_RESOURCE);
crm_xml_add(rsc, XML_ATTR_ID, rsc_id);
+
+ params = create_xml_node(msg_data, XML_TAG_ATTRS);
+ crm_xml_add(params, XML_ATTR_CRM_VERSION, CRM_FEATURE_SET);
cmd = create_request(CRM_OP_LRM_DELETE, msg_data, host_uname,
CRM_SYSTEM_CRMD, client_name, our_pid);
@@ -652,10 +655,8 @@
crm_free(key);
if(send_ipc_message(crmd_channel, cmd)) {
- free_xml(cmd);
return 0;
}
- free_xml(cmd);
return -1;
}
@@ -672,10 +673,8 @@
CRM_SYSTEM_CRMD, client_name, our_pid);
if(send_ipc_message(crmd_channel, cmd)) {
- free_xml(cmd);
return 0;
}
- free_xml(cmd);
return -1;
}
@@ -693,7 +692,7 @@
send_hello_message(crmd_channel, our_pid, client_name, "0", "1");
delete_lrm_rsc(crmd_channel, argv[1], argv[2]);
- refresh_lrm(crmd_channel, argv[1]);
+ refresh_lrm(crmd_channel, argv[1]);
return cl_strdup(MSG_OK);
}
------------------------------
Message: 2
Date: Wed, 5 Apr 2006 22:33:53 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
show the current connected server in status bar
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- haclient.py.in 4 Apr 2006 06:09:46 -0000 1.19
+++ haclient.py.in 6 Apr 2006 04:33:53 -0000 1.20
@@ -1153,7 +1153,7 @@
# functions
def update(self) :
self.tree.update()
- self.statusbar.pop(1)
+ self.statusbar.pop(2)
return False
def select_view(self, type, name, status) :
@@ -1210,12 +1210,15 @@
if ret == gtk.RESPONSE_OK:
if not manager.login(server, user, password):
msgbox(manager.failed_reason)
+ else :
+ self.statusbar.push(1,"Connected to "+server)
self.update_ui()
def on_logout(self, action) :
manager.logout()
self.update_ui()
+ self.statusbar.pop(1)
def on_test(self, action) :
print uuid()
@@ -1362,7 +1365,7 @@
self.tree = Tree(glade.get_widget("mainwin_tree"))
self.view_widget = glade.get_widget("mainwin_view")
self.update_ui()
- self.statusbar.push(1,"Done")
+ self.statusbar.push(0,"Not Connected")
class Manager :
'''
@@ -1438,7 +1441,7 @@
self.password = password
self.active_nodes = self.get_active_nodes()
- window.statusbar.push(1,"Updating data from server...")
+ window.statusbar.push(2,"Updating data from server...")
self.update_timer = gobject.timeout_add(100, self.update)
self.do_cmd("regevt\nevt:cib_changed")
@@ -1489,7 +1492,7 @@
if self.update_timer != -1 :
gobject.source_remove(self.update_timer)
else :
- window.statusbar.push(1,"Updating data from
server...")
+ window.statusbar.push(2,"Updating data from
server...")
self.update_timer = gobject.timeout_add(100,
self.update)
return True
elif event == None or event == "evt:disconnected" :
------------------------------
Message: 3
Date: Thu, 6 Apr 2006 04:44:14 -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
Modified Files:
crm.h
Log Message:
Disable support for running version 2.0.5 in the same cluster with versions
older than 2.0.4
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- crm.h 5 Apr 2006 13:43:34 -0000 1.92
+++ crm.h 6 Apr 2006 10:44:13 -0000 1.93
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.92 2006/04/05 13:43:34 andrew Exp $ */
+/* $Id: crm.h,v 1.93 2006/04/06 10:44:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -39,9 +39,9 @@
# define CRM_DEV_BUILD 0
#endif
-#define CRM_DEPRECATED_SINCE_2_0_1 1
-#define CRM_DEPRECATED_SINCE_2_0_2 1
-#define CRM_DEPRECATED_SINCE_2_0_3 1
+#define CRM_DEPRECATED_SINCE_2_0_1 0
+#define CRM_DEPRECATED_SINCE_2_0_2 0
+#define CRM_DEPRECATED_SINCE_2_0_3 0
#define CRM_DEPRECATED_SINCE_2_0_4 1
#define CRM_DEPRECATED_SINCE_2_0_5 1
#define CRM_DEPRECATED_SINCE_2_1_0 1
------------------------------
Message: 4
Date: Thu, 6 Apr 2006 04:45:50 -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/clplumbing
Modified Files:
GSource.c
Log Message:
call unref *after* checking the dispatch times
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- GSource.c 21 Mar 2006 14:01:15 -0000 1.80
+++ GSource.c 6 Apr 2006 10:45:49 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.80 2006/03/21 14:01:15 davidlee Exp $ */
+/* $Id: GSource.c,v 1.81 2006/04/06 10:45:49 andrew Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -684,8 +684,8 @@
if (!chp->fd_fdx) {
g_source_remove_poll(source, &chp->outfd);
}
- g_source_unref(source);
CHECK_DISPATCH_TIME(chp);
+ g_source_unref(source);
return FALSE;
}
}
------------------------------
_______________________________________________
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 29
********************************************
