------------------------------------------------------------
revno: 87
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-04-11 11:11:44 +1000
message:
merge from ronnie
modified:
include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
tests/bench.sh bench.sh-20070209014602-vdolpr6esqsa58s7-1
------------------------------------------------------------
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Wed 2007-04-11 11:08:20 +1000
message:
merge from tridge
------------------------------------------------------------
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-04-10 21:14:55 +1000
message:
rename client.id to client.messenger_id to make the purpose of the field
more obvious
------------------------------------------------------------
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-04-10 21:05:29 +1000
message:
add a call to register the pid for a messengin service
store this pid inside the client structure in the ctdb daemon
------------------------------------------------------------
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Tue 2007-04-10 20:25:11 +1000
message:
updates from tridges tree
=== modified file 'include/ctdb.h'
--- a/include/ctdb.h 2007-04-11 01:01:42 +0000
+++ b/include/ctdb.h 2007-04-11 01:08:20 +0000
@@ -180,5 +180,11 @@
*/
int ctdb_record_store(struct ctdb_record_handle *rec, TDB_DATA data);
+/* when running in daemon mode this function is used by a client to tell
+ ctdb daemon what its local identifier is.
+ when in non-daemon mode this is a noop.
+ */
+int ctdb_register_message_local_id(struct ctdb_context *ctdb, uint32_t
messenger_id);
+
#endif
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h 2007-04-11 01:01:42 +0000
+++ b/include/ctdb_private.h 2007-04-11 01:08:20 +0000
@@ -190,13 +190,14 @@
operation IDs
*/
enum ctdb_operation {
- CTDB_REQ_CALL = 0,
- CTDB_REPLY_CALL = 1,
- CTDB_REPLY_REDIRECT = 2,
- CTDB_REQ_DMASTER = 3,
- CTDB_REPLY_DMASTER = 4,
- CTDB_REPLY_ERROR = 5,
- CTDB_REQ_MESSAGE = 6
+ CTDB_REQ_CALL = 0,
+ CTDB_REPLY_CALL = 1,
+ CTDB_REPLY_REDIRECT = 2,
+ CTDB_REQ_DMASTER = 3,
+ CTDB_REPLY_DMASTER = 4,
+ CTDB_REPLY_ERROR = 5,
+ CTDB_REGISTER_CALL = 6,
+ CTDB_REQ_MESSAGE = 7
};
#define CTDB_MAGIC 0x43544442 /* CTDB */
@@ -259,6 +260,12 @@
uint8_t data[1];
};
+struct ctdb_register_call {
+ struct ctdb_req_header hdr;
+ uint32_t datalen;
+ uint8_t data[4];
+};
+
struct ctdb_req_message {
struct ctdb_req_header hdr;
uint32_t srvid;
=== modified file 'tests/bench.sh'
--- a/tests/bench.sh 2007-04-07 00:45:00 +0000
+++ b/tests/bench.sh 2007-04-10 11:05:29 +0000
@@ -3,7 +3,7 @@
killall -q ctdb_bench
echo "Trying 2 nodes"
-bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.2:9001 $* &
-bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.1:9001 $*
+bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.2:9001 --pid=55 $* &
+bin/ctdb_bench --nlist tests/nodes.txt --listen 127.0.0.1:9001 --pid=66 $*
killall -q ctdb_bench
