Merge pull request #10 from innogames/ndco_1856

Send wanted state instead of real state to pfctl_worker

Author: TuxPowered42

src/pfctl.cpp

@@ -238,9 +238,12 @@ bool pf_sync_table(string table, SyncedLbNode *synced_lb_nodes) {
   for (int i = 0; i < MAX_NODES; i++) {
     for (int proto = 0; proto < 2; proto++) {
       if (strlen(synced_lb_nodes[i].ip_address[proto]) &&
-          synced_lb_nodes[i].state == LbNodeState::STATE_UP &&
+          synced_lb_nodes[i].wanted_state == LbNodeState::STATE_UP &&
           synced_lb_nodes[i].admin_state == LbNodeAdminState::STATE_ENABLED) {
         want_set.insert(string(synced_lb_nodes[i].ip_address[proto]));
+        log(MessageType::MSG_INFO,
+            fmt::sprintf("pfctl: Wanted node %s",
+                         synced_lb_nodes[i].ip_address[proto]));
       }
     }
   }

src/pfctl_worker.cpp

@@ -175,9 +175,18 @@ bool send_message(message_queue *mq, string pool_name, string table_name,
     // as the later one includes calculation of min_ and max_nodes and
     // backup_pools.
     if (up_lb_nodes.count(lb_node)) {
-      msg.synced_lb_nodes[lb_node_index].state = LbNodeState::STATE_UP;
+      log(MessageType::MSG_INFO, lb_node,
+          fmt::sprintf(
+              "Syncing lb_node with wanted state up admin_state %s state %s",
+              lb_node->get_admin_state_string(), lb_node->get_state_string()));
+      msg.synced_lb_nodes[lb_node_index].wanted_state = LbNodeState::STATE_UP;
     } else {
-      msg.synced_lb_nodes[lb_node_index].state = lb_node->state;
+      log(MessageType::MSG_INFO, lb_node,
+          fmt::sprintf("Syncing lb_node with wanted state down "
+                       "admin_state %s state %s",
+                       lb_node->get_admin_state_string(),
+                       lb_node->get_state_string()));
+      msg.synced_lb_nodes[lb_node_index].wanted_state = LbNodeState::STATE_DOWN;
     }
 
     // Pass information on if node is to be removed with or without killing

src/pfctl_worker.h

@@ -31,7 +31,7 @@ bool send_message(message_queue *mq, string pool_name, string table_name,
                   set<LbNode *> all_lb_nodes, set<LbNode *> up_lb_nodes);
 
 typedef struct {
-  LbNodeState state;            // To add or remove LB Node from table.
+  LbNodeState wanted_state;     // To add or remove LB Node from table.
   LbNodeAdminState admin_state; // How to remove LB Node from table.
   // IPv4 and IPv6 addresses.
   char ip_address[2][ADDR_LEN];