Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

logging: Respect log-size-max immediately after open #468

Merged
merged 1 commit into from
Dec 15, 2023
Merged

logging: Respect log-size-max immediately after open #468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/ctr_logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "cli.h"
#include "config.h"
#include <string.h>
#include <sys/stat.h>

// if the systemd development files were found, we can log to systemd
#ifdef USE_JOURNALD
Expand Down Expand Up @@ -40,6 +41,8 @@ static int64_t log_global_size_max = -1;
/* k8s log file parameters */
static int k8s_log_fd = -1;
static char *k8s_log_path = NULL;
static int64_t k8s_bytes_written;
static int64_t k8s_total_bytes_written;

/* journald log file parameters */
// short ID length
Expand Down Expand Up @@ -114,6 +117,15 @@ void configure_log_drivers(gchar **log_drivers, int64_t log_size_max_, int64_t l
if (k8s_log_fd < 0)
pexit("Failed to open log file");

struct stat statbuf;
if (fstat(k8s_log_fd, &statbuf) == 0) {
k8s_bytes_written = statbuf.st_size;
} else {
nwarnf("Could not stat log file %s, assuming 0 size", k8s_log_path);
k8s_bytes_written = 0;
}
k8s_total_bytes_written = k8s_bytes_written;
haircommander marked this conversation as resolved.
Show resolved Hide resolved

if (!use_journald_logging && tag)
nexit("k8s-file doesn't support --log-tag");
}
Expand Down Expand Up @@ -336,9 +348,7 @@ static int write_journald(int pipe, char *buf, ssize_t buflen)
static int write_k8s_log(stdpipe_t pipe, const char *buf, ssize_t buflen)
{
writev_buffer_t bufv = {0};
static int64_t bytes_written = 0;
int64_t bytes_to_be_written = 0;
static int64_t total_bytes_written = 0;

/*
* Use the same timestamp for every line of the log in this buffer.
Expand All @@ -363,17 +373,15 @@ static int write_k8s_log(stdpipe_t pipe, const char *buf, ssize_t buflen)
}

/* If the caller specified a global max, enforce it before writing */
if (log_global_size_max > 0 && total_bytes_written >= log_global_size_max)
if (log_global_size_max > 0 && k8s_total_bytes_written >= log_global_size_max)
break;

/*
* We re-open the log file if writing out the bytes will exceed the max
* log size. We also reset the state so that the new file is started with
* a timestamp.
*/
if ((log_size_max > 0) && (bytes_written + bytes_to_be_written) > log_size_max) {
bytes_written = 0;

if ((log_size_max > 0) && (k8s_bytes_written + bytes_to_be_written) > log_size_max) {
if (writev_buffer_flush(k8s_log_fd, &bufv) < 0) {
nwarn("failed to flush buffer to log");
/*
Expand Down Expand Up @@ -418,8 +426,8 @@ static int write_k8s_log(stdpipe_t pipe, const char *buf, ssize_t buflen)
}
}

bytes_written += bytes_to_be_written;
total_bytes_written += bytes_to_be_written;
k8s_bytes_written += bytes_to_be_written;
k8s_total_bytes_written += bytes_to_be_written;
next:
/* Update the head of the buffer remaining to output. */
buf += line_len;
Expand Down Expand Up @@ -606,6 +614,9 @@ static void reopen_k8s_file(void)
/* Close the current k8s_log_fd */
close(k8s_log_fd);

/* Open with O_TRUNC: reset bytes written */
k8s_bytes_written = 0;
haircommander marked this conversation as resolved.
Show resolved Hide resolved

/* Open the log path file again */
k8s_log_fd = open(k8s_log_path_tmp, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0600);
if (k8s_log_fd < 0)
Expand Down
Loading