[SCM] CTDB repository - branch master updated - ctdb-2.1-55-g4c0cbfb
Michael Adam
obnox at samba.org
Wed Apr 17 04:43:33 MDT 2013
The branch, master has been updated
via 4c0cbfbe8b19f2e6fe17093b52c734bec63dd8b7 (commit)
via 2e92deef5221ee651028ef87138b3113f1fece91 (commit)
via 9f01b8db72780acf2f88f1392bc0a796dd4c6176 (commit)
via e96acf19b4d1e0f951ab92b88869a01ff06398be (commit)
from 5808f0778b39b79ab7a5c7f53ad27947131386ec (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4c0cbfbe8b19f2e6fe17093b52c734bec63dd8b7
Author: Michael Adam <obnox at samba.org>
Date: Mon Apr 15 12:50:42 2013 +0200
logging: fix comment typo
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 2e92deef5221ee651028ef87138b3113f1fece91
Author: Michael Adam <obnox at samba.org>
Date: Wed Apr 3 14:03:32 2013 +0200
ctdbd: unimplement the unused SET_DMASTER control
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 9f01b8db72780acf2f88f1392bc0a796dd4c6176
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 22 17:48:00 2013 +0100
recoverd: remove bogus comment "qqq" from "add prototype new banning code"
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit e96acf19b4d1e0f951ab92b88869a01ff06398be
Author: Michael Adam <obnox at samba.org>
Date: Fri Apr 5 16:55:18 2013 +0200
build: silence building of porting_test
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
include/ctdb_private.h | 1 -
include/ctdb_protocol.h | 2 +-
server/ctdb_control.c | 4 ++-
server/ctdb_logging.c | 2 +-
server/ctdb_recover.c | 53 -----------------------------------------------
server/ctdb_recoverd.c | 1 -
7 files changed, 6 insertions(+), 59 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 9511e90..87a3bd3 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -260,7 +260,7 @@ tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o
tests/bin/ctdb_porting_tests: $(CTDB_CLIENT_OBJ) tests/src/ctdb_porting_tests.o
@echo Linking $@
- $(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ) tests/src/ctdb_transaction.o
@echo Linking $@
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index ecdf257..d0c4234 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1042,7 +1042,6 @@ struct ctdb_rec_data *ctdb_marshall_loop_next(struct ctdb_marshall_buffer *m, st
int32_t ctdb_control_pull_db(struct ctdb_context *ctdb, TDB_DATA indata, TDB_DATA *outdata);
int32_t ctdb_control_push_db(struct ctdb_context *ctdb, TDB_DATA indata);
-int32_t ctdb_control_set_dmaster(struct ctdb_context *ctdb, TDB_DATA indata);
int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb,
struct ctdb_req_control *c,
diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index 9302c7b..751fe32 100644
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -283,7 +283,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0,
CTDB_CONTROL_SET_DEBUG = 8,
CTDB_CONTROL_GET_DBMAP = 9,
CTDB_CONTROL_GET_NODEMAPv4 = 10, /* obsolete */
- CTDB_CONTROL_SET_DMASTER = 11,
+ CTDB_CONTROL_SET_DMASTER = 11, /* obsolete */
/* #12 removed */
CTDB_CONTROL_PULL_DB = 13,
CTDB_CONTROL_PUSH_DB = 14,
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index b567865..99b3dc4 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -169,7 +169,9 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
case CTDB_CONTROL_SET_DMASTER:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_set_dmaster));
- return ctdb_control_set_dmaster(ctdb, indata);
+ DEBUG(DEBUG_ERR, ("The SET_DMASTER control is not implemented "
+ "any more.\n"));
+ return -1;
case CTDB_CONTROL_PUSH_DB:
return ctdb_control_push_db(ctdb, indata);
diff --git a/server/ctdb_logging.c b/server/ctdb_logging.c
index dfb5063..0b6ac12 100644
--- a/server/ctdb_logging.c
+++ b/server/ctdb_logging.c
@@ -65,7 +65,7 @@ static void ctdb_syslog_handler(struct event_context *ev, struct fd_event *fde,
}
-/* called when the pipd from the main daemon has closed
+/* called when the pipe from the main daemon has closed
* this is for the syslog daemon, we can not use DEBUG here
*/
static void ctdb_syslog_terminate_handler(struct event_context *ev, struct fd_event *fde,
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index 32c87bb..433a665 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -458,59 +458,6 @@ failed:
return -1;
}
-
-static int traverse_setdmaster(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *p)
-{
- uint32_t *dmaster = (uint32_t *)p;
- struct ctdb_ltdb_header *header = (struct ctdb_ltdb_header *)data.dptr;
- int ret;
-
- /* skip if already correct */
- if (header->dmaster == *dmaster) {
- return 0;
- }
-
- header->dmaster = *dmaster;
-
- ret = tdb_store(tdb, key, data, TDB_REPLACE);
- if (ret) {
- DEBUG(DEBUG_CRIT,(__location__ " failed to write tdb data back ret:%d\n",ret));
- return ret;
- }
-
- /* TODO: add error checking here */
-
- return 0;
-}
-
-int32_t ctdb_control_set_dmaster(struct ctdb_context *ctdb, TDB_DATA indata)
-{
- struct ctdb_control_set_dmaster *p = (struct ctdb_control_set_dmaster *)indata.dptr;
- struct ctdb_db_context *ctdb_db;
-
- ctdb_db = find_ctdb_db(ctdb, p->db_id);
- if (!ctdb_db) {
- DEBUG(DEBUG_ERR,(__location__ " Unknown db 0x%08x\n", p->db_id));
- return -1;
- }
-
- if (ctdb->freeze_mode[ctdb_db->priority] != CTDB_FREEZE_FROZEN) {
- DEBUG(DEBUG_DEBUG,("rejecting ctdb_control_set_dmaster when not frozen\n"));
- return -1;
- }
-
- if (ctdb_lockall_mark_prio(ctdb, ctdb_db->priority) != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to get lock on entired db - failing\n"));
- return -1;
- }
-
- tdb_traverse(ctdb_db->ltdb->tdb, traverse_setdmaster, &p->dmaster);
-
- ctdb_lockall_unmark_prio(ctdb, ctdb_db->priority);
-
- return 0;
-}
-
struct ctdb_set_recmode_state {
struct ctdb_context *ctdb;
struct ctdb_req_control *c;
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 1f2a772..2cfa9b9 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3469,7 +3469,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
/* check that we (recovery daemon) and the local ctdb daemon
agrees on whether we are banned or not
*/
-//qqq
/* remember our own node flags */
rec->node_flags = nodemap->nodes[pnn].flags;
--
CTDB repository
More information about the samba-cvs
mailing list