sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

merge from tridge

Browse Source 
(This used to be ctdb commit 17b73a811009588f836c3f9fd1b775d9d504d30c)
This commit is contained in:
Ronnie Sahlberg 2007-05-02 22:00:48 +10:00
commit 768eb0f763
5 changed files with 79 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/Makefile.in
View File

@ -121,12 +121,6 @@ test: all
valgrindtest: all
VALGRIND="valgrind -q --trace-children=yes" tests/run_tests.sh
test:
tests/run_tests.sh
valgrindtest:
VALGRIND="valgrind -q --trace-children=yes" tests/run_tests.sh
realdistclean: distclean
rm -f configure config.h.in

20
ctdb/common/ctdb_ltdb.c
View File

@ -50,6 +50,15 @@ static int ctdb_null_func(struct ctdb_call_info *call)
return 0;
}
/*
this is a plain fetch procedure that all databases support
*/
static int ctdb_fetch_func(struct ctdb_call_info *call)
{
call->reply_data = &call->record_data;
return 0;
}
/*
return the lmaster given a key
@ -366,6 +375,17 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata,
talloc_free(ctdb_db);
return -1;
}
/*
all databases support the "fetch" function. we need this
for efficient Samba3 ctdb fetch
*/
ret = ctdb_daemon_set_call(ctdb, ctdb_db->db_id, ctdb_fetch_func, CTDB_FETCH_FUNC);
if (ret != 0) {
DEBUG(0,("Failed to setup fetch function for '%s'\n", ctdb_db->db_name));
talloc_free(ctdb_db);
return -1;
}
/* tell all the other nodes about this database */
ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_VNN, 0,

15
ctdb/include/ctdb.h
View File

