projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d26115
)
ovs_stats: Do not create bridge if it has not be monitored.
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Mon, 3 Dec 2018 10:29:27 +0000
(17:29 +0700)
committer
Pavel Rochnyack
<pavel2000@ngs.ru>
Mon, 3 Dec 2018 10:29:27 +0000
(17:29 +0700)
src/ovs_stats.c
patch
|
blob
|
history
diff --git
a/src/ovs_stats.c
b/src/ovs_stats.c
index
d73b54d
..
24b9128
100644
(file)
--- a/
src/ovs_stats.c
+++ b/
src/ovs_stats.c
@@
-533,6
+533,20
@@
static bridge_list_t *ovs_stats_get_bridge(bridge_list_t *head,
return NULL;
}
return NULL;
}
+/* Check if bridge is configured to be monitored in config file */
+static int ovs_stats_is_monitored_bridge(const char *br_name) {
+ /* if no bridges are configured, return true */
+ if (g_monitored_bridge_list_head == NULL)
+ return 1;
+
+ /* check if given bridge exists */
+ if (ovs_stats_get_bridge(g_monitored_bridge_list_head, br_name) != NULL)
+ return 1;
+
+ return 0;
+}
+
+
/* Delete bridge */
static int ovs_stats_del_bridge(yajl_val bridge) {
const char *old[] = {"old", NULL};
/* Delete bridge */
static int ovs_stats_del_bridge(yajl_val bridge) {
const char *old[] = {"old", NULL};
@@
-585,6
+599,9
@@
static int ovs_stats_update_bridge(yajl_val bridge) {
if (!br_name || !YAJL_IS_STRING(br_name))
return 0;
if (!br_name || !YAJL_IS_STRING(br_name))
return 0;
+ if (!ovs_stats_is_monitored_bridge(YAJL_GET_STRING(br_name)))
+ return 0;
+
bridge_list_t *br =
ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name));
if (br == NULL) {
bridge_list_t *br =
ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name));
if (br == NULL) {
@@
-1122,19
+1139,6
@@
static void ovs_stats_initialize(ovs_db_t *pdb) {
OVS_DB_TABLE_CB_FLAG_DELETE);
}
OVS_DB_TABLE_CB_FLAG_DELETE);
}
-/* Check if bridge is configured to be monitored in config file */
-static int ovs_stats_is_monitored_bridge(const char *br_name) {
- /* if no bridges are configured, return true */
- if (g_monitored_bridge_list_head == NULL)
- return 1;
-
- /* check if given bridge exists */
- if (ovs_stats_get_bridge(g_monitored_bridge_list_head, br_name) != NULL)
- return 1;
-
- return 0;
-}
-
/* Delete all ports from port list */
static void ovs_stats_free_port_list(port_list_t *head) {
for (port_list_t *i = head; i != NULL;) {
/* Delete all ports from port list */
static void ovs_stats_free_port_list(port_list_t *head) {
for (port_list_t *i = head; i != NULL;) {
@@
-1280,9
+1284,6
@@
static int ovs_stats_plugin_read(__attribute__((unused)) user_data_t *ud) {
pthread_mutex_lock(&g_stats_lock);
for (bridge = g_bridge_list_head; bridge != NULL; bridge = bridge->next) {
pthread_mutex_lock(&g_stats_lock);
for (bridge = g_bridge_list_head; bridge != NULL; bridge = bridge->next) {
- if (!ovs_stats_is_monitored_bridge(bridge->name))
- continue;
-
for (port = g_port_list_head; port != NULL; port = port->next) {
if (port->br != bridge)
continue;
for (port = g_port_list_head; port != NULL; port = port->next) {
if (port->br != bridge)
continue;