The branch, v3-6-test has been updated
via e282a81 s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
from f28ec1d s3:build: add vfs_examples to the everything target
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit e282a816d45b750293c14fbd6de4569f7270107a
Author: Christian Ambach <[email protected]>
Date: Wed Jun 29 15:01:16 2011 +0200
s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
when CTDB is unhealthy, log a message and exit cleanly
instead of creating a core file
Autobuild-User: Christian Ambach <[email protected]>
Autobuild-Date: Thu Jun 30 13:18:12 CEST 2011 on sn-devel-104
(cherry picked from commit 847ca0a5d791d881be8d9a0721bf30399c80013b)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/server.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f1aac81..8ac0511 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -477,6 +477,15 @@ static void smbd_accept_connection(struct tevent_context
*ev,
"because too many files are open\n"));
goto exit;
}
+ if (lp_clustering() &&
+ NT_STATUS_EQUAL(status,
+ NT_STATUS_INTERNAL_DB_ERROR)) {
+ DEBUG(1,("child process cannot initialize "
+ "because connection to CTDB "
+ "has failed\n"));
+ goto exit;
+ }
+
DEBUG(0,("reinit_after_fork() failed\n"));
smb_panic("reinit_after_fork() failed");
}
--
Samba Shared Repository
