+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
* Bacula File Daemon heartbeat routines
* Listens for heartbeats coming from the SD
* Version $Id$
*
*/
-/*
- Copyright (C) 2003-2004 Kern Sibbald and John Walker
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
-
- */
#include "bacula.h"
#include "filed.h"
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-/* pthread_kill() dies on Cygwin, so disable it */
-#define pthread_kill(x, y)
-/* Use shorter wait interval on Cygwin because no kill */
-#define WAIT_INTERVAL 10
-
-#else /* Unix systems */
-#define WAIT_INTERVAL 60
-#endif
+#define WAIT_INTERVAL 5
extern "C" void *sd_heartbeat_thread(void *arg);
extern "C" void *dir_heartbeat_thread(void *arg);
dir = dup_bsock(jcr->dir_bsock);
jcr->hb_bsock = sd;
+ jcr->hb_dir_bsock = dir;
/* Hang reading the socket to the SD, and every time we get
- * a heartbeat or we get a wait timeout (1 minute), we
- * check to see if we need to send a heartbeat to the
- * Director.
+ * a heartbeat or we get a wait timeout (1 minute), we
+ * check to see if we need to send a heartbeat to the
+ * Director.
*/
for ( ; !is_bnet_stop(sd); ) {
n = bnet_wait_data_intr(sd, WAIT_INTERVAL);
if (me->heartbeat_interval) {
- now = time(NULL);
- if (now-last_heartbeat >= me->heartbeat_interval) {
- bnet_sig(dir, BNET_HEARTBEAT);
- last_heartbeat = now;
- }
+ now = time(NULL);
+ if (now-last_heartbeat >= me->heartbeat_interval) {
+ bnet_sig(dir, BNET_HEARTBEAT);
+ last_heartbeat = now;
+ }
+ }
+ if (n < 0 || is_bnet_stop(sd)) {
+ break;
}
- if (n == 1) { /* input waiting */
- bnet_recv(sd); /* read it -- probably heartbeat from sd */
- if (sd->msglen <= 0) {
- Dmsg1(100, "Got BNET_SIG %d from SD\n", sd->msglen);
- } else {
- Dmsg2(100, "Got %d bytes from SD. MSG=%s\n", sd->msglen, sd->msg);
- }
+ if (n == 1) { /* input waiting */
+ bnet_recv(sd); /* read it -- probably heartbeat from sd */
+ if (sd->msglen <= 0) {
+ Dmsg1(100, "Got BNET_SIG %d from SD\n", sd->msglen);
+ } else {
+ Dmsg2(100, "Got %d bytes from SD. MSG=%s\n", sd->msglen, sd->msg);
+ }
}
+ Dmsg2(100, "wait_intr=%d stop=%d\n", n, is_bnet_stop(sd));
}
bnet_close(sd);
bnet_close(dir);
jcr->hb_bsock = NULL;
+ jcr->hb_dir_bsock = NULL;
return NULL;
}
*/
if (!no_signals) {
jcr->hb_bsock = NULL;
+ jcr->hb_dir_bsock = NULL;
pthread_create(&jcr->heartbeat_id, NULL, sd_heartbeat_thread, (void *)jcr);
}
}
}
/* Wait max 10 secs for heartbeat thread to start */
while (jcr->hb_bsock == NULL && cnt++ < 200) {
- bmicrosleep(0, 50); /* avoid race */
+ bmicrosleep(0, 50000); /* wait for start */
}
if (jcr->hb_bsock) {
- jcr->hb_bsock->timed_out = 1; /* set timed_out to terminate read */
- jcr->hb_bsock->terminated = 1; /* set to terminate read */
+ jcr->hb_bsock->set_timed_out(); /* set timed_out to terminate read */
+ jcr->hb_bsock->set_terminated(); /* set to terminate read */
}
+ if (jcr->hb_dir_bsock) {
+ jcr->hb_dir_bsock->set_timed_out(); /* set timed_out to terminate read */
+ jcr->hb_dir_bsock->set_terminated(); /* set to terminate read */
+ }
+ Dmsg0(100, "Send kill to heartbeat id\n");
+ pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL); /* make heartbeat thread go away */
+ bmicrosleep(0, 50000);
cnt = 0;
/* Wait max 100 secs for heartbeat thread to stop */
while (jcr->hb_bsock && cnt++ < 200) {
- /* Naturally, Cygwin 1.3.20 craps out on the following */
- pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL); /* make heartbeat thread go away */
- bmicrosleep(0, 500);
+ pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL); /* make heartbeat thread go away */
+ bmicrosleep(0, 500000);
}
}
now = time(NULL);
next = now - last_heartbeat;
if (next >= me->heartbeat_interval) {
- bnet_sig(dir, BNET_HEARTBEAT);
- last_heartbeat = now;
+ dir->signal(BNET_HEARTBEAT);
+ last_heartbeat = now;
}
bmicrosleep(next, 0);
}
- bnet_close(dir);
+ dir->close();
jcr->hb_bsock = NULL;
return NULL;
}
void start_dir_heartbeat(JCR *jcr)
{
if (me->heartbeat_interval) {
+ jcr->dir_bsock->set_locking();
pthread_create(&jcr->heartbeat_id, NULL, dir_heartbeat_thread, (void *)jcr);
}
}
projects / bacula / bacula / blobdiff