From 66a7562af75866b2d7f0ff4058c74764a9108b7b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 27 Jan 2004 21:00:46 +0000 Subject: [PATCH] Fix run pool problem + remove bad ASSERTs git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1020 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kernstodo | 9 ++++++++- bacula/src/cats/drop_mysql_database.in | 16 ++++++++++------ bacula/src/cats/drop_sqlite_database.in | 8 ++++++-- bacula/src/cats/sql_list.c | 14 +++++++++++--- bacula/src/dird/ua_restore.c | 1 + bacula/src/filed/win32/bin/chmod.exe | Bin 0 -> 29184 bytes bacula/src/lib/bnet_server.c | 12 ++++++------ 7 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 bacula/src/filed/win32/bin/chmod.exe diff --git a/bacula/kernstodo b/bacula/kernstodo index 89de4c46fa..b591919231 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 17 January 2004 + 27 January 2004 Documentation to do: (any release a little bit at a time) - Document running a test version. @@ -249,6 +249,13 @@ For 1.33 In SD allow Device to have Multiple MediaTypes After 1.33: +- Look at www.nu2.nu/pebuilder as a helper for full windows + bare metal restore. +From Chris Hull: + it seems to be complaining about 12:00pm which should be a valid 12 + hour time. I changed the time to 11:59am and everything works fine. + Also 12:00am works fine. 0:00pm also works (which I don't think + should). None of the values 12:00pm - 12:59pm work for that matter. Ideas from Jerry Scharf: First let's point out some big pluses that bacula has for this it's open source diff --git a/bacula/src/cats/drop_mysql_database.in b/bacula/src/cats/drop_mysql_database.in index e5dfb60e8c..ff9ff481da 100644 --- a/bacula/src/cats/drop_mysql_database.in +++ b/bacula/src/cats/drop_mysql_database.in @@ -5,12 +5,16 @@ bindir=@SQL_BINDIR@ -if $bindir/mysql $* -f <cmd, "SELECT Path.Path,Filename.Name FROM File,\ -Filename,Path WHERE File.JobId=%u AND Filename.FilenameId=File.FilenameId \ -AND Path.PathId=File.PathId", + Mmsg(&mdb->cmd, "SELECT " FN " AS Filename FROM File," +"Filename,Path WHERE File.JobId=%u AND Filename.FilenameId=File.FilenameId " +"AND Path.PathId=File.PathId", jobid); if (!QUERY_DB(jcr, mdb, mdb->cmd)) { diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c index 137bd84883..cdadff6116 100644 --- a/bacula/src/dird/ua_restore.c +++ b/bacula/src/dird/ua_restore.c @@ -592,6 +592,7 @@ static int insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *fi strip_trailing_junk(file); split_path_and_filename(rx, file); Mmsg(&rx->query, uar_jobid_fileindex, date, rx->path, rx->fname, rx->ClientName); + Dmsg1(000, "Query=%s\n", rx->query); rx->found = false; /* Find and insert jobid and File Index */ if (!db_sql_query(ua->db, rx->query, jobid_fileindex_handler, (void *)rx)) { diff --git a/bacula/src/filed/win32/bin/chmod.exe b/bacula/src/filed/win32/bin/chmod.exe new file mode 100644 index 0000000000000000000000000000000000000000..18078e1a2983ea3a46a8cbba370b3118bb1d8f59 GIT binary patch literal 29184 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 literal 0 HcmV?d00001 diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c index c4b2a76ddf..3f5ccf0b20 100644 --- a/bacula/src/lib/bnet_server.c +++ b/bacula/src/lib/bnet_server.c @@ -128,7 +128,7 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w FD_SET(sockfd, &sockset); errno = 0; if ((stat = select(sockfd+1, &sockset, NULL, NULL, NULL)) < 0) { - if (errno == EINTR) { + if (errno == EINTR || errno == EAGAIN) { continue; } /* Error, get out */ @@ -141,7 +141,7 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w do { clilen = sizeof(cli_addr); newsockfd = accept(sockfd, (struct sockaddr *)&cli_addr, &clilen); - } while (newsockfd < 0 && errno == EINTR); + } while (newsockfd < 0 && (errno == EINTR || errno == EAGAIN)); if (newsockfd < 0) { continue; } @@ -212,7 +212,7 @@ bnet_bind(int port) * Open a TCP socket */ for (tlog=0; (sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0; tlog -= 10 ) { - if (errno == EINTR) { + if (errno == EINTR || errno == EAGAIN) { continue; } if (tlog <= 0) { @@ -238,7 +238,7 @@ bnet_bind(int port) serv_addr.sin_port = htons(port); for (tlog=0; bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0; tlog -= 5 ) { - if (errno == EINTR) { + if (errno == EINTR || errno == EAGAIN) { continue; } if (tlog <= 0) { @@ -280,7 +280,7 @@ bnet_accept(BSOCK *bsock, char *who) */ ready = sockset; if ((stat = select(bsock->fd+1, &ready, NULL, NULL, NULL)) < 0) { - if (errno == EINTR) { + if (errno == EINTR || errno = EAGAIN) { errno = 0; continue; } @@ -291,7 +291,7 @@ bnet_accept(BSOCK *bsock, char *who) do { clilen = sizeof(cli_addr); newsockfd = accept(bsock->fd, (struct sockaddr *)&cli_addr, &clilen); - } while (newsockfd < 0 && errno == EINTR); + } while (newsockfd < 0 && (errno == EINTR || errno = EAGAIN)); if (newsockfd >= 0) { break; } -- 2.39.5