diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-08 12:51:03 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-10-06 12:34:32 +0200 |
| commit | b544073653a5b54ba8ec2621c7314136656cfaeb (patch) | |
| tree | eac4cbb58746bcfdaaa21d55759bd389330ac311 /ctdb/include | |
| parent | 57bcb8055eb3e15c4ce7bcdeeef7efed175ed347 (diff) | |
| download | samba-b544073653a5b54ba8ec2621c7314136656cfaeb.tar.gz samba-b544073653a5b54ba8ec2621c7314136656cfaeb.tar.xz samba-b544073653a5b54ba8ec2621c7314136656cfaeb.zip | |
ctdb-logging: Remove log ringbuffer
As far as we know, nobody uses this and it just complicates the
logging subsystem.
Remove all ringbuffer code and documentation. Update the local
daemons startup code correspondingly.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'ctdb/include')
| -rw-r--r-- | ctdb/include/ctdb_logging.h | 2 | ||||
| -rw-r--r-- | ctdb/include/ctdb_private.h | 12 | ||||
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 4 |
3 files changed, 3 insertions, 15 deletions
diff --git a/ctdb/include/ctdb_logging.h b/ctdb/include/ctdb_logging.h index 710864e8a1..41bbed5964 100644 --- a/ctdb/include/ctdb_logging.h +++ b/ctdb/include/ctdb_logging.h @@ -36,7 +36,7 @@ enum debug_level { }; #define DEBUGLVL(lvl) ((lvl) <= LogLevel) -#define DEBUG(lvl, x) do { this_log_level = (lvl); if ((lvl) < DEBUG_DEBUG) { log_ringbuffer x; } if ((lvl) <= LogLevel) { do_debug x; }} while (0) +#define DEBUG(lvl, x) do { this_log_level = (lvl); if ((lvl) <= LogLevel) { do_debug x; }} while (0) #define DEBUGADD(lvl, x) do { if ((lvl) <= LogLevel) { this_log_level = (lvl); do_debug_add x; }} while (0) #endif /* _CTDB_LOGGING_H_ */ diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 02602e1946..3b6bdc7377 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -1096,7 +1096,6 @@ void reset_scheduler(void); struct tevent_signal *ctdb_init_sigchld(struct ctdb_context *ctdb); void ctdb_track_child(struct ctdb_context *ctdb, pid_t pid); pid_t ctdb_fork(struct ctdb_context *ctdb); -pid_t ctdb_fork_no_free_ringbuffer(struct ctdb_context *ctdb); void ctdb_set_child_info(TALLOC_CTX *mem_ctx, const char *child_name_fmt, ...); bool ctdb_is_child_process(void); int ctdb_kill(struct ctdb_context *ctdb, pid_t pid, int signum); @@ -1459,17 +1458,6 @@ struct ctdb_get_log_addr { int32_t level; }; -extern int log_ringbuf_size; - -enum debug_level; -TDB_DATA ctdb_log_ringbuffer_collect_log(TALLOC_CTX *mem_ctx, - enum debug_level max_level); -void ctdb_collect_log(struct ctdb_context *ctdb, struct ctdb_get_log_addr *log_addr); -void ctdb_clear_log(struct ctdb_context *ctdb); -int32_t ctdb_control_get_log(struct ctdb_context *ctdb, TDB_DATA addr); -int32_t ctdb_control_clear_log(struct ctdb_context *ctdb); -void ctdb_log_ringbuffer_free(void); - struct ctdb_log_state *ctdb_vfork_with_logging(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, const char *log_prefix, diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 629c91c0cd..61d5735bba 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -386,8 +386,8 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_REGISTER_NOTIFY = 114, CTDB_CONTROL_DEREGISTER_NOTIFY = 115, CTDB_CONTROL_TRANS2_ACTIVE = 116, /* obsolete */ - CTDB_CONTROL_GET_LOG = 117, - CTDB_CONTROL_CLEAR_LOG = 118, + CTDB_CONTROL_GET_LOG = 117, /* obsolete */ + CTDB_CONTROL_CLEAR_LOG = 118, /* obsolete */ CTDB_CONTROL_TRANS3_COMMIT = 119, CTDB_CONTROL_GET_DB_SEQNUM = 120, CTDB_CONTROL_DB_SET_HEALTHY = 121, |