shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Tweaks

Browse Source
This commit is contained in:
Alasdair Kergon 2002-05-07 12:47:11 +00:00
parent fc7a62f325
commit 5be981bab5
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/format_text/archive.c
View File

@ -23,7 +23,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <time.h> #include <time.h>
#define SECS_PER_DAY 86400 #define SECS_PER_DAY 86400 /* 24*60*60 */
/* /*
* The format instance is given a directory path upon creation. * The format instance is given a directory path upon creation.
@ -137,6 +137,7 @@ static struct list *_scan_archive(struct pool *mem,
list_init(results); list_init(results);
/* Sort fails beyond 5-digit indexes */
if ((count = scandir(dir, &dirent, NULL, alphasort)) < 0) { if ((count = scandir(dir, &dirent, NULL, alphasort)) < 0) {
log_err("Couldn't scan archive directory."); log_err("Couldn't scan archive directory.");
return 0; return 0;
@ -148,8 +149,8 @@ static struct list *_scan_archive(struct pool *mem,
continue; continue;
/* check the name is the correct format */ /* check the name is the correct format */
if (!_split_vg(dirent[i]->d_name, vg_name, if (!_split_vg(dirent[i]->d_name, vg_name, sizeof(vg_name),
sizeof(vg_name), &index)) &index))
continue; continue;
/* is it the vg we're interested in ? */ /* is it the vg we're interested in ? */
@ -187,50 +188,42 @@ static struct list *_scan_archive(struct pool *mem,
return results; return results;
} }
/* Gets rid of those expired archive files! */ static void _remove_expired(struct list *archives, uint32_t archives_size,
void _remove_expired(struct list *archives, uint32_t retain_days, uint32_t retain_days, uint32_t min_archive)
uint32_t min_archive)
{ {
struct list *bh; struct list *bh;
struct archive_file *bf; struct archive_file *bf;
struct stat sb; struct stat sb;
uint32_t size; time_t retain_time;
time_t retain_secs;
/* Add one to the list size because we've just created a new archive
file before calling this. FIXME: Can we really assume this? */
size = list_size(archives) + 1;
/* Make sure there are enough archives to even bother looking for /* Make sure there are enough archives to even bother looking for
* expired ones... */ * expired ones... */
if(size > min_archive) { if (archives_size <= min_archive)
return;
/* Calculate now minus the retain_days (in seconds) since /* Convert retain_days into the time after which we must retain */
the epoch */ retain_time = time(NULL) - (time_t) retain_days * SECS_PER_DAY;
retain_secs = time(NULL) - (time_t) retain_days * SECS_PER_DAY;
list_iterate(bh, archives) { /* Assume list is ordered oldest first (by index) */
list_iterate(bh, archives) {
bf = list_item(bh, struct archive_file);
bf = list_item(bh, struct archive_file); /* Get the mtime of the file and unlink if too old */
if (stat(bf->path, &sb)) {
/* Get the mtime of the file and unlink if too old */ log_sys_error("stat", bf->path);
if(stat(bf->path, &sb)) { continue;
log_sys_error("stat", bf->path);
break;
}
if(sb.st_mtime < retain_secs) {
if(unlink(bf->path))
log_sys_error("unlink", bf->path);
size--;
/* Don't delete any more if we've reached the
* minimum */
if(size <= min_archive)
break;
}
} }
if (sb.st_mtime > retain_time)
return;
log_very_verbose("Expiring archive %s", bf->path);
if (unlink(bf->path))
log_sys_error("unlink", bf->path);
/* Don't delete any more if we've reached the minimum */
if (--archives_size <= min_archive)
return;
} }
} }
@ -238,7 +231,7 @@ int archive_vg(struct volume_group *vg,
const char *dir, const char *desc, const char *dir, const char *desc,
uint32_t retain_days, uint32_t min_archive) uint32_t retain_days, uint32_t min_archive)
{ {
int i, fd; int i, fd, renamed = 0;
unsigned int index = 0; unsigned int index = 0;
struct archive_file *last; struct archive_file *last;
FILE *fp = NULL; FILE *fp = NULL;
@ -277,7 +270,6 @@ int archive_vg(struct volume_group *vg,
if (list_empty(archives)) if (list_empty(archives))
index = 0; index = 0;
else { else {
last = list_item(archives->p, struct archive_file); last = list_item(archives->p, struct archive_file);
index = last->index + 1; index = last->index + 1;
@ -286,18 +278,21 @@ int archive_vg(struct volume_group *vg,
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
if (lvm_snprintf(archive_name, sizeof(archive_name), if (lvm_snprintf(archive_name, sizeof(archive_name),
"%s/%s_%05d.vg", dir, vg->name, index) < 0) { "%s/%s_%05d.vg", dir, vg->name, index) < 0) {
log_err("archive file name too long."); log_error("Archive file name too long.");
return 0; return 0;
} }
if (lvm_rename(temp_file, archive_name)) if ((renamed = lvm_rename(temp_file, archive_name)))
break; break;
index++; index++;
} }
/* Now remove expired files */ if (!renamed)
_remove_expired(archives, retain_days, min_archive); log_error("Archive rename failed for %s", temp_file);
_remove_expired(archives, list_size(archives) + renamed, retain_days,
min_archive);
return 1; return 1;
} }