@ -180,25 +180,10 @@ int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
Fetch a ctdb record from a remote node
. Underneath this will force the
dmaster for the record to be moved to the local node.
*/
struct ctdb_record_handle *ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx,
TDB_DATA key, TDB_DATA *data);
/*
do a fetch lock from a client to the local daemon
*/
#define FETCH_LOCK_SUCCESS 0
#define FETCH_LOCK_LOCKFAILED 1
#define FETCH_LOCK_FETCHFAILED 2
#define FETCH_LOCK_DMASTERFAILED 3
int ctdb_client_fetch_lock(struct ctdb_db_context *ctdb_db,
TALLOC_CTX *mem_ctx,
TDB_DATA key, TDB_DATA *data);
int ctdb_record_store(struct ctdb_record_handle *h, TDB_DATA data);
int ctdb_register_message_handler(struct ctdb_context *ctdb,

3
ctdb/include/ctdb_private.h
View File

@ -30,7 +30,8 @@
#define CTDB_DS_ALIGNMENT 8
#define CTDB_NULL_FUNC 0xF0000001
#define CTDB_NULL_FUNC 0xFF000001
#define CTDB_FETCH_FUNC 0xFF000002
#define CTDB_CURRENT_NODE 0xF0000001
#define CTDB_BROADCAST_VNN 0xF0000002

122
ctdb/tools/ctdb_control.c
View File

@ -32,27 +32,29 @@
*/
static void usage(void)
{
printf("Usage: ctdb_control [options] <control>\n");
printf("\nControls:\n");
printf(" ping\n");
printf(" process-exists <vnn:pid> see if a process exists\n");
printf(" status <vnn|all> show ctdb status on a node\n");
printf(" statusreset <vnn|all> reset status on a node\n");
printf(" debug <vnn|all> <level> set ctdb debug level on a node\n");
printf(" debuglevel display ctdb debug levels\n");
printf(" getvnnmap <vnn> display ctdb vnnmap\n");
printf(" setvnnmap <vnn> <generation> <numslots> <lmaster>*\n");
printf(" getdbmap <vnn> lists databases on a node\n");
printf(" getnodemap <vnn> lists nodes known to a ctdb daemon\n");
printf(" createdb <vnn> <dbname> create a database\n");
printf(" catdb <vnn> <dbid> lists all keys in a remote tdb\n");
printf(" cpdb <fromvnn> <tovnn> <dbid> lists all keys in a remote tdb\n");
printf(" setdmaster <vnn> <dbid> <dmaster> sets new dmaster for all records in the database\n");
printf(" cleardb <vnn> <dbid> deletes all records in a db\n");
printf(" writerecord <vnn> <dbid> <key> <data>\n");
printf(" getrecmode <vnn> get recovery mode\n");
printf(" setrecmode <vnn> <mode> set recovery mode\n");
printf(" recover <vnn> recover the cluster\n");
printf(
"Usage: ctdb_control [options] <control>\n"
"\nControls:\n"
" ping\n"
" process-exists <vnn:pid> see if a process exists\n"
" status <vnn|all> show ctdb status on a node\n"
" statusreset <vnn|all> reset status on a node\n"
" debug <vnn|all> <level> set ctdb debug level on a node\n"
" debuglevel display ctdb debug levels\n"
" getvnnmap <vnn> display ctdb vnnmap\n"
" setvnnmap <vnn> <generation> <numslots> <lmaster>*\n"
" getdbmap <vnn> lists databases on a node\n"
" getnodemap <vnn> lists nodes known to a ctdb daemon\n"
" createdb <vnn> <dbname> create a database\n"
" catdb <vnn> <dbid> lists all keys in a remote tdb\n"
" cpdb <fromvnn> <tovnn> <dbid> lists all keys in a remote tdb\n"
" setdmaster <vnn> <dbid> <dmaster> sets new dmaster for all records in the database\n"
" cleardb <vnn> <dbid> deletes all records in a db\n"
" getrecmode <vnn> get recovery mode\n"
" setrecmode <vnn> <mode> set recovery mode\n"
" writerecord <vnn> <dbid> <key> <data>\n"
" recover <vnn> recover the cluster\n"
" attach <dbname> attach a database\n");
exit(1);
}
@ -901,10 +903,35 @@ int main(int argc, const char *argv[])
int opt;
const char **extra_argv;
int extra_argc = 0;
int ret;
int ret, i;
poptContext pc;
struct event_context *ev;
const char *control;
static struct {
const char *name;
int (*fn)(struct ctdb_context *, int, const char **);
} commands[] = {
{ "process-exists", control_process_exists },
{ "status", control_status },
{ "statusreset", control_status_reset },
{ "getvnnmap", control_getvnnmap },
{ "getdbmap", control_getdbmap },
{ "getnodemap", control_getnodemap },
{ "catdb", control_catdb },
{ "cpdb", control_cpdb },
{ "setvnnmap", control_setvnnmap },
{ "setdmaster", control_setdmaster },
{ "createdb", control_createdb },
{ "cleardb", control_cleardb },
{ "getrecmode", control_getrecmode },
{ "setrecmode", control_setrecmode },
{ "ping", control_ping },
{ "debug", control_debug },
{ "debuglevel", control_debuglevel },
{ "recover", control_recover },
{ "writerecord", control_writerecord },
{ "attach", control_attach },
};
pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
@ -939,49 +966,14 @@ int main(int argc, const char *argv[])
exit(1);
}
if (strcmp(control, "process-exists") == 0) {
ret = control_process_exists(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "status") == 0) {
ret = control_status(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "statusreset") == 0) {
ret = control_status_reset(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "getvnnmap") == 0) {
ret = control_getvnnmap(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "getdbmap") == 0) {
ret = control_getdbmap(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "getnodemap") == 0) {
ret = control_getnodemap(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "catdb") == 0) {
ret = control_catdb(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "cpdb") == 0) {
ret = control_cpdb(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "setvnnmap") == 0) {
ret = control_setvnnmap(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "setvnnmap") == 0) {
ret = control_setvnnmap(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "writerecord") == 0) {
ret = control_writerecord(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "setdmaster") == 0) {
ret = control_setdmaster(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "cleardb") == 0) {
ret = control_cleardb(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "createdb") == 0) {
ret = control_createdb(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "getrecmode") == 0) {
ret = control_getrecmode(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "setrecmode") == 0) {
ret = control_setrecmode(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "ping") == 0) {
ret = control_ping(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "debug") == 0) {
ret = control_debug(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "debuglevel") == 0) {
ret = control_debuglevel(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "recover") == 0) {
ret = control_recover(ctdb, extra_argc-1, extra_argv+1);
} else if (strcmp(control, "attach") == 0) {
ret = control_attach(ctdb, extra_argc-1, extra_argv+1);
} else {
for (i=0;i<ARRAY_SIZE(commands);i++) {
if (strcmp(control, commands[i].name) == 0) {
ret = commands[i].fn(ctdb, extra_argc-1, extra_argv+1);
break;
}
}
if (i == ARRAY_SIZE(commands)) {
printf("Unknown control '%s'\n", control);
exit(1);
}