mon/mon.js

@@ -1608,7 +1608,7 @@ class Mon
                 }
             }
         }
-        return { inode_stats, seen_pools };
+        return inode_stats;
     }
 
     serialize_bigints(obj)
@@ -1634,7 +1634,7 @@ class Mon
         const timestamp = Date.now();
         const { object_counts, object_bytes } = this.sum_object_counts();
         let stats = this.sum_op_stats(timestamp, this.prev_stats);
-        let { inode_stats, seen_pools } = this.sum_inode_stats(
+        let inode_stats = this.sum_inode_stats(
             this.prev_stats ? this.prev_stats.inode_stats : null,
             timestamp, this.prev_stats ? this.prev_stats.timestamp : null
         );
@@ -1668,15 +1668,6 @@ class Mon
             }
         }
         for (const pool_id in this.state.pool.stats)
-        {
-            if (!seen_pools[pool_id])
-            {
-                txn.push({ requestDeleteRange: {
-                    key: b64(this.etcd_prefix+'/pool/stats/'+pool_id),
-                } });
-                delete this.state.pool.stats[pool_id];
-            }
-            else
         {
             const pool_stats = { ...this.state.pool.stats[pool_id] };
             this.serialize_bigints(pool_stats);
@@ -1685,7 +1676,6 @@ class Mon
                 value: b64(JSON.stringify(pool_stats)),
             } });
         }
-        }
         if (txn.length)
         {
             await this.etcd_call('/kv/txn', { success: txn }, this.config.etcd_mon_timeout, 0);

src/etcd_state_client.cpp

@@ -187,30 +187,22 @@ void etcd_state_client_t::add_etcd_url(std::string addr)
             check_addr = addr;
         if (pos == std::string::npos)
             addr += "/v3";
-        bool local = false;
         int i;
         for (i = 0; i < local_ips.size(); i++)
         {
             if (local_ips[i] == check_addr)
             {
-                local = true;
+                this->etcd_local.push_back(addr);
                 break;
             }
         }
-        auto & to = local ? this->etcd_local : this->etcd_addresses;
-        for (i = 0; i < to.size(); i++)
-        {
-            if (to[i] == addr)
-                break;
-        }
-        if (i >= to.size())
-            to.push_back(addr);
+        if (i >= local_ips.size())
+            this->etcd_addresses.push_back(addr);
     }
 }
 
 void etcd_state_client_t::parse_config(const json11::Json & config)
 {
-    this->etcd_local.clear();
     this->etcd_addresses.clear();
     if (config["etcd_address"].is_string())
     {