frontend: Add support for SDB_CONNECTION_STORE.

The front-end now supports parsing and executing STORE commands.

diff --git a/src/Makefile.am b/src/Makefile.am
index d979672d7dc388d85c6214f66849d30462f79398..f467f2f9bf075db5f47fe34a7d57014c695d2958 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,6 +87,7 @@ libsysdb_la_SOURCES = \
                frontend/parser.c include/frontend/parser.h \
                frontend/sock.c include/frontend/sock.h \
                frontend/session.c \
+               frontend/store.c \
                frontend/query.c \
                utils/avltree.c include/utils/avltree.h \
                utils/channel.c include/utils/channel.h \

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 91a9710e6b8e4789b625bcab1448343a6770e410..ed1eb2c8565058f562922f3d0b11071d46287ccb 100644 (file)
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -325,6 +325,8 @@ command_handle(sdb_conn_t *conn)
                status = sdb_fe_list(conn);
        else if (conn->cmd == SDB_CONNECTION_LOOKUP)
                status = sdb_fe_lookup(conn);
+       else if (conn->cmd == SDB_CONNECTION_STORE)
+               status = sdb_fe_store(conn);
        else {
                sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
                                conn->cmd);

diff --git a/src/frontend/store.c b/src/frontend/store.c
new file mode 100644 (file)
index 0000000..5f3ce84
--- /dev/null
+++ b/src/frontend/store.c
@@ -0,0 +1,216 @@
+/*
+ * SysDB - src/frontend/store.c
+ * Copyright (C) 2015 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sysdb.h"
+
+#include "core/store.h"
+#include "frontend/connection-private.h"
+#include "utils/error.h"
+#include "utils/proto.h"
+#include "utils/strbuf.h"
+
+#include <ctype.h>
+#include <string.h>
+
+/*
+ * private helper functions
+ */
+
+static int
+store_reply(sdb_conn_t *conn, int type, const char *name, int status)
+{
+       if (status < 0) {
+               sdb_strbuf_sprintf(conn->errbuf, "STORE: Failed to store %s object",
+                               SDB_STORE_TYPE_TO_NAME(type));
+               return -1;
+       }
+
+       if (! status) {
+               char msg[strlen(name) + 64];
+               snprintf(msg, sizeof(msg), "Successfully stored %s %s",
+                               SDB_STORE_TYPE_TO_NAME(type), name);
+               msg[sizeof(msg) - 1] = '\0';
+               sdb_connection_send(conn, SDB_CONNECTION_OK,
+                               (uint32_t)strlen(msg), msg);
+       }
+       else {
+               char msg[strlen(name) + 64];
+               snprintf(msg, sizeof(msg), "%s %s already up to date",
+                               SDB_STORE_TYPE_TO_NAME(type), name);
+               msg[0] = (char)toupper((int)msg[0]);
+               msg[sizeof(msg) - 1] = '\0';
+               sdb_connection_send(conn, SDB_CONNECTION_OK,
+                               (uint32_t)strlen(msg), msg);
+       }
+       return 0;
+} /* store_reply */
+
+/*
+ * public API
+ */
+
+int
+sdb_fe_store(sdb_conn_t *conn)
+{
+       uint32_t type;
+
+       const char *buf = sdb_strbuf_string(conn->buf);
+       size_t len = conn->cmd_len;
+       ssize_t n;
+
+       if ((! conn) || (conn->cmd != SDB_CONNECTION_STORE))
+               return -1;
+
+       if ((n = sdb_proto_unmarshal_int32(buf, len, &type)) < 0) {
+               sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %zu for "
+                               "STORE command", len);
+               sdb_strbuf_sprintf(conn->errbuf,
+                               "STORE: Invalid command length %zu", len);
+               return -1;
+       }
+       buf += n; len -= n;
+
+       switch (type) {
+               case SDB_HOST:
+               {
+                       sdb_proto_host_t host;
+                       if (sdb_proto_unmarshal_host(buf, len, &host) < 0) {
+                               sdb_strbuf_sprintf(conn->errbuf,
+                                               "STORE: Failed to unmarshal host object");
+                               return -1;
+                       }
+                       return sdb_fe_store_host(conn, &host);
+               }
+               case SDB_SERVICE:
+               {
+                       sdb_proto_service_t svc;
+                       if (sdb_proto_unmarshal_service(buf, len, &svc) < 0) {
+                               sdb_strbuf_sprintf(conn->errbuf,
+                                               "STORE: Failed to unmarshal service object");
+                               return -1;
+                       }
+                       return sdb_fe_store_service(conn, &svc);
+               }
+               case SDB_METRIC:
+               {
+                       sdb_proto_metric_t metric;
+                       if (sdb_proto_unmarshal_metric(buf, len, &metric) < 0) {
+                               sdb_strbuf_sprintf(conn->errbuf,
+                                               "STORE: Failed to unmarshal metric object");
+                               return -1;
+                       }
+                       return sdb_fe_store_metric(conn, &metric);
+               }
+               case SDB_ATTRIBUTE:
+               {
+                       sdb_proto_attribute_t attr;
+                       if (sdb_proto_unmarshal_attribute(buf, len, &attr) < 0) {
+                               sdb_strbuf_sprintf(conn->errbuf,
+                                               "STORE: Failed to unmarshal attribute object");
+                               return -1;
+                       }
+                       return sdb_fe_store_attribute(conn, &attr);
+               }
+       }
+
+       sdb_log(SDB_LOG_ERR, "frontend: Invalid object type %d for "
+                       "STORE COMMAND", type);
+       sdb_strbuf_sprintf(conn->errbuf, "STORE: Invalid object type %d", type);
+       return -1;
+} /* sdb_fe_store */
+
+int
+sdb_fe_store_host(sdb_conn_t *conn, const sdb_proto_host_t *host)
+{
+       if ((! conn) || (! host) || (! host->name))
+               return -1;
+
+       return store_reply(conn, SDB_HOST, host->name,
+                       sdb_store_host(host->name, host->last_update));
+} /* sdb_fe_store_host */
+
+int
+sdb_fe_store_service(sdb_conn_t *conn, const sdb_proto_service_t *svc)
+{
+       char name[svc ? strlen(svc->hostname) + strlen(svc->name) + 2 : 2];
+
+       if ((! conn) || (! svc) || (! svc->hostname) || (! svc->name))
+               return -1;
+
+       snprintf(name, sizeof(name), svc->hostname, svc->name);
+       return store_reply(conn, SDB_SERVICE, name,
+                       sdb_store_service(svc->hostname, svc->name, svc->last_update));
+} /* sdb_fe_store_service */
+
+int
+sdb_fe_store_metric(sdb_conn_t *conn, const sdb_proto_metric_t *metric)
+{
+       sdb_metric_store_t store;
+       char name[metric ? strlen(metric->hostname) + strlen(metric->name) + 2 : 2];
+
+       if ((! conn) || (! metric) || (! metric->hostname) || (! metric->name))
+               return -1;
+
+       store.type = metric->store_type;
+       store.id = metric->store_id;
+       snprintf(name, sizeof(name), metric->hostname, metric->name);
+       return store_reply(conn, SDB_METRIC, name,
+                       sdb_store_metric(metric->hostname, metric->name,
+                               &store, metric->last_update));
+} /* sdb_fe_store_metric */
+
+int
+sdb_fe_store_attribute(sdb_conn_t *conn, const sdb_proto_attribute_t *attr)
+{
+       char name[attr ? strlen(attr->parent) + strlen(attr->key) + 2 : 2];
+       int status;
+
+       if ((! conn) || (! attr) || (! attr->parent) || (! attr->key))
+               return -1;
+
+       if (attr->parent_type == SDB_HOST)
+               status = sdb_store_attribute(attr->parent,
+                               attr->key, &attr->value, attr->last_update);
+       else if (attr->parent_type == SDB_SERVICE)
+               status = sdb_store_service_attr(attr->hostname, attr->parent,
+                               attr->key, &attr->value, attr->last_update);
+       else if (attr->parent_type == SDB_METRIC)
+               status = sdb_store_metric_attr(attr->hostname, attr->parent,
+                               attr->key, &attr->value, attr->last_update);
+       else {
+               sdb_strbuf_sprintf(conn->errbuf,
+                               "STORE: Invalid parent object type %d",
+                               attr->parent_type);
+               return -1;
+       }
+
+       snprintf(name, sizeof(name), "%s.%s", attr->parent, attr->key);
+       return store_reply(conn, attr->parent_type | SDB_ATTRIBUTE, name, status);
+} /* sdb_fe_store_attribute */
+
+/* vim: set tw=78 sw=4 ts=4 noexpandtab : */
+

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 2253d55a417ed65f75a422c244810bbdd02e6f8f..a8208bf7d9a0a849e16c6316616af092e4b1e9b5 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -65,7 +65,11 @@ enum {
        (((t) == SDB_HOST) ? "host" \
                : ((t) == SDB_SERVICE) ? "service" \
                : ((t) == SDB_METRIC) ? "metric" \
-               : ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
+               : ((t) == SDB_ATTRIBUTE) ? "attribute" \
+               : ((t) == (SDB_ATTRIBUTE | SDB_HOST)) ? "host attribute" \
+               : ((t) == (SDB_ATTRIBUTE | SDB_SERVICE)) ? "service attribute" \
+               : ((t) == (SDB_ATTRIBUTE | SDB_METRIC)) ? "metric attribute" \
+               : "unknown")
 
 #define SDB_FIELD_TO_NAME(f) \
        (((f) == SDB_FIELD_NAME) ? "name" \

diff --git a/src/include/frontend/connection.h b/src/include/frontend/connection.h
index 906f906acbea436c5518dd84e798145a84b4d5ac..803a195e45c31c2233e4348556368ea8b88538b3 100644 (file)
--- a/src/include/frontend/connection.h
+++ b/src/include/frontend/connection.h
@@ -32,6 +32,7 @@
 #include "core/store.h"
 #include "utils/llist.h"
 #include "utils/strbuf.h"
+#include "utils/proto.h"
 
 #include <inttypes.h>
 
@@ -172,10 +173,10 @@ sdb_fe_session_start(sdb_conn_t *conn);
  */
 
 /*
- * sdb_fe_query, sdb_fe_fetch, sdb_fe_list, sdb_fe_lookup:
+ * sdb_fe_query, sdb_fe_fetch, sdb_fe_list, sdb_fe_lookup, sdb_fe_store:
  * Handle the SDB_CONNECTION_QUERY, SDB_CONNECTION_FETCH, SDB_CONNECTION_LIST,
- * and SDB_CONNECTION_LOOKUP commands respectively. It is expected that the
- * current command has been initialized already.
+ * SDB_CONNECTION_LOOKUP, and SDB_CONNECTION_STORE commands respectively. It
+ * is expected that the current command has been initialized already.
  *
  * Returns:
  *  - 0 on success
@@ -189,6 +190,8 @@ int
 sdb_fe_list(sdb_conn_t *conn);
 int
 sdb_fe_lookup(sdb_conn_t *conn);
+int
+sdb_fe_store(sdb_conn_t *conn);
 
 /*
  * sdb_fe_exec_fetch:
@@ -247,6 +250,24 @@ sdb_fe_exec_timeseries(sdb_conn_t *conn,
                const char *hostname, const char *metric,
                sdb_timeseries_opts_t *opts);
 
+/*
+ * sdb_fe_store_host, sdb_fe_store_service, sdb_fe_store_metric,
+ * sdb_fe_store_attribute:
+ * Execute the 'STORE' command for the respective object type.
+ *
+ * Returns:
+ *  - 0 on success
+ *  - a negative value else
+ */
+int
+sdb_fe_store_host(sdb_conn_t *conn, const sdb_proto_host_t *host);
+int
+sdb_fe_store_service(sdb_conn_t *conn, const sdb_proto_service_t *svc);
+int
+sdb_fe_store_metric(sdb_conn_t *conn, const sdb_proto_metric_t *metric);
+int
+sdb_fe_store_attribute(sdb_conn_t *conn, const sdb_proto_attribute_t *attr);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

diff --git a/src/include/utils/proto.h b/src/include/utils/proto.h
index df24278742227e1b845e23f20145ef194f141c14..b626781f9a1f70652bd0de5fa7a51455ff57c346 100644 (file)
--- a/src/include/utils/proto.h
+++ b/src/include/utils/proto.h
@@ -46,12 +46,14 @@ typedef struct {
        sdb_time_t last_update;
        const char *name;
 } sdb_proto_host_t;
+#define SDB_PROTO_HOST_INIT { 0, NULL }
 
 typedef struct {
        sdb_time_t last_update;
        const char *hostname;
        const char *name;
 } sdb_proto_service_t;
+#define SDB_PROTO_SERVICE_INIT { 0, NULL, NULL }
 
 typedef struct {
        sdb_time_t last_update;
@@ -60,6 +62,7 @@ typedef struct {
        const char *store_type; /* optional */
        const char *store_id;   /* optional */
 } sdb_proto_metric_t;
+#define SDB_PROTO_METRIC_INIT { 0, NULL, NULL, NULL, NULL }
 
 typedef struct {
        sdb_time_t last_update;
@@ -69,6 +72,7 @@ typedef struct {
        const char *key;
        sdb_data_t value;
 } sdb_proto_attribute_t;
+#define SDB_PROTO_ATTRIBUTE_INIT { 0, 0, NULL, NULL, NULL, SDB_DATA_INIT }
 
 /*
  * sdb_proto_marshal: