#include "rrd.h"
#include "rrd_client.h"
+#include "rrd_tool.h"
#include <stdlib.h>
#include <string.h>
#include <sys/un.h>
#include <netdb.h>
+#ifndef ENODATA
+#define ENODATA ENOENT
+#endif
+
+struct rrdc_response_s
+{
+ int status;
+ char *message;
+ char **lines;
+ size_t lines_num;
+};
+typedef struct rrdc_response_s rrdc_response_t;
+
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static int sd = -1;
+static char *sd_path = NULL; /* cache the path for sd */
+static void _disconnect(void);
static ssize_t sread (void *buffer_void, size_t buffer_size) /* {{{ */
{
if (status == 0)
{
- close (sd);
- sd = -1;
+ _disconnect();
errno = EPROTO;
return (-1);
}
assert ((0 > status) || (buffer_free >= (size_t) status));
- buffer_free = buffer_free - status;
- buffer_used = buffer_used + status;
+ buffer_free -= status;
+ buffer_used += status;
if (buffer[buffer_used - 1] == '\n')
break;
return (-1);
}
- buffer[buffer_used - 1] = 0;
+ buffer[buffer_used - 1] = '\0';
return (buffer_used);
} /* }}} ssize_t sread */
if (status < 0)
{
- close (sd);
- sd = -1;
+ _disconnect();
+ rrd_set_error("lost connection to rrdcached");
return (status);
}
- nleft = nleft - status;
- ptr = ptr + status;
+ nleft -= status;
+ ptr += status;
}
return (0);
return (buffer_add_string (temp, buffer_ret, buffer_size_ret));
} /* }}} int buffer_add_value */
-static int rrdc_connect_unix (const char *path) /* {{{ */
+static int response_parse (char *buffer, size_t buffer_size, /* {{{ */
+ rrdc_response_t **ret_response)
{
- struct sockaddr_un sa;
- int status;
+ rrdc_response_t *ret;
- assert (path != NULL);
+ char *dummy;
+ char *saveptr;
- pthread_mutex_lock (&lock);
+ char *line_ptr;
+ size_t line_counter;
- if (sd >= 0)
+ if (buffer == NULL)
+ return (EINVAL);
+ if (buffer_size <= 0)
+ return (EINVAL);
+
+ if (buffer[buffer_size - 1] != 0)
+ return (-1);
+
+ ret = (rrdc_response_t *) malloc (sizeof (rrdc_response_t));
+ if (ret == NULL)
+ return (ENOMEM);
+ memset (ret, 0, sizeof (*ret));
+
+ line_counter = 0;
+
+ dummy = buffer;
+ saveptr = NULL;
+ while ((line_ptr = strtok_r (dummy, "\r\n", &saveptr)) != NULL)
{
- pthread_mutex_unlock (&lock);
- return (0);
+ dummy = NULL;
+
+ if (ret->message == NULL)
+ {
+ ret->status = strtol (buffer, &ret->message, 0);
+ if (buffer == ret->message)
+ {
+ free (ret);
+ return (EPROTO);
+ }
+
+ /* Skip leading whitespace of the status message */
+ ret->message += strspn (ret->message, " \t");
+
+ if (ret->status > 0)
+ {
+ ret->lines = (char **) malloc (sizeof (char *) * ret->status);
+ if (ret->lines == NULL)
+ {
+ free (ret);
+ return (ENOMEM);
+ }
+ memset (ret->lines, 0, sizeof (char *) * ret->status);
+ ret->lines_num = (size_t) ret->status;
+ }
+ else
+ {
+ ret->lines = NULL;
+ ret->lines_num = 0;
+ }
+ }
+ else /* if (ret->message != NULL) */
+ {
+ if (line_counter < ret->lines_num)
+ ret->lines[line_counter] = line_ptr;
+ line_counter++;
+ }
+ } /* while (strtok_r) */
+
+ if (ret->lines_num != line_counter)
+ {
+ errno = EPROTO;
+ if (ret->lines != NULL)
+ free (ret->lines);
+ free (ret);
+ return (-1);
+ }
+
+ *ret_response = ret;
+ return (0);
+} /* }}} int response_parse */
+
+static void response_free (rrdc_response_t *res) /* {{{ */
+{
+ if (res == NULL)
+ return;
+
+ if (res->lines != NULL)
+ {
+ res->lines_num = 0;
+ free (res->lines);
+ res->lines = NULL;
}
+ free (res);
+} /* }}} void response_free */
+
+
+/* determine whether we are connected to the specified daemon_addr if
+ * NULL, return whether we are connected at all
+ */
+int rrdc_is_connected(const char *daemon_addr) /* {{{ */
+{
+ if (sd < 0)
+ return 0;
+ else if (daemon_addr == NULL)
+ {
+ /* here we have to handle the case i.e.
+ * UPDATE --daemon ...; UPDATEV (no --daemon) ...
+ * In other words: we have a cached connection,
+ * but it is not specified in the current command.
+ * Daemon is only implied in this case if set in ENV
+ */
+ if (getenv(ENV_RRDCACHED_ADDRESS) != NULL)
+ return 1;
+ else
+ return 0;
+ }
+ else if (strcmp(daemon_addr, sd_path) == 0)
+ return 1;
+ else
+ return 0;
+
+} /* }}} int rrdc_is_connected */
+
+static int rrdc_connect_unix (const char *path) /* {{{ */
+{
+ struct sockaddr_un sa;
+ int status;
+
+ assert (path != NULL);
+ assert (sd == -1);
+
sd = socket (PF_UNIX, SOCK_STREAM, /* protocol = */ 0);
if (sd < 0)
{
status = errno;
- pthread_mutex_unlock (&lock);
return (status);
}
if (status != 0)
{
status = errno;
- pthread_mutex_unlock (&lock);
return (status);
}
- pthread_mutex_unlock (&lock);
-
return (0);
} /* }}} int rrdc_connect_unix */
-int rrdc_connect (const char *addr) /* {{{ */
+static int rrdc_connect_network (const char *addr) /* {{{ */
{
struct addrinfo ai_hints;
struct addrinfo *ai_res;
struct addrinfo *ai_ptr;
- int status;
-
- if (addr == NULL)
- addr = RRDCACHED_DEFAULT_ADDRESS;
- if (strncmp ("unix:", addr, strlen ("unix:")) == 0)
- return (rrdc_connect_unix (addr + strlen ("unix:")));
- else if (addr[0] == '/')
- return (rrdc_connect_unix (addr));
-
- pthread_mutex_lock (&lock);
-
- if (sd >= 0)
- {
- pthread_mutex_unlock (&lock);
- return (0);
- }
+ assert (addr != NULL);
+ assert (sd == -1);
+ int status;
memset (&ai_hints, 0, sizeof (ai_hints));
ai_hints.ai_flags = 0;
#ifdef AI_ADDRCONFIG
ai_res = NULL;
status = getaddrinfo (addr, RRDCACHED_DEFAULT_PORT, &ai_hints, &ai_res);
if (status != 0)
- {
- pthread_mutex_unlock (&lock);
return (status);
- }
for (ai_ptr = ai_res; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
if (status != 0)
{
status = errno;
- close (sd);
- sd = -1;
+ _disconnect();
continue;
}
assert (status == 0);
break;
} /* for (ai_ptr) */
- pthread_mutex_unlock (&lock);
return (status);
-} /* }}} int rrdc_connect */
+} /* }}} int rrdc_connect_network */
-int rrdc_disconnect (void) /* {{{ */
+int rrdc_connect (const char *addr) /* {{{ */
{
- pthread_mutex_lock (&lock);
+ int status = 0;
- if (sd < 0)
+ if (addr == NULL)
+ addr = getenv (ENV_RRDCACHED_ADDRESS);
+
+ if (addr == NULL)
+ return 0;
+
+ pthread_mutex_lock(&lock);
+
+ if (sd >= 0 && sd_path != NULL && strcmp(addr, sd_path) == 0)
{
+ /* connection to the same daemon; use cached connection */
pthread_mutex_unlock (&lock);
return (0);
}
+ else
+ {
+ _disconnect();
+ }
+
+ if (strncmp ("unix:", addr, strlen ("unix:")) == 0)
+ status = rrdc_connect_unix (addr + strlen ("unix:"));
+ else if (addr[0] == '/')
+ status = rrdc_connect_unix (addr);
+ else
+ status = rrdc_connect_network(addr);
+
+ if (status == 0 && sd >= 0)
+ sd_path = strdup(addr);
+ else
+ rrd_set_error("Unable to connect to rrdcached: %s",
+ (status < 0)
+ ? "Internal error"
+ : rrd_strerror (status));
+
+ pthread_mutex_unlock (&lock);
+ return (status);
+} /* }}} int rrdc_connect */
+
+static void _disconnect(void) /* {{{ */
+{
+ if (sd >= 0)
+ close(sd);
+
+ if (sd_path != NULL)
+ free(sd_path);
- close (sd);
sd = -1;
+ sd_path = NULL;
+} /* }}} static void _disconnect(void) */
+
+int rrdc_disconnect (void) /* {{{ */
+{
+ pthread_mutex_lock (&lock);
+
+ _disconnect();
pthread_mutex_unlock (&lock);
return (status);
} /* }}} int rrdc_flush */
+
+
+/* convenience function; if there is a daemon specified, or if we can
+ * detect one from the environment, then flush the file. Otherwise, no-op
+ */
+int rrdc_flush_if_daemon (const char *opt_daemon, const char *filename) /* {{{ */
+{
+ int status = 0;
+
+ rrdc_connect(opt_daemon);
+
+ if (rrdc_is_connected(opt_daemon))
+ {
+ status = rrdc_flush (filename);
+ if (status != 0)
+ {
+ rrd_set_error ("rrdc_flush (%s) failed with status %i.",
+ filename, status);
+ }
+ } /* if (daemon_addr) */
+
+ return status;
+} /* }}} int rrdc_flush_if_daemon */
+
+
+int rrdc_stats_get (rrdc_stats_t **ret_stats) /* {{{ */
+{
+ rrdc_stats_t *head;
+ rrdc_stats_t *tail;
+
+ rrdc_response_t *response;
+
+ char buffer[4096];
+ size_t buffer_size;
+ int status;
+ size_t i;
+
+ pthread_mutex_lock (&lock);
+
+ if (sd < 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (ENOTCONN);
+ }
+
+ /* Protocol example: {{{
+ * -> STATS
+ * <- 5 Statistics follow
+ * <- QueueLength: 0
+ * <- UpdatesWritten: 0
+ * <- DataSetsWritten: 0
+ * <- TreeNodesNumber: 0
+ * <- TreeDepth: 0
+ * }}} */
+ status = swrite ("STATS\n", strlen ("STATS\n"));
+ if (status != 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (status);
+ }
+
+ status = sread (buffer, sizeof (buffer));
+ if (status < 0)
+ {
+ status = errno;
+ pthread_mutex_unlock (&lock);
+ return (status);
+ }
+ else if (status == 0)
+ {
+ pthread_mutex_unlock (&lock);
+ return (ENODATA);
+ }
+
+ pthread_mutex_unlock (&lock);
+
+ /* Assert NULL termination */
+ buffer_size = (size_t) status;
+ if (buffer[buffer_size - 1] != 0)
+ {
+ if (buffer_size < sizeof (buffer))
+ {
+ buffer[buffer_size] = 0;
+ buffer_size++;
+ }
+ else
+ {
+ return (ENOBUFS);
+ }
+ }
+
+ status = response_parse (buffer, buffer_size, &response);
+ if (status != 0)
+ return (status);
+
+ if (response->status <= 0)
+ {
+ response_free (response);
+ return (EIO);
+ }
+
+ head = NULL;
+ tail = NULL;
+ for (i = 0; i < response->lines_num; i++)
+ {
+ char *key;
+ char *value;
+ char *endptr;
+ rrdc_stats_t *s;
+
+ key = response->lines[i];
+ value = strchr (key, ':');
+ if (value == NULL)
+ continue;
+ *value = 0;
+ value++;
+
+ while ((value[0] == ' ') || (value[0] == '\t'))
+ value++;
+
+ s = (rrdc_stats_t *) malloc (sizeof (rrdc_stats_t));
+ if (s == NULL)
+ continue;
+ memset (s, 0, sizeof (*s));
+
+ s->name = strdup (key);
+
+ endptr = NULL;
+ if ((strcmp ("QueueLength", key) == 0)
+ || (strcmp ("TreeNodesNumber", key) == 0)
+ || (strcmp ("TreeDepth", key) == 0))
+ {
+ s->type = RRDC_STATS_TYPE_GAUGE;
+ s->value.gauge = strtod (value, &endptr);
+ }
+ else if ((strcmp ("UpdatesWritten", key) == 0)
+ || (strcmp ("DataSetsWritten", key) == 0))
+ {
+ s->type = RRDC_STATS_TYPE_COUNTER;
+ s->value.counter = (uint64_t) strtoll (value, &endptr, /* base = */ 0);
+ }
+ else
+ {
+ free (s);
+ continue;
+ }
+
+ /* Conversion failed */
+ if (endptr == value)
+ {
+ free (s);
+ continue;
+ }
+
+ if (head == NULL)
+ {
+ head = s;
+ tail = s;
+ s->next = NULL;
+ }
+ else
+ {
+ tail->next = s;
+ tail = s;
+ }
+ } /* for (i = 0; i < response->lines_num; i++) */
+
+ response_free (response);
+
+ if (head == NULL)
+ return (EPROTO);
+
+ *ret_stats = head;
+ return (0);
+} /* }}} int rrdc_stats_get */
+
+void rrdc_stats_free (rrdc_stats_t *ret_stats) /* {{{ */
+{
+ rrdc_stats_t *this;
+
+ this = ret_stats;
+ while (this != NULL)
+ {
+ rrdc_stats_t *next;
+
+ next = this->next;
+
+ if (this->name != NULL)
+ {
+ free (this->name);
+ this->name = NULL;
+ }
+ free (this);
+
+ this = next;
+ } /* while (this != NULL) */
+} /* }}} void rrdc_stats_free */
+
/*
* vim: set sw=2 sts=2 ts=8 et fdm=marker :
*/
*
* Authors:
* Florian octo Forster <octo at verplant.org>
+ * kevin brintnall <kbrint@rufus.net>
**/
-/*
- * First tell the compiler to stick to the C99 and POSIX standards as close as
- * possible.
- */
-#ifndef __STRICT_ANSI__ /* {{{ */
-# define __STRICT_ANSI__
-#endif
-
-#ifndef _ISOC99_SOURCE
-# define _ISOC99_SOURCE
-#endif
-
-#ifdef _POSIX_C_SOURCE
-# undef _POSIX_C_SOURCE
-#endif
-#define _POSIX_C_SOURCE 200112L
-
-/* Single UNIX needed for strdup. */
-#ifdef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
-#endif
-#define _XOPEN_SOURCE 500
-
#ifndef _REENTRANT
# define _REENTRANT
#endif
# define _THREAD_SAFE
#endif
-#ifdef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
/* }}} */
/*
char **values;
int values_num;
time_t last_flush_time;
-#define CI_FLAGS_IN_TREE 0x01
-#define CI_FLAGS_IN_QUEUE 0x02
+#define CI_FLAGS_IN_TREE (1<<0)
+#define CI_FLAGS_IN_QUEUE (1<<1)
int flags;
cache_item_t *next;
};
typedef enum queue_side_e queue_side_t;
+/* max length of socket command or response */
+#define CMD_MAX 4096
+
/*
* Variables
*/
+static int stay_foreground = 0;
+
static listen_socket_t *listen_fds = NULL;
static size_t listen_fds_num = 0;
static pthread_t queue_thread;
-static pthread_t *connetion_threads = NULL;
-static pthread_mutex_t connetion_threads_lock = PTHREAD_MUTEX_INITIALIZER;
-static int connetion_threads_num = 0;
+static pthread_t *connection_threads = NULL;
+static pthread_mutex_t connection_threads_lock = PTHREAD_MUTEX_INITIALIZER;
+static int connection_threads_num = 0;
/* Cache stuff */
static GTree *cache_tree = NULL;
static pthread_cond_t flush_cond = PTHREAD_COND_INITIALIZER;
static int config_write_interval = 300;
+static int config_write_jitter = 0;
static int config_flush_interval = 3600;
static char *config_pid_file = NULL;
static char *config_base_dir = NULL;
static int config_listen_address_list_len = 0;
static uint64_t stats_queue_length = 0;
+static uint64_t stats_updates_received = 0;
+static uint64_t stats_flush_received = 0;
static uint64_t stats_updates_written = 0;
static uint64_t stats_data_sets_written = 0;
+static uint64_t stats_journal_bytes = 0;
+static uint64_t stats_journal_rotate = 0;
static pthread_mutex_t stats_lock = PTHREAD_MUTEX_INITIALIZER;
+/* Journaled updates */
+static char *journal_cur = NULL;
+static char *journal_old = NULL;
+static FILE *journal_fh = NULL;
+static pthread_mutex_t journal_lock = PTHREAD_MUTEX_INITIALIZER;
+static int journal_write(char *cmd, char *args);
+static void journal_done(void);
+static void journal_rotate(void);
+
/*
* Functions
*/
static void sig_int_handler (int s __attribute__((unused))) /* {{{ */
{
+ RRDD_LOG(LOG_NOTICE, "caught SIGINT");
do_shutdown++;
+ pthread_cond_broadcast(&cache_cond);
} /* }}} void sig_int_handler */
static void sig_term_handler (int s __attribute__((unused))) /* {{{ */
{
+ RRDD_LOG(LOG_NOTICE, "caught SIGTERM");
do_shutdown++;
+ pthread_cond_broadcast(&cache_cond);
} /* }}} void sig_term_handler */
static int write_pidfile (void) /* {{{ */
{
pid_t pid;
char *file;
+ int fd;
FILE *fh;
pid = getpid ();
? config_pid_file
: LOCALSTATEDIR "/run/rrdcached.pid";
- fh = fopen (file, "w");
+ fd = open(file, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IRGRP|S_IROTH);
+ if (fd < 0)
+ {
+ RRDD_LOG(LOG_ERR, "FATAL: cannot create '%s' (%s)",
+ file, rrd_strerror(errno));
+ return (-1);
+ }
+
+ fh = fdopen (fd, "w");
if (fh == NULL)
{
RRDD_LOG (LOG_ERR, "write_pidfile: Opening `%s' failed.", file);
+ close(fd);
return (-1);
}
size_t nleft;
ssize_t status;
+ /* special case for journal replay */
+ if (fd < 0) return 0;
+
ptr = (const char *) buf;
nleft = count;
if (status < 0)
return (status);
- nleft = nleft - status;
- ptr = ptr + status;
+ nleft -= status;
+ ptr += status;
}
return (0);
} /* }}} ssize_t swrite */
+static void _wipe_ci_values(cache_item_t *ci, time_t when)
+{
+ ci->values = NULL;
+ ci->values_num = 0;
+
+ ci->last_flush_time = when;
+ if (config_write_jitter > 0)
+ ci->last_flush_time += (random() % config_write_jitter);
+
+ ci->flags &= ~(CI_FLAGS_IN_QUEUE);
+}
+
/*
* enqueue_cache_item:
* `cache_lock' must be acquired before calling this function!
flush_old_values (config_write_interval);
/* Determine the time of the next cache flush. */
- while (next_flush.tv_sec < now.tv_sec)
+ while (next_flush.tv_sec <= now.tv_sec)
next_flush.tv_sec += config_flush_interval;
+
+ /* unlock the cache while we rotate so we don't block incoming
+ * updates if the fsync() blocks on disk I/O */
+ pthread_mutex_unlock(&cache_lock);
+ journal_rotate();
+ pthread_mutex_lock(&cache_lock);
}
/* Now, check if there's something to store away. If not, wait until
continue;
}
+ assert(ci->values != NULL);
+ assert(ci->values_num > 0);
+
values = ci->values;
values_num = ci->values_num;
- ci->values = NULL;
- ci->values_num = 0;
-
- ci->last_flush_time = time (NULL);
- ci->flags &= ~(CI_FLAGS_IN_QUEUE);
+ _wipe_ci_values(ci, time(NULL));
cache_queue_head = ci->next;
if (cache_queue_head == NULL)
pthread_mutex_unlock (&cache_lock);
+ rrd_clear_error ();
status = rrd_update_r (file, NULL, values_num, (void *) values);
if (status != 0)
{
- RRDD_LOG (LOG_ERR, "queue_thread_main: "
- "rrd_update_r failed with status %i.",
- status);
+ RRDD_LOG (LOG_NOTICE, "queue_thread_main: "
+ "rrd_update_r (%s) failed with status %i. (%s)",
+ file, status, rrd_get_error());
}
- free (file);
+ journal_write("wrote", file);
+
for (i = 0; i < values_num; i++)
free (values[i]);
+ free(values);
+ free(file);
+
if (status == 0)
{
pthread_mutex_lock (&stats_lock);
} /* while ((do_shutdown == 0) || (cache_queue_head != NULL)) */
pthread_mutex_unlock (&cache_lock);
+ assert(cache_queue_head == NULL);
+ RRDD_LOG(LOG_INFO, "clean shutdown; all RRDs flushed");
+ journal_done();
+
return (NULL);
} /* }}} void *queue_thread_main */
return (-1);
/* This is ensured by `handle_request'. */
- assert (buffer[buffer_size - 1] == ' ');
+ assert (buffer[buffer_size - 1] == '\0');
status = -1;
while (buffer_pos < buffer_size)
{
/* Check for end-of-field or end-of-buffer */
- if (buffer[buffer_pos] == ' ')
+ if (buffer[buffer_pos] == ' ' || buffer[buffer_pos] == '\0')
{
field[field_size] = 0;
field_size++;
size_t buffer_size __attribute__((unused)))
{
int status;
- char outbuf[4096];
+ char outbuf[CMD_MAX];
uint64_t copy_queue_length;
+ uint64_t copy_updates_received;
+ uint64_t copy_flush_received;
uint64_t copy_updates_written;
uint64_t copy_data_sets_written;
+ uint64_t copy_journal_bytes;
+ uint64_t copy_journal_rotate;
uint64_t tree_nodes_number;
uint64_t tree_depth;
pthread_mutex_lock (&stats_lock);
copy_queue_length = stats_queue_length;
+ copy_updates_received = stats_updates_received;
+ copy_flush_received = stats_flush_received;
copy_updates_written = stats_updates_written;
copy_data_sets_written = stats_data_sets_written;
+ copy_journal_bytes = stats_journal_bytes;
+ copy_journal_rotate = stats_journal_rotate;
pthread_mutex_unlock (&stats_lock);
pthread_mutex_lock (&cache_lock);
return (status); \
}
- strncpy (outbuf, "5 Statistics follow\n", sizeof (outbuf));
+ strncpy (outbuf, "9 Statistics follow\n", sizeof (outbuf));
RRDD_STATS_SEND;
snprintf (outbuf, sizeof (outbuf),
RRDD_STATS_SEND;
snprintf (outbuf, sizeof (outbuf),
+ "UpdatesReceived: %"PRIu64"\n", copy_updates_received);
+ RRDD_STATS_SEND;
+
+ snprintf (outbuf, sizeof (outbuf),
+ "FlushesReceived: %"PRIu64"\n", copy_flush_received);
+ RRDD_STATS_SEND;
+
+ snprintf (outbuf, sizeof (outbuf),
"UpdatesWritten: %"PRIu64"\n", copy_updates_written);
RRDD_STATS_SEND;
"TreeDepth: %"PRIu64"\n", tree_depth);
RRDD_STATS_SEND;
+ snprintf (outbuf, sizeof(outbuf),
+ "JournalBytes: %"PRIu64"\n", copy_journal_bytes);
+ RRDD_STATS_SEND;
+
+ snprintf (outbuf, sizeof(outbuf),
+ "JournalRotate: %"PRIu64"\n", copy_journal_rotate);
+ RRDD_STATS_SEND;
+
return (0);
#undef RRDD_STATS_SEND
} /* }}} int handle_request_stats */
{
char *file;
int status;
- char result[4096];
+ char result[CMD_MAX];
status = buffer_get_field (&buffer, &buffer_size, &file);
if (status != 0)
}
else
{
+ pthread_mutex_lock(&stats_lock);
+ stats_flush_received++;
+ pthread_mutex_unlock(&stats_lock);
+
status = flush_file (file);
if (status == 0)
snprintf (result, sizeof (result), "0 Successfully flushed %s.\n", file);
else if (status == ENOENT)
- snprintf (result, sizeof (result), "-1 No such file: %s.\n", file);
+ {
+ /* no file in our tree; see whether it exists at all */
+ struct stat statbuf;
+
+ memset(&statbuf, 0, sizeof(statbuf));
+ if (stat(file, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
+ snprintf (result, sizeof (result), "0 Nothing to flush: %s.\n", file);
+ else
+ snprintf (result, sizeof (result), "-1 No such file: %s.\n", file);
+ }
else if (status < 0)
strncpy (result, "-1 Internal error.\n", sizeof (result));
else
time_t now;
cache_item_t *ci;
- char answer[4096];
+ char answer[CMD_MAX];
#define RRDD_UPDATE_SEND \
answer[sizeof (answer) - 1] = 0; \
return (0);
}
+ pthread_mutex_lock(&stats_lock);
+ stats_updates_received++;
+ pthread_mutex_unlock(&stats_lock);
+
pthread_mutex_lock (&cache_lock);
ci = g_tree_lookup (cache_tree, file);
if (status != 0)
{
pthread_mutex_unlock (&cache_lock);
- RRDD_LOG (LOG_ERR, "handle_request_update: stat (%s) failed.", file);
+ RRDD_LOG (LOG_NOTICE, "handle_request_update: stat (%s) failed.", file);
status = errno;
if (status == ENOENT)
- snprintf (answer, sizeof (answer), "-1 No such file: %s", file);
+ snprintf (answer, sizeof (answer), "-1 No such file: %s\n", file);
else
snprintf (answer, sizeof (answer), "-1 stat failed with error %i.\n",
status);
{
pthread_mutex_unlock (&cache_lock);
- snprintf (answer, sizeof (answer), "-1 Not a regular file: %s", file);
+ snprintf (answer, sizeof (answer), "-1 Not a regular file: %s\n", file);
+ RRDD_UPDATE_SEND;
+ return (0);
+ }
+ if (access(file, R_OK|W_OK) != 0)
+ {
+ pthread_mutex_unlock (&cache_lock);
+
+ snprintf (answer, sizeof (answer), "-1 Cannot read/write %s: %s\n",
+ file, rrd_strerror(errno));
RRDD_UPDATE_SEND;
return (0);
}
return (0);
}
- ci->values = NULL;
- ci->values_num = 0;
- ci->last_flush_time = now;
+ _wipe_ci_values(ci, now);
ci->flags = CI_FLAGS_IN_TREE;
g_tree_insert (cache_tree, (void *) ci->file, (void *) ci);
#undef RRDD_UPDATE_SEND
} /* }}} int handle_request_update */
-static int handle_request (int fd) /* {{{ */
+/* we came across a "WROTE" entry during journal replay.
+ * throw away any values that we have accumulated for this file
+ */
+static int handle_request_wrote (int fd __attribute__((unused)), /* {{{ */
+ const char *buffer,
+ size_t buffer_size __attribute__((unused)))
{
- char buffer[4096];
- size_t buffer_size;
- char *buffer_ptr;
- char *command;
- int status;
+ int i;
+ cache_item_t *ci;
+ const char *file = buffer;
- status = (int) sread (fd, buffer, sizeof (buffer));
- if (status == 0)
- {
- return (1);
- }
- else if (status < 0)
+ pthread_mutex_lock(&cache_lock);
+
+ ci = g_tree_lookup(cache_tree, file);
+ if (ci == NULL)
+ goto out;
+
+ if (ci->values)
{
- RRDD_LOG (LOG_ERR, "handle_request: sread failed.");
- return (-1);
+ for (i=0; i < ci->values_num; i++)
+ free(ci->values[i]);
+
+ free(ci->values);
}
- buffer_size = (size_t) status;
- assert (buffer_size <= sizeof (buffer));
- assert (buffer[buffer_size - 1] == 0);
- /* Place the normal field separator at the end to simplify
- * `buffer_get_field's work. */
- buffer[buffer_size - 1] = ' ';
+ _wipe_ci_values(ci, time(NULL));
+
+out:
+ pthread_mutex_unlock(&cache_lock);
+ return 0;
+}
+
+/* if fd < 0, we are in journal replay mode */
+static int handle_request (int fd, char *buffer, size_t buffer_size) /* {{{ */
+{
+ char *buffer_ptr;
+ char *command;
+ int status;
+
+ assert (buffer[buffer_size - 1] == '\0');
buffer_ptr = buffer;
command = NULL;
if (strcasecmp (command, "update") == 0)
{
+ /* don't re-write updates in replay mode */
+ if (fd >= 0)
+ journal_write(command, buffer_ptr);
+
return (handle_request_update (fd, buffer_ptr, buffer_size));
}
+ else if (strcasecmp (command, "wrote") == 0 && fd < 0)
+ {
+ /* this is only valid in replay mode */
+ return (handle_request_wrote (fd, buffer_ptr, buffer_size));
+ }
else if (strcasecmp (command, "flush") == 0)
{
return (handle_request_flush (fd, buffer_ptr, buffer_size));
}
else
{
- char result[4096];
+ char result[CMD_MAX];
snprintf (result, sizeof (result), "-1 Unknown command: %s\n", command);
result[sizeof (result) - 1] = 0;
return (0);
} /* }}} int handle_request */
-static void *connection_thread_main (void *args /* {{{ */
- __attribute__((unused)))
+/* MUST NOT hold journal_lock before calling this */
+static void journal_rotate(void) /* {{{ */
+{
+ FILE *old_fh = NULL;
+
+ if (journal_cur == NULL || journal_old == NULL)
+ return;
+
+ pthread_mutex_lock(&journal_lock);
+
+ /* we rotate this way (rename before close) so that the we can release
+ * the journal lock as fast as possible. Journal writes to the new
+ * journal can proceed immediately after the new file is opened. The
+ * fclose can then block without affecting new updates.
+ */
+ if (journal_fh != NULL)
+ {
+ old_fh = journal_fh;
+ rename(journal_cur, journal_old);
+ ++stats_journal_rotate;
+ }
+
+ journal_fh = fopen(journal_cur, "a");
+ pthread_mutex_unlock(&journal_lock);
+
+ if (old_fh != NULL)
+ fclose(old_fh);
+
+ if (journal_fh == NULL)
+ RRDD_LOG(LOG_CRIT,
+ "JOURNALING DISABLED: Cannot open journal file '%s' : (%s)",
+ journal_cur, rrd_strerror(errno));
+
+} /* }}} static void journal_rotate */
+
+static void journal_done(void) /* {{{ */
+{
+ if (journal_cur == NULL)
+ return;
+
+ pthread_mutex_lock(&journal_lock);
+ if (journal_fh != NULL)
+ {
+ fclose(journal_fh);
+ journal_fh = NULL;
+ }
+
+ RRDD_LOG(LOG_INFO, "removing journals");
+
+ unlink(journal_old);
+ unlink(journal_cur);
+ pthread_mutex_unlock(&journal_lock);
+
+} /* }}} static void journal_done */
+
+static int journal_write(char *cmd, char *args) /* {{{ */
+{
+ int chars;
+
+ if (journal_fh == NULL)
+ return 0;
+
+ pthread_mutex_lock(&journal_lock);
+ chars = fprintf(journal_fh, "%s %s\n", cmd, args);
+ pthread_mutex_unlock(&journal_lock);
+
+ if (chars > 0)
+ {
+ pthread_mutex_lock(&stats_lock);
+ stats_journal_bytes += chars;
+ pthread_mutex_unlock(&stats_lock);
+ }
+
+ return chars;
+} /* }}} static int journal_write */
+
+static int journal_replay (const char *file) /* {{{ */
+{
+ FILE *fh;
+ int entry_cnt = 0;
+ int fail_cnt = 0;
+ uint64_t line = 0;
+ char entry[CMD_MAX];
+
+ if (file == NULL) return 0;
+
+ fh = fopen(file, "r");
+ if (fh == NULL)
+ {
+ if (errno != ENOENT)
+ RRDD_LOG(LOG_ERR, "journal_replay: cannot open journal file: '%s' (%s)",
+ file, rrd_strerror(errno));
+ return 0;
+ }
+ else
+ RRDD_LOG(LOG_NOTICE, "replaying from journal: %s", file);
+
+ while(!feof(fh))
+ {
+ size_t entry_len;
+
+ ++line;
+ fgets(entry, sizeof(entry), fh);
+ entry_len = strlen(entry);
+
+ /* check \n termination in case journal writing crashed mid-line */
+ if (entry_len == 0)
+ continue;
+ else if (entry[entry_len - 1] != '\n')
+ {
+ RRDD_LOG(LOG_NOTICE, "Malformed journal entry at line %"PRIu64, line);
+ ++fail_cnt;
+ continue;
+ }
+
+ entry[entry_len - 1] = '\0';
+
+ if (handle_request(-1, entry, entry_len) == 0)
+ ++entry_cnt;
+ else
+ ++fail_cnt;
+ }
+
+ fclose(fh);
+
+ if (entry_cnt > 0)
+ {
+ RRDD_LOG(LOG_INFO, "Replayed %d entries (%d failures)",
+ entry_cnt, fail_cnt);
+ return 1;
+ }
+ else
+ return 0;
+
+} /* }}} static int journal_replay */
+
+static void *connection_thread_main (void *args) /* {{{ */
{
pthread_t self;
int i;
int fd;
fd = *((int *) args);
+ free (args);
- pthread_mutex_lock (&connetion_threads_lock);
+ pthread_mutex_lock (&connection_threads_lock);
{
pthread_t *temp;
- temp = (pthread_t *) realloc (connetion_threads,
- sizeof (pthread_t) * (connetion_threads_num + 1));
+ temp = (pthread_t *) realloc (connection_threads,
+ sizeof (pthread_t) * (connection_threads_num + 1));
if (temp == NULL)
{
RRDD_LOG (LOG_ERR, "connection_thread_main: realloc failed.");
}
else
{
- connetion_threads = temp;
- connetion_threads[connetion_threads_num] = pthread_self ();
- connetion_threads_num++;
+ connection_threads = temp;
+ connection_threads[connection_threads_num] = pthread_self ();
+ connection_threads_num++;
}
}
- pthread_mutex_unlock (&connetion_threads_lock);
+ pthread_mutex_unlock (&connection_threads_lock);
while (do_shutdown == 0)
{
+ char buffer[CMD_MAX];
+
struct pollfd pollfd;
int status;
break;
}
- status = handle_request (fd);
+ status = (int) sread (fd, buffer, sizeof (buffer));
+ if (status <= 0)
+ {
+ close (fd);
+
+ if (status < 0)
+ RRDD_LOG(LOG_ERR, "connection_thread_main: sread failed.");
+
+ break;
+ }
+
+ status = handle_request (fd, buffer, /*buffer_size=*/ status);
if (status != 0)
{
close (fd);
self = pthread_self ();
/* Remove this thread from the connection threads list */
- pthread_mutex_lock (&connetion_threads_lock);
+ pthread_mutex_lock (&connection_threads_lock);
/* Find out own index in the array */
- for (i = 0; i < connetion_threads_num; i++)
- if (pthread_equal (connetion_threads[i], self) != 0)
+ for (i = 0; i < connection_threads_num; i++)
+ if (pthread_equal (connection_threads[i], self) != 0)
break;
- assert (i < connetion_threads_num);
+ assert (i < connection_threads_num);
/* Move the trailing threads forward. */
- if (i < (connetion_threads_num - 1))
+ if (i < (connection_threads_num - 1))
{
- memmove (connetion_threads + i,
- connetion_threads + i + 1,
- sizeof (pthread_t) * (connetion_threads_num - i - 1));
+ memmove (connection_threads + i,
+ connection_threads + i + 1,
+ sizeof (pthread_t) * (connection_threads_num - i - 1));
}
- connetion_threads_num--;
- pthread_mutex_unlock (&connetion_threads_lock);
+ connection_threads_num--;
+ pthread_mutex_unlock (&connection_threads_lock);
- free (args);
return (NULL);
} /* }}} void *connection_thread_main */
}
memset (pollfds, 0, sizeof (*pollfds) * pollfds_num);
+ RRDD_LOG(LOG_INFO, "listening for connections");
+
while (do_shutdown == 0)
{
assert (pollfds_num == ((int) listen_fds_num));
} /* for (pollfds_num) */
} /* while (do_shutdown == 0) */
+ RRDD_LOG(LOG_INFO, "starting shutdown");
+
close_listen_sockets ();
- pthread_mutex_lock (&connetion_threads_lock);
- while (connetion_threads_num > 0)
+ pthread_mutex_lock (&connection_threads_lock);
+ while (connection_threads_num > 0)
{
pthread_t wait_for;
- wait_for = connetion_threads[0];
+ wait_for = connection_threads[0];
- pthread_mutex_unlock (&connetion_threads_lock);
+ pthread_mutex_unlock (&connection_threads_lock);
pthread_join (wait_for, /* retval = */ NULL);
- pthread_mutex_lock (&connetion_threads_lock);
+ pthread_mutex_lock (&connection_threads_lock);
}
- pthread_mutex_unlock (&connetion_threads_lock);
+ pthread_mutex_unlock (&connection_threads_lock);
return (NULL);
} /* }}} void *listen_thread_main */
static struct sigaction sa_term;
static struct sigaction sa_pipe;
+ if (stay_foreground)
+ goto child_startup;
+
child = fork ();
if (child < 0)
{
dup (0);
dup (0);
+child_startup:
/* Install signal handlers */
memset (&sa_int, 0, sizeof (sa_int));
sa_int.sa_handler = sig_int_handler;
sigaction (SIGPIPE, &sa_pipe, NULL);
openlog ("rrdcached", LOG_PID, LOG_DAEMON);
+ RRDD_LOG(LOG_INFO, "starting up");
cache_tree = g_tree_new ((GCompareFunc) strcmp);
if (cache_tree == NULL)
return (-1);
}
- memset (&queue_thread, 0, sizeof (queue_thread));
- status = pthread_create (&queue_thread, /* attr = */ NULL,
- queue_thread_main, /* args = */ NULL);
- if (status != 0)
- {
- RRDD_LOG (LOG_ERR, "daemonize: pthread_create failed.");
- return (-1);
- }
-
- write_pidfile ();
-
- return (0);
+ status = write_pidfile ();
+ return status;
} /* }}} int daemonize */
static int cleanup (void) /* {{{ */
remove_pidfile ();
+ RRDD_LOG(LOG_INFO, "goodbye");
closelog ();
return (0);
int option;
int status = 0;
- while ((option = getopt(argc, argv, "l:f:w:b:p:h?")) != -1)
+ while ((option = getopt(argc, argv, "gl:f:w:b:z:p:j:h?")) != -1)
{
switch (option)
{
+ case 'g':
+ stay_foreground=1;
+ break;
+
case 'l':
{
char **temp;
}
break;
+ case 'z':
+ {
+ int temp;
+
+ temp = atoi(optarg);
+ if (temp > 0)
+ config_write_jitter = temp;
+ else
+ {
+ fprintf (stderr, "Invalid write jitter: -z %s\n", optarg);
+ status = 2;
+ }
+
+ break;
+ }
+
case 'b':
{
size_t len;
}
break;
+ case 'j':
+ {
+ struct stat statbuf;
+ const char *dir = optarg;
+
+ status = stat(dir, &statbuf);
+ if (status != 0)
+ {
+ fprintf(stderr, "Cannot stat '%s' : %s\n", dir, rrd_strerror(errno));
+ return 6;
+ }
+
+ if (!S_ISDIR(statbuf.st_mode)
+ || access(dir, R_OK|W_OK|X_OK) != 0)
+ {
+ fprintf(stderr, "Must specify a writable directory with -j! (%s)\n",
+ errno ? rrd_strerror(errno) : "");
+ return 6;
+ }
+
+ journal_cur = malloc(PATH_MAX + 1);
+ journal_old = malloc(PATH_MAX + 1);
+ if (journal_cur == NULL || journal_old == NULL)
+ {
+ fprintf(stderr, "malloc failure for journal files\n");
+ return 6;
+ }
+ else
+ {
+ snprintf(journal_cur, PATH_MAX, "%s/rrd.journal", dir);
+ snprintf(journal_old, PATH_MAX, "%s/rrd.journal.old", dir);
+ }
+ }
+ break;
+
case 'h':
case '?':
printf ("RRDd %s Copyright (C) 2008 Florian octo Forster\n"
"Valid options are:\n"
" -l <address> Socket address to listen to.\n"
" -w <seconds> Interval in which to write data.\n"
+ " -z <delay> Delay writes up to <delay> seconds to spread load" \
" -f <seconds> Interval in which to flush dead data.\n"
" -p <file> Location of the PID-file.\n"
" -b <dir> Base directory to change to.\n"
} /* switch (option) */
} /* while (getopt) */
+ /* advise the user when values are not sane */
+ if (config_flush_interval < 2 * config_write_interval)
+ fprintf(stderr, "WARNING: flush interval (-f) should be at least"
+ " 2x write interval (-w) !\n");
+ if (config_write_jitter > config_write_interval)
+ fprintf(stderr, "WARNING: write delay (-z) should NOT be larger than"
+ " write interval (-w) !\n");
+
return (status);
} /* }}} int read_options */
return (1);
}
- listen_thread_main (NULL);
+ if (journal_cur != NULL)
+ {
+ int had_journal = 0;
+
+ pthread_mutex_lock(&journal_lock);
+
+ RRDD_LOG(LOG_INFO, "checking for journal files");
+ had_journal += journal_replay(journal_old);
+ had_journal += journal_replay(journal_cur);
+
+ if (had_journal)
+ flush_old_values(-1);
+
+ pthread_mutex_unlock(&journal_lock);
+ journal_rotate();
+
+ RRDD_LOG(LOG_INFO, "journal processing complete");
+ }
+
+ /* start the queue thread */
+ memset (&queue_thread, 0, sizeof (queue_thread));
+ status = pthread_create (&queue_thread,
+ NULL, /* attr */
+ queue_thread_main,
+ NULL); /* args */
+ if (status != 0)
+ {
+ RRDD_LOG (LOG_ERR, "FATAL: cannot create queue thread");
+ cleanup();
+ return (1);
+ }
+
+ listen_thread_main (NULL);
cleanup ();
return (0);
projects / rrdtool.git / commitdiff