git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2474455
)
ctdbd_conn: Lift the cluster_fatal call in get_cluster_vnn
author
Volker Lendecke
<vl@samba.org>
Thu, 31 Jan 2013 09:54:48 +0000
(10:54 +0100)
committer
Michael Adam
<obnox@samba.org>
Thu, 17 Oct 2013 21:19:36 +0000
(23:19 +0200)
We have to report a proper error when ctdbd is not around
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source3/lib/ctdbd_conn.c
patch
|
blob
|
history
diff --git
a/source3/lib/ctdbd_conn.c
b/source3/lib/ctdbd_conn.c
index f960541c3a2e33967eab99ad7eb32f4e041c5350..70ce82448bfdc660d6f4ae7ddacb96cd9e1b032f 100644
(file)
--- a/
source3/lib/ctdbd_conn.c
+++ b/
source3/lib/ctdbd_conn.c
@@
-128,7
+128,8
@@
static NTSTATUS get_cluster_vnn(struct ctdbd_connection *conn, uint32_t *vnn)
CTDB_CURRENT_NODE, CTDB_CONTROL_GET_PNN, 0, 0,
tdb_null, NULL, NULL, &cstatus);
if (!NT_STATUS_IS_OK(status)) {
- cluster_fatal("ctdbd_control failed\n");
+ DEBUG(1, ("ctdbd_control failed: %s\n", nt_errstr(status)));
+ return status;
}
*vnn = (uint32_t)cstatus;
return status;
@@
-529,6
+530,7
@@
static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("get_cluster_vnn failed: %s\n", nt_errstr(status)));
+ cluster_fatal("get_cluster_vnn failed");
goto fail;
}