summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdbd.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2008-07-02 13:55:59 +1000
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2008-07-02 13:55:59 +1000
commitef769e7237d37fd68ab5aca250ecc7b728dc010e (patch)
treec012b71d4efc43288f1b62bc1b626ce6b3431bb9 /ctdb/server/ctdbd.c
parent05b50ebe0ae4e27767c202b03aa18fcc3aed7526 (diff)
downloadsamba-ef769e7237d37fd68ab5aca250ecc7b728dc010e.tar.gz
samba-ef769e7237d37fd68ab5aca250ecc7b728dc010e.tar.xz
samba-ef769e7237d37fd68ab5aca250ecc7b728dc010e.zip
track both when we last started and ended a recovery.
make ctdb uptime print how long the recovery took in the recovery daemon when we check that the public ip address allocation on the local node is correct (we have the ips we should have and we dont have any we shouldnt have) use ctdb uptime and check the recovery start/stop times and make sure we dont check for ip allocation inconsistencies during a recovery where the ip address allocation is in flux. (This used to be ctdb commit f86551580349b7f662f9a07e4eb0c1189e38e429)
Diffstat (limited to 'ctdb/server/ctdbd.c')
-rw-r--r--ctdb/server/ctdbd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index c21d4349e9..aa5253ac1d 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -174,7 +174,8 @@ int main(int argc, const char *argv[])
DEBUG(DEBUG_NOTICE,("Starting CTDB daemon\n"));
gettimeofday(&ctdb->ctdbd_start_time, NULL);
- gettimeofday(&ctdb->last_recovery_time, NULL);
+ gettimeofday(&ctdb->last_recovery_started, NULL);
+ gettimeofday(&ctdb->last_recovery_finished, NULL);
ctdb->recovery_mode = CTDB_RECOVERY_NORMAL;
ctdb->recovery_master = (uint32_t)-1;
ctdb->upcalls = &ctdb_upcalls;