socket_privilege privilege;
/* state for BATCH processing */
- int batch_mode;
+ time_t batch_start;
int batch_cmd;
/* buffered IO */
char **values;
int values_num;
time_t last_flush_time;
+ time_t last_update_stamp;
#define CI_FLAGS_IN_TREE (1<<0)
#define CI_FLAGS_IN_QUEUE (1<<1)
int flags;
int len;
if (sock == NULL) return 0; /* journal replay mode */
- if (sock->batch_mode) return 0; /* no extra info returned when in BATCH */
+ if (sock->batch_start) return 0; /* no extra info returned when in BATCH */
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
if (sock == NULL) return rc; /* journal replay mode */
- if (sock->batch_mode)
+ if (sock->batch_start)
{
if (rc == RESP_OK)
return rc; /* no response on success during BATCH */
len += rclen;
/* append the result to the wbuf, don't write to the user */
- if (sock->batch_mode)
+ if (sock->batch_start)
return add_to_wbuf(sock, buffer, len);
/* first write must be complete */
return -1;
}
- if (sock->wbuf != NULL)
+ if (sock->wbuf != NULL && rc == RESP_OK)
{
wrote = 0;
while (wrote < sock->wbuf_len)
ci->flags &= ~CI_FLAGS_IN_QUEUE;
} /* }}} static void remove_from_queue */
+/* remove an entry from the tree and free all its resources.
+ * must hold 'cache lock' while calling this.
+ * returns 0 on success, otherwise errno */
+static int forget_file(const char *file)
+{
+ cache_item_t *ci;
+
+ ci = g_tree_lookup(cache_tree, file);
+ if (ci == NULL)
+ return ENOENT;
+
+ g_tree_remove (cache_tree, file);
+ remove_from_queue(ci);
+
+ for (int i=0; i < ci->values_num; i++)
+ free(ci->values[i]);
+
+ free (ci->values);
+ free (ci->file);
+
+ /* in case anyone is waiting */
+ pthread_cond_broadcast(&ci->flushed);
+
+ free (ci);
+
+ return 0;
+} /* }}} static int forget_file */
+
/*
* enqueue_cache_item:
* `cache_lock' must be acquired before calling this function!
for (k = 0; k < cfd.keys_num; k++)
{
- cache_item_t *ci;
-
- /* This must not fail. */
- ci = (cache_item_t *) g_tree_lookup (cache_tree, cfd.keys[k]);
- assert (ci != NULL);
-
- /* If we end up here with values available, something's seriously
- * messed up. */
- assert (ci->values_num == 0);
-
- /* Remove the node from the tree */
- g_tree_remove (cache_tree, cfd.keys[k]);
- cfd.keys[k] = NULL;
-
- /* Now free and clean up `ci'. */
- free (ci->file);
- ci->file = NULL;
- free (ci);
- ci = NULL;
- } /* for (k = 0; k < cfd.keys_num; k++) */
+ /* should never fail, since we have held the cache_lock
+ * the entire time */
+ assert( forget_file(cfd.keys[k]) == 0 );
+ }
if (cfd.keys != NULL)
{
pthread_cond_wait(&ci->flushed, &cache_lock);
}
+ /* DO NOT DO ANYTHING WITH ci HERE!! The entry
+ * may have been purged during our cond_wait() */
+
pthread_mutex_unlock(&cache_lock);
return (0);
{
"Command overview\n"
,
+ "HELP [<command>]\n"
"FLUSH <filename>\n"
"FLUSHALL\n"
- "HELP [<command>]\n"
+ "PENDING <filename>\n"
+ "FORGET <filename>\n"
"UPDATE <filename> <values> [<values> ...]\n"
"BATCH\n"
"STATS\n"
"Triggers writing of all pending updates. Returns immediately.\n"
};
+ char *help_pending[2] =
+ {
+ "Help for PENDING\n"
+ ,
+ "Usage: PENDING <filename>\n"
+ "\n"
+ "Shows any 'pending' updates for a file, in order.\n"
+ "The updates shown have not yet been written to the underlying RRD file.\n"
+ };
+
+ char *help_forget[2] =
+ {
+ "Help for FORGET\n"
+ ,
+ "Usage: FORGET <filename>\n"
+ "\n"
+ "Removes the file completely from the cache.\n"
+ "Any pending updates for the file will be lost.\n"
+ };
+
char *help_update[2] =
{
"Help for UPDATE\n"
help_text = help_flush;
else if (strcasecmp (command, "flushall") == 0)
help_text = help_flushall;
+ else if (strcasecmp (command, "pending") == 0)
+ help_text = help_pending;
+ else if (strcasecmp (command, "forget") == 0)
+ help_text = help_forget;
else if (strcasecmp (command, "stats") == 0)
help_text = help_stats;
else if (strcasecmp (command, "batch") == 0)
/* NOTREACHED */
assert(1==0);
-} /* }}} int handle_request_slurp */
+} /* }}} int handle_request_flush */
static int handle_request_flushall(listen_socket_t *sock) /* {{{ */
{
return send_response(sock, RESP_OK, "Started flush.\n");
} /* }}} static int handle_request_flushall */
+static int handle_request_pending(listen_socket_t *sock, /* {{{ */
+ char *buffer, size_t buffer_size)
+{
+ int status;
+ char *file;
+ cache_item_t *ci;
+
+ status = buffer_get_field(&buffer, &buffer_size, &file);
+ if (status != 0)
+ return send_response(sock, RESP_ERR,
+ "Usage: PENDING <filename>\n");
+
+ status = has_privilege(sock, PRIV_HIGH);
+ if (status <= 0)
+ return status;
+
+ pthread_mutex_lock(&cache_lock);
+ ci = g_tree_lookup(cache_tree, file);
+ if (ci == NULL)
+ {
+ pthread_mutex_unlock(&cache_lock);
+ return send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOENT));
+ }
+
+ for (int i=0; i < ci->values_num; i++)
+ add_response_info(sock, "%s\n", ci->values[i]);
+
+ pthread_mutex_unlock(&cache_lock);
+ return send_response(sock, RESP_OK, "updates pending\n");
+} /* }}} static int handle_request_pending */
+
+static int handle_request_forget(listen_socket_t *sock, /* {{{ */
+ char *buffer, size_t buffer_size)
+{
+ int status;
+ char *file;
+
+ status = buffer_get_field(&buffer, &buffer_size, &file);
+ if (status != 0)
+ return send_response(sock, RESP_ERR,
+ "Usage: FORGET <filename>\n");
+
+ status = has_privilege(sock, PRIV_HIGH);
+ if (status <= 0)
+ return status;
+
+ if (!check_file_access(file, sock)) return 0;
+
+ pthread_mutex_lock(&cache_lock);
+ status = forget_file(file);
+ pthread_mutex_unlock(&cache_lock);
+
+ if (status == 0)
+ {
+ if (sock != NULL)
+ journal_write("forget", file);
+
+ return send_response(sock, RESP_OK, "Gone!\n");
+ }
+ else
+ return send_response(sock, RESP_ERR, "cannot forget: %s\n",
+ status < 0 ? "Internal error" : rrd_strerror(status));
+
+ /* NOTREACHED */
+ assert(1==0);
+} /* }}} static int handle_request_forget */
+
static int handle_request_update (listen_socket_t *sock, /* {{{ */
- char *buffer, size_t buffer_size)
+ time_t now,
+ char *buffer, size_t buffer_size)
{
char *file;
int values_num = 0;
+ int bad_timestamps = 0;
int status;
char orig_buf[CMD_MAX];
- time_t now;
cache_item_t *ci;
- now = time (NULL);
-
status = has_privilege(sock, PRIV_HIGH);
if (status <= 0)
return status;
{
char **temp;
char *value;
+ time_t stamp;
+ char *eostamp;
status = buffer_get_field (&buffer, &buffer_size, &value);
if (status != 0)
break;
}
+ /* make sure update time is always moving forward */
+ stamp = strtol(value, &eostamp, 10);
+ if (eostamp == value || eostamp == NULL || *eostamp != ':')
+ {
+ ++bad_timestamps;
+ add_response_info(sock, "Cannot find timestamp in '%s'!\n", value);
+ continue;
+ }
+ else if (stamp <= ci->last_update_stamp)
+ {
+ ++bad_timestamps;
+ add_response_info(sock,
+ "illegal attempt to update using time %ld when"
+ " last update time is %ld (minimum one second step)\n",
+ stamp, ci->last_update_stamp);
+ continue;
+ }
+ else
+ ci->last_update_stamp = stamp;
+
temp = (char **) realloc (ci->values,
sizeof (char *) * (ci->values_num + 1));
if (temp == NULL)
pthread_mutex_unlock (&cache_lock);
if (values_num < 1)
- return send_response(sock, RESP_ERR, "No values updated.\n");
+ {
+ /* if we had only one update attempt, then return the full
+ error message... try to get the most information out
+ of the limited error space allowed by the protocol
+ */
+ if (bad_timestamps == 1)
+ return send_response(sock, RESP_ERR, "%s", sock->wbuf);
+ else
+ return send_response(sock, RESP_ERR,
+ "No values updated (%d bad timestamps).\n",
+ bad_timestamps);
+ }
else
- return send_response(sock, RESP_OK, "Enqueued %i value(s).\n", values_num);
+ return send_response(sock, RESP_OK,
+ "errors, enqueued %i value(s).\n", values_num);
/* NOTREACHED */
assert(1==0);
/* 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 (const char *buffer) /* {{{ */
+static int handle_request_wrote (const char *buffer, time_t now) /* {{{ */
{
int i;
cache_item_t *ci;
free(ci->values);
}
- wipe_ci_values(ci, time(NULL));
+ wipe_ci_values(ci, now);
remove_from_queue(ci);
pthread_mutex_unlock(&cache_lock);
static int batch_start (listen_socket_t *sock) /* {{{ */
{
int status;
- if (sock->batch_mode)
+ if (sock->batch_start)
return send_response(sock, RESP_ERR, "Already in BATCH\n");
status = send_response(sock, RESP_OK,
"Go ahead. End with dot '.' on its own line.\n");
- sock->batch_mode = 1;
+ sock->batch_start = time(NULL);
sock->batch_cmd = 0;
return status;
/* finish "BATCH" processing and return results to the client */
static int batch_done (listen_socket_t *sock) /* {{{ */
{
- assert(sock->batch_mode);
- sock->batch_mode = 0;
+ assert(sock->batch_start);
+ sock->batch_start = 0;
sock->batch_cmd = 0;
return send_response(sock, RESP_OK, "errors\n");
} /* }}} static int batch_done */
/* if sock==NULL, we are in journal replay mode */
static int handle_request (listen_socket_t *sock, /* {{{ */
+ time_t now,
char *buffer, size_t buffer_size)
{
char *buffer_ptr;
return (-1);
}
- if (sock != NULL && sock->batch_mode)
+ if (sock != NULL && sock->batch_start)
sock->batch_cmd++;
if (strcasecmp (command, "update") == 0)
- return (handle_request_update (sock, buffer_ptr, buffer_size));
+ return (handle_request_update (sock, now, buffer_ptr, buffer_size));
else if (strcasecmp (command, "wrote") == 0 && sock == NULL)
{
/* this is only valid in replay mode */
- return (handle_request_wrote (buffer_ptr));
+ return (handle_request_wrote (buffer_ptr, now));
}
else if (strcasecmp (command, "flush") == 0)
return (handle_request_flush (sock, buffer_ptr, buffer_size));
else if (strcasecmp (command, "flushall") == 0)
return (handle_request_flushall(sock));
+ else if (strcasecmp (command, "pending") == 0)
+ return (handle_request_pending(sock, buffer_ptr, buffer_size));
+ else if (strcasecmp (command, "forget") == 0)
+ return (handle_request_forget(sock, buffer_ptr, buffer_size));
else if (strcasecmp (command, "stats") == 0)
return (handle_request_stats (sock));
else if (strcasecmp (command, "help") == 0)
return (handle_request_help (sock, buffer_ptr, buffer_size));
else if (strcasecmp (command, "batch") == 0 && sock != NULL)
return batch_start(sock);
- else if (strcasecmp (command, ".") == 0 && sock != NULL && sock->batch_mode)
+ else if (strcasecmp (command, ".") == 0 && sock != NULL && sock->batch_start)
return batch_done(sock);
else
return send_response(sock, RESP_ERR, "Unknown command: %s\n", command);
int fail_cnt = 0;
uint64_t line = 0;
char entry[CMD_MAX];
+ time_t now;
if (file == NULL) return 0;
else
RRDD_LOG(LOG_NOTICE, "replaying from journal: %s", file);
+ now = time(NULL);
+
while(!feof(fh))
{
size_t entry_len;
entry[entry_len - 1] = '\0';
- if (handle_request(NULL, entry, entry_len) == 0)
+ if (handle_request(NULL, now, entry, entry_len) == 0)
++entry_cnt;
else
++fail_cnt;
char *cmd;
ssize_t cmd_len;
ssize_t rbytes;
+ time_t now;
struct pollfd pollfd;
int status;
else if (status < 0) /* error */
{
status = errno;
- if (status == EINTR)
- continue;
- RRDD_LOG (LOG_ERR, "connection_thread_main: poll(2) failed.");
+ if (status != EINTR)
+ RRDD_LOG (LOG_ERR, "connection_thread_main: poll(2) failed.");
continue;
}
if ((pollfd.revents & POLLHUP) != 0) /* normal shutdown */
- {
- close_connection(sock);
break;
- }
else if ((pollfd.revents & (POLLIN | POLLPRI)) == 0)
{
RRDD_LOG (LOG_WARNING, "connection_thread_main: "
"poll(2) returned something unexpected: %#04hx",
pollfd.revents);
- close_connection(sock);
break;
}
sock->next_read += rbytes;
+ if (sock->batch_start)
+ now = sock->batch_start;
+ else
+ now = time(NULL);
+
while ((cmd = next_cmd(sock, &cmd_len)) != NULL)
{
- status = handle_request (sock, cmd, cmd_len+1);
+ status = handle_request (sock, now, cmd, cmd_len+1);
if (status != 0)
goto out_close;
}
projects / rrdtool.git / blobdiff