The branch, 1.3 has been updated
via 71fd639a730b8e643d9d4aef45154a110a3f9b0e (commit)
via 7b338a87d22eec641e57d0454da7c998dff9d330 (commit)
via 58e1fcf0880a60de2e51a593f530f2fc66732523 (commit)
from 4c7d18a5430c8178d85a84da48c20c5322046c88 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.3
- Log -----------------------------------------------------------------
commit 71fd639a730b8e643d9d4aef45154a110a3f9b0e
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date: Mon Mar 14 09:55:28 2011 +1100
IP reallocation. If a public address is already hosted on the node when we
startup, log a warning message but do not cause the recovery to fail.
CQ S1022356
Signed-off-by: Michael Adam <ob...@samba.org>
commit 7b338a87d22eec641e57d0454da7c998dff9d330
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date: Sun Mar 13 11:30:52 2011 +1100
Vacuuming: initialize a variable to avoid a harmless valgrind hit
Signed-off-by: Michael Adam <ob...@samba.org>
commit 58e1fcf0880a60de2e51a593f530f2fc66732523
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date: Sat Mar 12 09:42:07 2011 +1100
Dont allow clients to connect to databases untile we are well past and
through
the initial recovery phase
CQ S1022412
Signed-off-by: Michael Adam <ob...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
server/ctdb_ltdb_server.c | 3 ++-
server/ctdb_monitor.c | 1 +
server/ctdb_takeover.c | 2 +-
server/ctdb_vacuum.c | 3 ++-
4 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 92fb0f6..fe061e7 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -1029,7 +1029,8 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb,
TDB_DATA indata,
}
if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE
- && client->pid != ctdb->recoverd_pid) {
+ && client->pid != ctdb->recoverd_pid
+ && !ctdb->done_startup) {
struct ctdb_deferred_attach_context *da_ctx =
talloc(client, struct ctdb_deferred_attach_context);
if (da_ctx == NULL) {
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index f96dde4..820e082 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -304,6 +304,7 @@ static void ctdb_wait_until_recovered(struct event_context
*ev, struct timed_eve
"ctdb_start_monitoring:
ctdb_recheck_persistent_health() OK\n"));
DEBUG(DEBUG_NOTICE,(__location__ " Recoveries finished. Running the
\"startup\" event.\n"));
+ DEBUG(DEBUG_ERR,(__location__ " Allow clients to attach to
databases.\n"));
event_add_timed(ctdb->ev, ctdb->monitor->monitor_context,
timeval_current(),
ctdb_check_health, ctdb);
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 1d6fe6e..3dac1f7 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -596,7 +596,7 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known
to the kernel, "
"but we have no interface assigned, has
someone manually configured it? Ignore for now.\n",
ctdb_addr_to_str(&vnn->public_address)));
- return -1;
+ return 0;
}
if (vnn->pnn != ctdb->pnn && have_ip && vnn->pnn != -1) {
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 5bd2b0a..bdb7c40 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -1261,7 +1261,8 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db)
ctdb_db->vacuum_handle = talloc(ctdb_db, struct ctdb_vacuum_handle);
CTDB_NO_MEMORY(ctdb_db->ctdb, ctdb_db->vacuum_handle);
- ctdb_db->vacuum_handle->ctdb_db = ctdb_db;
+ ctdb_db->vacuum_handle->ctdb_db = ctdb_db;
+ ctdb_db->vacuum_handle->fast_path_count = 0;
event_add_timed(ctdb_db->ctdb->ev, ctdb_db->vacuum_handle,
timeval_current_ofs(get_vacuum_interval(ctdb_db), 0),
--
CTDB repository
