X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fspool.c;h=0dd49a36d4568bfa4b1155a9924c2df3411717f9;hb=7a8791d4fa5c0d6206a83d735f9636a27c59d652;hp=367d897a25190ab2c9fa581d8ad016ff9db75c1b;hpb=566a01e6fc9650449d6fd0779d90b4dfced3295a;p=bacula%2Fbacula diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c index 367d897a25..0dd49a36d4 100644 --- a/bacula/src/stored/spool.c +++ b/bacula/src/stored/spool.c @@ -30,15 +30,35 @@ /* Forward referenced subroutines */ static void make_unique_data_spool_filename(JCR *jcr, POOLMEM **name); -static int open_data_spool_file(JCR *jcr); -static int close_data_spool_file(JCR *jcr); -static bool despool_data(DCR *dcr); -static int read_block_from_spool_file(DCR *dcr, DEV_BLOCK *block); +static bool open_data_spool_file(JCR *jcr); +static bool close_data_spool_file(JCR *jcr); +static bool despool_data(DCR *dcr, bool commit); +static int read_block_from_spool_file(DCR *dcr, DEV_BLOCK *block); +static bool open_attr_spool_file(JCR *jcr, BSOCK *bs); +static bool close_attr_spool_file(JCR *jcr, BSOCK *bs); +static bool write_spool_header(DCR *dcr, DEV_BLOCK *block); +static bool write_spool_data(DCR *dcr, DEV_BLOCK *block); + +struct spool_stats_t { + uint32_t data_jobs; /* current jobs spooling data */ + uint32_t attr_jobs; + uint32_t total_data_jobs; /* total jobs to have spooled data */ + uint32_t total_attr_jobs; + int64_t max_data_size; /* max data size */ + int64_t max_attr_size; + int64_t data_size; /* current data size (all jobs running) */ + int64_t attr_size; +}; + +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +spool_stats_t spool_stats; +/* + * Header for data spool record */ struct spool_hdr { - int32_t FirstIndex; - int32_t LastIndex; - uint32_t len; + int32_t FirstIndex; /* FirstIndex for buffer */ + int32_t LastIndex; /* LastIndex for buffer */ + uint32_t len; /* length of next buffer */ }; enum { @@ -47,6 +67,23 @@ enum { RB_OK }; +void list_spool_stats(BSOCK *bs) +{ + char ed1[30], ed2[30]; + if (spool_stats.data_jobs || spool_stats.max_data_size) { + bnet_fsend(bs, "Data spooling: %u active jobs, %s bytes; %u total jobs, %s max bytes/job.\n", + spool_stats.data_jobs, edit_uint64_with_commas(spool_stats.data_size, ed1), + spool_stats.total_data_jobs, + edit_uint64_with_commas(spool_stats.max_data_size, ed2)); + } + if (spool_stats.attr_jobs || spool_stats.max_attr_size) { + bnet_fsend(bs, "Attr spooling: %u active jobs, %s bytes; %u total jobs, %s max bytes.\n", + spool_stats.attr_jobs, edit_uint64_with_commas(spool_stats.attr_size, ed1), + spool_stats.total_attr_jobs, + edit_uint64_with_commas(spool_stats.max_attr_size, ed2)); + } +} + bool begin_data_spool(JCR *jcr) { bool stat = true; @@ -56,6 +93,10 @@ bool begin_data_spool(JCR *jcr) stat = open_data_spool_file(jcr); if (stat) { jcr->dcr->spooling = true; + Jmsg(jcr, M_INFO, 0, _("Spooling data ...\n")); + P(mutex); + spool_stats.data_jobs++; + V(mutex); } } return stat; @@ -73,9 +114,10 @@ bool discard_data_spool(JCR *jcr) bool commit_data_spool(JCR *jcr) { bool stat; + if (jcr->dcr->spooling) { Dmsg0(100, "Committing spooled data\n"); - stat = despool_data(jcr->dcr); + stat = despool_data(jcr->dcr, true /*commit*/); if (!stat) { Dmsg1(000, "Bad return from despool WroteVol=%d\n", jcr->dcr->WroteVol); close_data_spool_file(jcr); @@ -88,7 +130,7 @@ bool commit_data_spool(JCR *jcr) static void make_unique_data_spool_filename(JCR *jcr, POOLMEM **name) { - char *dir; + const char *dir; if (jcr->dcr->dev->device->spool_directory) { dir = jcr->dcr->dev->device->spool_directory; } else { @@ -98,7 +140,7 @@ static void make_unique_data_spool_filename(JCR *jcr, POOLMEM **name) } -static int open_data_spool_file(JCR *jcr) +static bool open_data_spool_file(JCR *jcr) { POOLMEM *name = get_pool_memory(PM_MESSAGE); int spool_fd; @@ -108,30 +150,43 @@ static int open_data_spool_file(JCR *jcr) jcr->dcr->spool_fd = spool_fd; jcr->spool_attributes = true; } else { - Jmsg(jcr, M_ERROR, 0, "open data spool file %s failed: ERR=%s\n", name, strerror(errno)); + Jmsg(jcr, M_ERROR, 0, _("Open data spool file %s failed: ERR=%s\n"), name, strerror(errno)); free_pool_memory(name); - return 0; - } - Dmsg1(100, "Created spool file: %s\n", name); - free_pool_memory(name); - return 1; + return false; + } + Dmsg1(100, "Created spool file: %s\n", name); + free_pool_memory(name); + return true; } -static int close_data_spool_file(JCR *jcr) +static bool close_data_spool_file(JCR *jcr) { - POOLMEM *name = get_pool_memory(PM_MESSAGE); - - make_unique_data_spool_filename(jcr, &name); - close(jcr->dcr->spool_fd); - jcr->dcr->spool_fd = -1; - jcr->dcr->spooling = false; - unlink(name); - Dmsg1(100, "Deleted spool file: %s\n", name); - free_pool_memory(name); - return 1; + POOLMEM *name = get_pool_memory(PM_MESSAGE); + + P(mutex); + spool_stats.data_jobs--; + spool_stats.total_data_jobs++; + if (spool_stats.data_size < jcr->dcr->spool_size) { + spool_stats.data_size = 0; + } else { + spool_stats.data_size -= jcr->dcr->spool_size; + } + jcr->dcr->spool_size = 0; + V(mutex); + + make_unique_data_spool_filename(jcr, &name); + close(jcr->dcr->spool_fd); + jcr->dcr->spool_fd = -1; + jcr->dcr->spooling = false; + unlink(name); + Dmsg1(100, "Deleted spool file: %s\n", name); + free_pool_memory(name); + return true; } -static bool despool_data(DCR *dcr) +static const char *spool_name = "*spool*"; + +static bool despool_data(DCR *dcr, bool commit) { DEVICE *rdev; DCR *rdcr; @@ -139,23 +194,36 @@ static bool despool_data(DCR *dcr) DEV_BLOCK *block; JCR *jcr = dcr->jcr; int stat; + char ec1[50]; Dmsg0(100, "Despooling data\n"); + Jmsg(jcr, M_INFO, 0, _("%s spooled data to Volume. Despooling %s bytes ...\n"), + commit?"Committing":"Writting", + edit_uint64_with_commas(jcr->dcr->dev->spool_size, ec1)); dcr->spooling = false; lock_device(dcr->dev); dcr->dev_locked = true; - /* Set up a dev structure to read */ + + /* + * This is really quite kludgy and should be fixed some time. + * We create a dev structure to read from the spool file + * in rdev and rdcr. + */ rdev = (DEVICE *)malloc(sizeof(DEVICE)); memset(rdev, 0, sizeof(DEVICE)); - rdev->dev_name = get_memory(strlen("spool")+1); - strcpy(rdev->dev_name, "spool"); + rdev->dev_name = get_memory(strlen(spool_name)+1); + strcpy(rdev->dev_name, spool_name); rdev->errmsg = get_pool_memory(PM_EMSG); *rdev->errmsg = 0; + rdev->max_block_size = dcr->dev->max_block_size; + rdev->min_block_size = dcr->dev->min_block_size; rdev->device = dcr->dev->device; rdcr = new_dcr(NULL, rdev); rdcr->spool_fd = dcr->spool_fd; rdcr->jcr = jcr; /* set a valid jcr */ block = rdcr->block; + + Dmsg1(800, "read/write block size = %d\n", block->buf_len); lseek(rdcr->spool_fd, 0, SEEK_SET); /* rewind */ for ( ; ok; ) { @@ -176,20 +244,29 @@ static bool despool_data(DCR *dcr) lseek(rdcr->spool_fd, 0, SEEK_SET); /* rewind */ if (ftruncate(rdcr->spool_fd, 0) != 0) { + Jmsg(dcr->jcr, M_FATAL, 0, _("Ftruncate spool file error. ERR=%s\n"), + strerror(errno)); Dmsg1(000, "Bad return from ftruncate. ERR=%s\n", strerror(errno)); ok = false; } + P(mutex); + if (spool_stats.data_size < dcr->spool_size) { + spool_stats.data_size = 0; + } else { + spool_stats.data_size -= dcr->spool_size; + } + V(mutex); P(dcr->dev->spool_mutex); dcr->dev->spool_size -= dcr->spool_size; dcr->spool_size = 0; /* zap size in input dcr */ V(dcr->dev->spool_mutex); - free_memory(rdev->dev_name); free_pool_memory(rdev->errmsg); - free(rdev); + /* Be careful to NULL the jcr and free rdev after free_dcr() */ rdcr->jcr = NULL; free_dcr(rdcr); + free(rdev); unlock_device(dcr->dev); dcr->dev_locked = false; dcr->spooling = true; /* turn on spooling again */ @@ -216,23 +293,23 @@ static int read_block_from_spool_file(DCR *dcr, DEV_BLOCK *block) return RB_EOT; } else if (stat != (ssize_t)rlen) { if (stat == -1) { - Jmsg(dcr->jcr, M_FATAL, 0, "Spool read error. ERR=%s\n", strerror(errno)); + Jmsg(dcr->jcr, M_FATAL, 0, _("Spool header read error. ERR=%s\n"), strerror(errno)); } else { Dmsg2(000, "Spool read error. Wanted %u bytes, got %u\n", rlen, stat); - Jmsg2(dcr->jcr, M_FATAL, 0, "Spool read error. Wanted %u bytes, got %u\n", rlen, stat); + Jmsg2(dcr->jcr, M_FATAL, 0, _("Spool header read error. Wanted %u bytes, got %u\n"), rlen, stat); } return RB_ERROR; } rlen = hdr.len; if (rlen > block->buf_len) { Dmsg2(000, "Spool block too big. Max %u bytes, got %u\n", block->buf_len, rlen); - Jmsg2(dcr->jcr, M_FATAL, 0, "Spool block too big. Max %u bytes, got %u\n", block->buf_len, rlen); + Jmsg2(dcr->jcr, M_FATAL, 0, _("Spool block too big. Max %u bytes, got %u\n"), block->buf_len, rlen); return RB_ERROR; } stat = read(dcr->spool_fd, (char *)block->buf, (size_t)rlen); if (stat != (ssize_t)rlen) { - Dmsg2(000, "Spool read error. Wanted %u bytes, got %u\n", rlen, stat); - Jmsg2(dcr->jcr, M_FATAL, 0, "Spool read error. Wanted %u bytes, got %u\n", rlen, stat); + Dmsg2(000, "Spool data read error. Wanted %u bytes, got %u\n", rlen, stat); + Jmsg2(dcr->jcr, M_FATAL, 0, _("Spool data read error. Wanted %u bytes, got %u\n"), rlen, stat); return RB_ERROR; } /* Setup write pointers */ @@ -254,19 +331,15 @@ static int read_block_from_spool_file(DCR *dcr, DEV_BLOCK *block) */ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block) { - ssize_t stat = 0; uint32_t wlen, hlen; /* length to write */ - int retry = 0; - spool_hdr hdr; bool despool = false; ASSERT(block->binbuf == ((uint32_t) (block->bufp - block->buf))); if (block->binbuf <= WRITE_BLKHDR_LENGTH) { /* Does block have data in it? */ - Dmsg0(100, "return write_block_to_dev no data to write\n"); return true; } - hlen = sizeof(hdr); + hlen = sizeof(spool_hdr); wlen = block->binbuf; P(dcr->dev->spool_mutex); dcr->spool_size += hlen + wlen; @@ -276,7 +349,14 @@ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block) despool = true; } V(dcr->dev->spool_mutex); + P(mutex); + spool_stats.data_size += hlen + wlen; + if (spool_stats.data_size > spool_stats.max_data_size) { + spool_stats.max_data_size = spool_stats.data_size; + } + V(mutex); if (despool) { +#ifdef xDEBUG char ec1[30], ec2[30], ec3[30], ec4[30]; Dmsg4(100, "Despool in write_block_to_spool_file max_size=%s size=%s " "max_job_size=%s job_size=%s\n", @@ -284,57 +364,100 @@ bool write_block_to_spool_file(DCR *dcr, DEV_BLOCK *block) edit_uint64_with_commas(dcr->spool_size, ec2), edit_uint64_with_commas(dcr->dev->max_spool_size, ec3), edit_uint64_with_commas(dcr->dev->spool_size, ec4)); - despool = false; - if (!despool_data(dcr)) { +#endif + Jmsg(dcr->jcr, M_INFO, 0, _("User specified spool size reached.\n")); + if (!despool_data(dcr, false)) { Dmsg0(000, "Bad return from despool in write_block.\n"); return false; } + /* Despooling cleared these variables so reset them */ P(dcr->dev->spool_mutex); dcr->spool_size += hlen + wlen; dcr->dev->spool_size += hlen + wlen; V(dcr->dev->spool_mutex); + Jmsg(dcr->jcr, M_INFO, 0, _("Spooling data again ...\n")); } + + if (!write_spool_header(dcr, block)) { + return false; + } + if (!write_spool_data(dcr, block)) { + return false; + } + + Dmsg2(100, "Wrote block FI=%d LI=%d\n", block->FirstIndex, block->LastIndex); + empty_block(block); + return true; +} + +static bool write_spool_header(DCR *dcr, DEV_BLOCK *block) +{ + spool_hdr hdr; + ssize_t stat; + hdr.FirstIndex = block->FirstIndex; hdr.LastIndex = block->LastIndex; hdr.len = block->binbuf; /* Write header */ - for ( ;; ) { - stat = write(dcr->spool_fd, (char*)&hdr, (size_t)hlen); - if (stat != (ssize_t)hlen) { - if (!despool_data(dcr)) { - return false; + for (int retry=0; retry<=1; retry++) { + stat = write(dcr->spool_fd, (char*)&hdr, sizeof(hdr)); + if (stat == -1) { + Jmsg(dcr->jcr, M_INFO, 0, _("Error writing header to spool file. ERR=%s\n"), strerror(errno)); + } + if (stat != (ssize_t)sizeof(hdr)) { + /* If we wrote something, truncate it, then despool */ + if (stat != -1) { + ftruncate(dcr->spool_fd, lseek(dcr->spool_fd, (off_t)0, SEEK_CUR) - stat); } - if (retry++ > 1) { + if (!despool_data(dcr, false)) { + Jmsg(dcr->jcr, M_FATAL, 0, _("Fatal despooling error.")); return false; } - continue; + continue; /* try again */ } - break; + return true; } + Jmsg(dcr->jcr, M_FATAL, 0, _("Retrying after header spooling error failed.\n")); + return false; +} + +static bool write_spool_data(DCR *dcr, DEV_BLOCK *block) +{ + ssize_t stat; /* Write data */ - for ( ;; ) { - stat = write(dcr->spool_fd, block->buf, (size_t)wlen); - if (stat != (ssize_t)wlen) { - if (!despool_data(dcr)) { + for (int retry=0; retry<=1; retry++) { + stat = write(dcr->spool_fd, block->buf, (size_t)block->binbuf); + if (stat == -1) { + Jmsg(dcr->jcr, M_INFO, 0, _("Error writing data to spool file. ERR=%s\n"), strerror(errno)); + } + if (stat != (ssize_t)block->binbuf) { + /* + * If we wrote something, truncate it and the header, then despool + */ + if (stat != -1) { + ftruncate(dcr->spool_fd, lseek(dcr->spool_fd, (off_t)0, SEEK_CUR) + - stat - sizeof(spool_hdr)); + } + if (!despool_data(dcr, false)) { + Jmsg(dcr->jcr, M_FATAL, 0, _("Fatal despooling error.")); return false; } - if (retry++ > 1) { + if (!write_spool_header(dcr, block)) { return false; } - continue; + continue; /* try again */ } - break; + return true; } - Dmsg2(100, "Wrote block FI=%d LI=%d\n", block->FirstIndex, block->LastIndex); - - empty_block(block); - return true; + Jmsg(dcr->jcr, M_FATAL, 0, _("Retrying after data spooling error failed.\n")); + return false; } + bool are_attributes_spooled(JCR *jcr) { return jcr->spool_attributes && jcr->dir_bsock->spool_fd; @@ -350,7 +473,7 @@ bool are_attributes_spooled(JCR *jcr) bool begin_attribute_spool(JCR *jcr) { if (!jcr->no_attributes && jcr->spool_attributes) { - return open_spool_file(jcr, jcr->dir_bsock); + return open_attr_spool_file(jcr, jcr->dir_bsock); } return true; } @@ -358,50 +481,90 @@ bool begin_attribute_spool(JCR *jcr) bool discard_attribute_spool(JCR *jcr) { if (are_attributes_spooled(jcr)) { - return close_spool_file(jcr, jcr->dir_bsock); + return close_attr_spool_file(jcr, jcr->dir_bsock); } return true; } +static void update_attr_spool_size(ssize_t size) +{ + P(mutex); + if (size > 0) { + if ((spool_stats.attr_size - size) > 0) { + spool_stats.attr_size -= size; + } else { + spool_stats.attr_size = 0; + } + } + V(mutex); +} + bool commit_attribute_spool(JCR *jcr) { + ssize_t size; + char ec1[30]; + if (are_attributes_spooled(jcr)) { - bnet_despool_to_bsock(jcr->dir_bsock); - return close_spool_file(jcr, jcr->dir_bsock); + fseek(jcr->dir_bsock->spool_fd, 0, SEEK_END); + size = ftell(jcr->dir_bsock->spool_fd); + P(mutex); + if (size > 0) { + if (spool_stats.attr_size + size > spool_stats.max_attr_size) { + spool_stats.max_attr_size = spool_stats.attr_size + size; + } + } + spool_stats.attr_size += size; + V(mutex); + Jmsg(jcr, M_INFO, 0, _("Sending spooled attrs to DIR. Despooling %s bytes ...\n"), + edit_uint64_with_commas(size, ec1)); + bnet_despool_to_bsock(jcr->dir_bsock, update_attr_spool_size, size); + return close_attr_spool_file(jcr, jcr->dir_bsock); } return true; } static void make_unique_spool_filename(JCR *jcr, POOLMEM **name, int fd) { - Mmsg(name, "%s/%s.spool.%s.%d", working_directory, my_name, + Mmsg(name, "%s/%s.attr.spool.%s.%d", working_directory, my_name, jcr->Job, fd); } -bool open_spool_file(JCR *jcr, BSOCK *bs) + +bool open_attr_spool_file(JCR *jcr, BSOCK *bs) { - POOLMEM *name = get_pool_memory(PM_MESSAGE); - - make_unique_spool_filename(jcr, &name, bs->fd); - bs->spool_fd = fopen(mp_chr(name), "w+"); - if (!bs->spool_fd) { - Jmsg(jcr, M_ERROR, 0, "fopen spool file %s failed: ERR=%s\n", name, strerror(errno)); - free_pool_memory(name); - return false; - } - free_pool_memory(name); - return true; + POOLMEM *name = get_pool_memory(PM_MESSAGE); + + make_unique_spool_filename(jcr, &name, bs->fd); + bs->spool_fd = fopen(mp_chr(name), "w+"); + if (!bs->spool_fd) { + Jmsg(jcr, M_ERROR, 0, _("fopen attr spool file %s failed: ERR=%s\n"), name, strerror(errno)); + free_pool_memory(name); + return false; + } + P(mutex); + spool_stats.attr_jobs++; + V(mutex); + free_pool_memory(name); + return true; } -bool close_spool_file(JCR *jcr, BSOCK *bs) +bool close_attr_spool_file(JCR *jcr, BSOCK *bs) { - POOLMEM *name = get_pool_memory(PM_MESSAGE); - - make_unique_spool_filename(jcr, &name, bs->fd); - fclose(bs->spool_fd); - unlink(mp_chr(name)); - free_pool_memory(name); - bs->spool_fd = NULL; - bs->spool = false; - return true; + POOLMEM *name; + + if (!bs->spool_fd) { + return true; + } + name = get_pool_memory(PM_MESSAGE); + P(mutex); + spool_stats.attr_jobs--; + spool_stats.total_attr_jobs++; + V(mutex); + make_unique_spool_filename(jcr, &name, bs->fd); + fclose(bs->spool_fd); + unlink(mp_chr(name)); + free_pool_memory(name); + bs->spool_fd = NULL; + bs->spool = false; + return true; }