sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

lib: Add "unique_id" to ctdbd_process_exists

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13042
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Volker Lendecke 2017-08-29 13:26:20 +02:00
parent e12ed08bd5
commit f059585fe6
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/ctdbd_conn.h
View File

@ -50,7 +50,7 @@ int ctdbd_messaging_send_iov(struct ctdbd_connection *conn,
const struct iovec *iov, int iovlen);
bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32_t vnn,
pid_t pid);
pid_t pid, uint64_t unique_id);
char *ctdbd_dbpath(struct ctdbd_connection *conn,
TALLOC_CTX *mem_ctx, uint32_t db_id);

3
source3/lib/ctdb_dummy.c
View File

@ -62,7 +62,8 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
return ENOSYS;
}
bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32_t vnn, pid_t pid)
bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32_t vnn,
pid_t pid, uint64_t unique_id)
{
return false;
}

3
source3/lib/ctdbd_conn.c
View File

@ -781,7 +781,8 @@ static int ctdbd_control(struct ctdbd_connection *conn,
/*
* see if a remote process exists
*/
bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32_t vnn, pid_t pid)
bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32_t vnn,
pid_t pid, uint64_t unique_id)
{
int32_t cstatus = 0;
int ret;

2
source3/lib/serverid.c
View File

@ -199,7 +199,7 @@ bool serverid_exists(const struct server_id *id)
if (lp_clustering()) {
return ctdbd_process_exists(messaging_ctdb_connection(),
id->vnn, id->pid);
id->vnn, id->pid, id->unique_id);
}
return false;