RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-01-04 05:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

light: make LOGDELETE_AUTO runtime configurable

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2012-08-14 16:38:10 +02:00 committed by Thomas Schoebel-Theuer
parent ebeaa7c7c0
commit 74f9a8fd85
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sy_old/mars_light.c
View File

@ -927,7 +927,7 @@ int run_bone(struct mars_peerinfo *peer, struct mars_dent *remote_dent)
struct mars_dent *local_dent = mars_find_dent(peer->global, remote_dent->d_path); struct mars_dent *local_dent = mars_find_dent(peer->global, remote_dent->d_path);
if (unlikely(!parent)) { if (unlikely(!parent)) {
MARS_IO("ignoring non-existing local resource '%s'\n", parent_path); MARS_IO("ignoring non-existing local resource '%s'\n", parent_path);
#if defined(CONFIG_MARS_LOGDELETE_AUTO) && CONFIG_MARS_LOGDELETE_AUTO > 0 #if defined(CONFIG_MARS_LOGDELETE_AUTO)
// don't copy old / outdated logfiles // don't copy old / outdated logfiles
} else if (parent->d_private && } else if (parent->d_private &&
((struct mars_rotate *)parent->d_private)->relevant_serial > remote_dent->d_serial) { ((struct mars_rotate *)parent->d_private)->relevant_serial > remote_dent->d_serial) {
@ -2430,9 +2430,9 @@ int make_log_finalize(struct mars_global *global, struct mars_dent *dent)
if (!copy_brick) if (!copy_brick)
rot->copy_serial = 0; rot->copy_serial = 0;
#if defined(CONFIG_MARS_LOGDELETE_AUTO) && CONFIG_MARS_LOGDELETE_AUTO > 0 #if defined(CONFIG_MARS_LOGDELETE_AUTO)
#define LIMIT1 ((loff_t)EXHAUSTED_LIMIT(rot->total_space)) #define LIMIT1 ((loff_t)EXHAUSTED_LIMIT(rot->total_space))
#define LIMIT2 ((loff_t)CONFIG_MARS_LOGDELETE_AUTO * 1024 * 1024) #define LIMIT2 ((loff_t)global_logdel_auto * 1024 * 1024)
if (rot->remaining_space <= LIMIT1 + LIMIT2) { if (rot->remaining_space <= LIMIT1 + LIMIT2) {
MARS_WRN("filesystem space = %lld kiB is lower than %lld + %lld = %lld\n", rot->remaining_space, LIMIT1, LIMIT2, LIMIT1 + LIMIT2); MARS_WRN("filesystem space = %lld kiB is lower than %lld + %lld = %lld\n", rot->remaining_space, LIMIT1, LIMIT2, LIMIT1 + LIMIT2);
if (rot->first_log && rot->first_log != rot->relevant_log) { if (rot->first_log && rot->first_log != rot->relevant_log) {
@ -3920,6 +3920,9 @@ static void __exit exit_light(void)
int global_logrot_auto = CONFIG_MARS_LOGROT_AUTO; int global_logrot_auto = CONFIG_MARS_LOGROT_AUTO;
EXPORT_SYMBOL_GPL(global_logrot_auto); EXPORT_SYMBOL_GPL(global_logrot_auto);
int global_logdel_auto = CONFIG_MARS_LOGDELETE_AUTO;
EXPORT_SYMBOL_GPL(global_logdel_auto);
int global_free_space = CONFIG_MARS_MIN_SPACE_BASE; int global_free_space = CONFIG_MARS_MIN_SPACE_BASE;
EXPORT_SYMBOL_GPL(global_free_space); EXPORT_SYMBOL_GPL(global_free_space);

11
sy_old/mars_proc.c
View File

@ -183,13 +183,22 @@ ctl_table mars_table[] = {
}, },
{ {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
.procname = "logrot_auto", .procname = "logrot_auto_gb",
.data = &global_logrot_auto, .data = &global_logrot_auto,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0600, .mode = 0600,
.proc_handler = &proc_dointvec, .proc_handler = &proc_dointvec,
.strategy = &sysctl_intvec, .strategy = &sysctl_intvec,
}, },
{
.ctl_name = CTL_UNNUMBERED,
.procname = "logdel_auto_gb",
.data = &global_logdel_auto,
.maxlen = sizeof(int),
.mode = 0600,
.proc_handler = &proc_dointvec,
.strategy = &sysctl_intvec,
},
{ {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
.procname = "free_space_mb", .procname = "free_space_mb",

1
sy_old/strategy.h
View File

@ -11,6 +11,7 @@
#define MARS_PATH_MAX 256 #define MARS_PATH_MAX 256
extern int global_logrot_auto; extern int global_logrot_auto;
extern int global_logdel_auto;
extern int global_free_space; extern int global_free_space;
extern char *my_id(void); extern char *my_id(void);