[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-311-g2ecc2f2
Ronnie Sahlberg
sahlberg at samba.org
Thu Feb 17 13:43:43 MST 2011
The branch, 1.2 has been updated
via 2ecc2f2567c578188c259f097b535be8a42be43c (commit)
from faf3b1542fd27b3ad32ac7b362ef39d8cb0b05ff (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2
- Log -----------------------------------------------------------------
commit 2ecc2f2567c578188c259f097b535be8a42be43c
Author: Ronnie Sahlberg <sahlberg at lenovo-laptop.(none)>
Date: Fri Feb 18 07:39:14 2011 +1100
Revert "Dont allow client processes to attach to databases while we are still in recovery mode."
This reverts commit faf3b1542fd27b3ad32ac7b362ef39d8cb0b05ff.
git pull ... 1.2-splitbrain
does not do what I think it does.
Revert patch and pull it into the right branch instead.
-----------------------------------------------------------------------
Summary of changes:
include/ctdb_private.h | 2 +-
server/ctdb_control.c | 4 ++--
server/ctdb_ltdb_server.c | 20 ++------------------
3 files changed, 5 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 5a1c15b..4dcf9a5 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -799,7 +799,7 @@ int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
void *private_data);
int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata,
- TDB_DATA *outdata, uint64_t tdb_flags, bool persistent, uint32_t client_id);
+ TDB_DATA *outdata, uint64_t tdb_flags, bool persistent);
int ctdb_daemon_set_call(struct ctdb_context *ctdb, uint32_t db_id,
ctdb_fn_t fn, int id);
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 488b3e9..90900c9 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -221,10 +221,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
}
case CTDB_CONTROL_DB_ATTACH:
- return ctdb_control_db_attach(ctdb, indata, outdata, srvid, false, client_id);
+ return ctdb_control_db_attach(ctdb, indata, outdata, srvid, false);
case CTDB_CONTROL_DB_ATTACH_PERSISTENT:
- return ctdb_control_db_attach(ctdb, indata, outdata, srvid, true, client_id);
+ return ctdb_control_db_attach(ctdb, indata, outdata, srvid, true);
case CTDB_CONTROL_SET_CALL: {
struct ctdb_control_set_call *sc =
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 8340c37..ba2a9cb 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -750,27 +750,11 @@ again:
*/
int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata,
TDB_DATA *outdata, uint64_t tdb_flags,
- bool persistent, uint32_t client_id)
+ bool persistent)
{
const char *db_name = (const char *)indata.dptr;
struct ctdb_db_context *db;
- struct ctdb_node *node;
-
- /* dont allow any local clients to attach while we are in recovery mode
- * except for the recovery daemon.
- * allow all attach from the network since these are always from remote
- * recovery daemons.
- */
- if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE && client_id != 0) {
- struct ctdb_client *client = ctdb_reqid_find(ctdb, client_id, struct ctdb_client);
-
- if (client != NULL && client->pid != ctdb->recoverd_pid) {
- DEBUG(DEBUG_ERR,("DB Attach to database %s refused for client with pid:%d since node is in recovery mode.\n", db_name, client->pid));
- return -1;
- }
- }
-
- node = ctdb->nodes[ctdb->pnn];
+ struct ctdb_node *node = ctdb->nodes[ctdb->pnn];
/* the client can optionally pass additional tdb flags, but we
only allow a subset of those on the database in ctdb. Note
--
CTDB repository
More information about the samba-cvs
mailing list