diff options
author | Volker Lendecke <vl@samba.org> | 2010-03-02 17:02:01 +0100 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2010-03-10 16:07:10 +0100 |
commit | 89c785c47aa0fceba148297116e863f46941bd42 (patch) | |
tree | f1c4812e6467614bd542abda6f8bab198af1889d /source3/include | |
parent | 184afeb57d0daeacfacdb8c976032697efe00214 (diff) | |
download | samba-89c785c47aa0fceba148297116e863f46941bd42.tar.gz samba-89c785c47aa0fceba148297116e863f46941bd42.tar.bz2 samba-89c785c47aa0fceba148297116e863f46941bd42.zip |
s3: Fix a long-standing problem with recycled PIDs
When a samba server process dies hard, it has no chance to clean up its entries
in locking.tdb, brlock.tdb, connections.tdb and sessionid.tdb.
For locking.tdb and brlock.tdb Samba is robust by checking every time we read
an entry from the database if the corresponding process still exists. If it
does not exist anymore, the entry is deleted. This is not 100% failsafe though:
On systems with a limited PID space there is a non-zero chance that between the
smbd's death and the fresh access, the PID is recycled by another long-running
process. This renders all files that had been locked by the killed smbd
potentially unusable until the new process also dies.
This patch is supposed to fix the problem the following way: Every process ID
in every database is augmented by a random 64-bit number that is stored in a
serverid.tdb. Whenever we need to check if a process still exists we know its
PID and the 64-bit number. We look up the PID in serverid.tdb and compare the
64-bit number. If it's the same, the process still is a valid smbd holding the
lock. If it is different, a new smbd has taken over.
I believe this is safe against an smbd that has died hard and the PID has been
taken over by a non-samba process. This process would not have registered
itself with a fresh 64-bit number in serverid.tdb, so the old one still exists
in serverid.tdb. We protect against this case by the parent smbd taking care of
deregistering PIDs from serverid.tdb and the fact that serverid.tdb is
CLEAR_IF_FIRST.
CLEAR_IF_FIRST does not work in a cluster, so the automatic cleanup does not
work when all smbds are restarted. For this, "net serverid wipe" has to be run
before smbd starts up. As a convenience, "net serverid wipedbs" also cleans up
sessionid.tdb and connections.tdb.
While there, this also cleans up overloading connections.tdb with all the
process entries just for messaging_send_all().
Volker
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/includes.h | 1 | ||||
-rw-r--r-- | source3/include/messages.h | 1 | ||||
-rw-r--r-- | source3/include/proto.h | 1 | ||||
-rw-r--r-- | source3/include/serverid.h | 66 |
4 files changed, 69 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index dc0cbe182f..192b9a0bdb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -687,6 +687,7 @@ struct ntlmssp_state; #include "ctdbd_conn.h" #include "../lib/util/talloc_stack.h" #include "memcache.h" +#include "serverid.h" #include "async_smb.h" #include "../lib/async_req/async_sock.h" #include "talloc_dict.h" diff --git a/source3/include/messages.h b/source3/include/messages.h index 2e42fc6554..6063d358ea 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -72,6 +72,7 @@ struct server_id { #ifdef CLUSTER_SUPPORT uint32 vnn; #endif + uint64_t unique_id; }; #ifdef CLUSTER_SUPPORT diff --git a/source3/include/proto.h b/source3/include/proto.h index 7c1f8fa92c..6ecf0a5542 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1205,6 +1205,7 @@ uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options); pid_t procid_to_pid(const struct server_id *proc); void set_my_vnn(uint32 vnn); uint32 get_my_vnn(void); +void set_my_unique_id(uint64_t unique_id); struct server_id pid_to_procid(pid_t pid); struct server_id procid_self(void); bool procid_equal(const struct server_id *p1, const struct server_id *p2); diff --git a/source3/include/serverid.h b/source3/include/serverid.h new file mode 100644 index 0000000000..9ef778cdc0 --- /dev/null +++ b/source3/include/serverid.h @@ -0,0 +1,66 @@ +/* + Unix SMB/CIFS implementation. + Implementation of a reliable server_exists() + Copyright (C) Volker Lendecke 2010 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef __SERVERID_H__ +#define __SERVERID_H__ + +#include "includes.h" + +/* + * Register a server with its unique id + */ +bool serverid_register(const struct server_id *id, uint32_t msg_flags); + +/* + * Register ourselves with a unique id + */ +bool serverid_register_self(uint32_t msg_flags); + +/* + * De-register a server with its unique id + */ +bool serverid_deregister(const struct server_id *id); + +/* + * De-register ourself + */ +bool serverid_deregister_self(void); + +/* + * Check existence of a server id + */ +bool serverid_exists(const struct server_id *id); + +/* + * Walk the list of server_ids registered + */ +bool serverid_traverse(int (*fn)(struct db_record *rec, + const struct server_id *id, + uint32_t msg_flags, + void *private_data), + void *private_data); + +/* + * Walk the list of server_ids registered read-only + */ +bool serverid_traverse_read(int (*fn)(const struct server_id *id, + uint32_t msg_flags, + void *private_data), + void *private_data); +#endif |