X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvirt.c;h=93f9aee30d80bdb2427c3edd86191966326c9c19;hb=5903e6d5414b1a9580a63c29afff1788cec6c91e;hp=ae5a247c3f118ca5531311d09634bd2d3722ede9;hpb=9f9af17af0f568abf79b415473125f923be44a34;p=collectd.git diff --git a/src/virt.c b/src/virt.c index ae5a247c..93f9aee3 100644 --- a/src/virt.c +++ b/src/virt.c @@ -32,6 +32,7 @@ #include #include #include +#include /* Plugin name */ #define PLUGIN_NAME "virt" @@ -113,7 +114,13 @@ static int add_interface_device(struct lv_read_state *state, virDomainPtr dom, const char *path, const char *address, unsigned int number); +#define METADATA_VM_PARTITION_URI "http://ovirt.org/ovirtmap/tag/1.0" +#define METADATA_VM_PARTITION_ELEMENT "tag" +#define METADATA_VM_PARTITION_PREFIX "ovirtmap" + +#define BUFFER_MAX_LEN 256 #define PARTITION_TAG_MAX_LEN 32 + struct lv_read_instance { struct lv_read_state read_state; char tag[PARTITION_TAG_MAX_LEN]; @@ -127,7 +134,7 @@ struct lv_user_data { #define NR_INSTANCES_DEFAULT 1 #define NR_INSTANCES_MAX 128 -static size_t nr_instances = NR_INSTANCES_DEFAULT; +static int nr_instances = NR_INSTANCES_DEFAULT; static struct lv_user_data lv_read_user_data[NR_INSTANCES_MAX]; /* HostnameFormat. */ @@ -159,7 +166,7 @@ static enum if_field interface_format = if_name; /* Time that we last refreshed. */ static time_t last_refresh = (time_t)0; -static int refresh_lists(struct lv_read_state *state); +static int refresh_lists(struct lv_read_instance *inst); /* ERROR(...) macro for virterrors. */ #define VIRT_ERROR(conn, s) \ @@ -471,20 +478,25 @@ static int lv_config(const char *key, const char *value) { if (strcasecmp(key, "Instances") == 0) { char *eptr = NULL; - long val = strtol(value, &eptr, 10); - if (eptr == NULL || *eptr != '\0') + double val = strtod(value, &eptr); + + if (*eptr != '\0') { + ERROR(PLUGIN_NAME " plugin: Invalid value for Instances = '%s'", value); return 1; + } if (val <= 0) { ERROR(PLUGIN_NAME " plugin: Instances <= 0 makes no sense."); return 1; } if (val > NR_INSTANCES_MAX) { - ERROR(PLUGIN_NAME " plugin: Instances=%li > NR_INSTANCES_MAX=%i" + ERROR(PLUGIN_NAME " plugin: Instances=%f > NR_INSTANCES_MAX=%i" " use a lower setting or recompile the plugin.", val, NR_INSTANCES_MAX); return 1; } - nr_instances = (size_t)val; + + nr_instances = (int)val; + DEBUG(PLUGIN_NAME " plugin: configured %i instances", nr_instances); return 0; } @@ -492,16 +504,8 @@ static int lv_config(const char *key, const char *value) { return -1; } -static int lv_read(user_data_t *ud) { - time_t t; - struct lv_read_instance *inst = ud->data; - struct lv_read_state *state = &inst->read_state; - if (!inst) { - ERROR(PLUGIN_NAME " plugin: NULL userdata"); - return -1; - } - - if (inst->id == 0 && conn == NULL) { +static int lv_connect(void) { + if (conn == NULL) { /* `conn_string == NULL' is acceptable. */ conn = virConnectOpenReadOnly(conn_string); if (conn == NULL) { @@ -513,13 +517,33 @@ static int lv_read(user_data_t *ud) { } c_release(LOG_NOTICE, &conn_complain, PLUGIN_NAME " plugin: Connection established."); + return 0; +} + +static int lv_read(user_data_t *ud) { + time_t t; + struct lv_read_instance *inst = NULL; + struct lv_read_state *state = NULL; + + if (ud->data == NULL) { + ERROR(PLUGIN_NAME " plugin: NULL userdata"); + return -1; + } + + inst = ud->data; + state = &inst->read_state; + + if (inst->id == 0) { + if (lv_connect() < 0) + return -1; + } time(&t); /* Need to refresh domain or device lists? */ if ((last_refresh == (time_t)0) || ((interval > 0) && ((last_refresh + interval) <= t))) { - if (refresh_lists(state) != 0) { + if (refresh_lists(inst) != 0) { if (conn != NULL) virConnectClose(conn); conn = NULL; @@ -683,32 +707,146 @@ static int lv_read(user_data_t *ud) { static int lv_init_instance(size_t i, plugin_read_cb callback) { struct lv_user_data *lv_ud = &(lv_read_user_data[i]); - struct lv_read_instance *inst = &lv_ud->inst; + struct lv_read_instance *inst = &(lv_ud->inst); memset(lv_ud, 0, sizeof(*lv_ud)); ssnprintf(inst->tag, sizeof(inst->tag), "%s-%zu", PLUGIN_NAME, i); inst->id = i; - user_data_t *ud = &lv_ud->ud; + user_data_t *ud = &(lv_ud->ud); ud->data = inst; ud->free_func = NULL; - INFO(PLUGIN_NAME "plugin: reader %s initialized", inst->tag); + INFO(PLUGIN_NAME " plugin: reader %s initialized", inst->tag); return plugin_register_complex_read(NULL, inst->tag, callback, 0, ud); } +static void lv_clean_read_state(struct lv_read_state *state) { + free_block_devices(state); + free_interface_devices(state); + free_domains(state); +} + +static void lv_fini_instance(size_t i) { + struct lv_read_instance *inst = &(lv_read_user_data[i].inst); + struct lv_read_state *state = &(inst->read_state); + + lv_clean_read_state(state); + INFO(PLUGIN_NAME " plugin: reader %s finalized", inst->tag); +} + static int lv_init(void) { if (virInitialize() != 0) return -1; - for (size_t i = 0; i < nr_instances; ++i) + if (lv_connect() != 0) + return -1; + + DEBUG(PLUGIN_NAME " plugin: starting %i instances", nr_instances); + + for (int i = 0; i < nr_instances; ++i) lv_init_instance(i, lv_read); return 0; } -static int refresh_lists(struct lv_read_state *state) { +/* + * returns 0 on success and <0 on error + */ +static int lv_domain_get_tag(xmlXPathContextPtr xpath_ctx, const char *dom_name, + char *dom_tag) { + char xpath_str[BUFFER_MAX_LEN] = {'\0'}; + xmlXPathObjectPtr xpath_obj = NULL; + xmlNodePtr xml_node = NULL; + int ret = -1; + int err; + + err = xmlXPathRegisterNs(xpath_ctx, + (const xmlChar *)METADATA_VM_PARTITION_PREFIX, + (const xmlChar *)METADATA_VM_PARTITION_URI); + if (err) { + ERROR(PLUGIN_NAME " plugin: xmlXpathRegisterNs(%s, %s) failed on domain %s", + METADATA_VM_PARTITION_PREFIX, METADATA_VM_PARTITION_URI, dom_name); + goto done; + } + + ssnprintf(xpath_str, sizeof(xpath_str), "/domain/metadata/%s:%s/text()", + METADATA_VM_PARTITION_PREFIX, METADATA_VM_PARTITION_ELEMENT); + xpath_obj = xmlXPathEvalExpression((xmlChar *)xpath_str, xpath_ctx); + if (xpath_obj == NULL) { + ERROR(PLUGIN_NAME " plugin: xmlXPathEval(%s) failed on domain %s", + xpath_str, dom_name); + goto done; + } + + if (xpath_obj->type != XPATH_NODESET) { + ERROR(PLUGIN_NAME " plugin: xmlXPathEval(%s) unexpected return type %d " + "(wanted %d) on domain %s", + xpath_str, xpath_obj->type, XPATH_NODESET, dom_name); + goto done; + } + + /* + * from now on there is no real error, it's ok if a domain + * doesn't have the metadata partition tag. + */ + ret = 0; + if (xpath_obj->nodesetval == NULL || xpath_obj->nodesetval->nodeNr != 1) { + DEBUG(PLUGIN_NAME " plugin: xmlXPathEval(%s) return nodeset size=%i " + "expected=1 on domain %s", + xpath_str, + (xpath_obj->nodesetval == NULL) ? 0 : xpath_obj->nodesetval->nodeNr, + dom_name); + } else { + xml_node = xpath_obj->nodesetval->nodeTab[0]; + sstrncpy(dom_tag, (const char *)xml_node->content, PARTITION_TAG_MAX_LEN); + } + +done: + /* deregister to clean up */ + err = xmlXPathRegisterNs(xpath_ctx, + (const xmlChar *)METADATA_VM_PARTITION_PREFIX, NULL); + if (err) { + /* we can't really recover here */ + ERROR(PLUGIN_NAME + " plugin: deregistration of namespace %s failed for domain %s", + METADATA_VM_PARTITION_PREFIX, dom_name); + } + if (xpath_obj) + xmlXPathFreeObject(xpath_obj); + + return ret; +} + +static int is_known_tag(const char *dom_tag) { + for (int i = 0; i < nr_instances; ++i) + if (!strcmp(dom_tag, lv_read_user_data[i].inst.tag)) + return 1; + return 0; +} + +static int lv_instance_include_domain(struct lv_read_instance *inst, + const char *dom_name, + const char *dom_tag) { + if ((dom_tag[0] != '\0') && (strcmp(dom_tag, inst->tag) == 0)) + return 1; + + /* instance#0 will always be there, so it is in charge of extra duties */ + if (inst->id == 0) { + if (dom_tag[0] == '\0' || !is_known_tag(dom_tag)) { + DEBUG(PLUGIN_NAME " plugin#%s: refreshing domain %s " + "with unknown tag '%s'", + inst->tag, dom_name, dom_tag); + return 1; + } + } + + return 0; +} + +static int refresh_lists(struct lv_read_instance *inst) { + struct lv_read_state *state = &inst->read_state; int n; n = virConnectNumOfDomains(conn); @@ -717,6 +855,8 @@ static int refresh_lists(struct lv_read_state *state) { return -1; } + lv_clean_read_state(state); + if (n > 0) { int *domids; @@ -734,10 +874,6 @@ static int refresh_lists(struct lv_read_state *state) { return -1; } - free_block_devices(state); - free_interface_devices(state); - free_domains(state); - /* Fetch each domain and add it to the list, unless ignore. */ for (int i = 0; i < n; ++i) { virDomainPtr dom = NULL; @@ -746,6 +882,7 @@ static int refresh_lists(struct lv_read_state *state) { xmlDocPtr xml_doc = NULL; xmlXPathContextPtr xpath_ctx = NULL; xmlXPathObjectPtr xpath_obj = NULL; + char tag[PARTITION_TAG_MAX_LEN] = {'\0'}; dom = virDomainLookupByID(conn, domids[i]); if (dom == NULL) { @@ -763,11 +900,6 @@ static int refresh_lists(struct lv_read_state *state) { if (il_domains && ignorelist_match(il_domains, name) != 0) goto cont; - if (add_domain(state, dom) < 0) { - ERROR(PLUGIN_NAME " plugin: malloc failed."); - goto cont; - } - /* Get a list of devices for this domain. */ xml = virDomainGetXMLDesc(dom, 0); if (!xml) { @@ -784,6 +916,19 @@ static int refresh_lists(struct lv_read_state *state) { xpath_ctx = xmlXPathNewContext(xml_doc); + if (lv_domain_get_tag(xpath_ctx, name, tag) < 0) { + ERROR(PLUGIN_NAME " plugin: lv_domain_get_tag failed."); + goto cont; + } + + if (!lv_instance_include_domain(inst, name, tag)) + goto cont; + + if (add_domain(state, dom) < 0) { + ERROR(PLUGIN_NAME " plugin: malloc failed."); + goto cont; + } + /* Block devices. */ char *bd_xmlpath = "/domain/devices/disk/target[@dev]"; if (blockdevice_format == source) @@ -876,6 +1021,11 @@ static int refresh_lists(struct lv_read_state *state) { sfree(domids); } + DEBUG(PLUGIN_NAME " plugin#%s: refreshing" + " domains=%i block_devices=%i iface_devices=%i", + inst->tag, state->nr_domains, state->nr_block_devices, + state->nr_interface_devices); + return 0; } @@ -1018,11 +1168,8 @@ static int ignore_device_match(ignorelist_t *il, const char *domname, } static int lv_shutdown(void) { - for (size_t i = 0; i < nr_instances; ++i) { - struct lv_read_state *state = &(lv_read_user_data[i].inst.read_state); - free_block_devices(state); - free_interface_devices(state); - free_domains(state); + for (int i = 0; i < nr_instances; ++i) { + lv_fini_instance(i); } if (conn != NULL) @@ -1042,10 +1189,5 @@ static int lv_shutdown(void) { void module_register(void) { plugin_register_config(PLUGIN_NAME, lv_config, config_keys, NR_CONFIG_KEYS); plugin_register_init(PLUGIN_NAME, lv_init); - plugin_register_complex_read(NULL, PLUGIN_NAME, lv_read, 0, NULL); plugin_register_shutdown(PLUGIN_NAME, lv_shutdown); } - -/* - * vim: shiftwidth=4 tabstop=8 softtabstop=4 expandtab fdm=marker - */