Merge lp:~therve/landscape-client/limit-network-data into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The way to count the number of items is a bit tricky. It will also won't push the older first, but I think it's fine.

[Kevin McDermott (bigkevmcd)]

+ max_free_space_items_to_exchange = 200

Am not sure this is the right name for a limit on network data :-)

Other than that, +1

review: Approve

[Kevin McDermott (bigkevmcd)]

It might be nice to make this generic... :-)

[lp:~therve/landscape-client/limit-network-data]

325. By Thomas Herve on 2011-04-14

Rename class variable

[Free Ekanayaka (free.ekanayaka)]

Cool, +1!

review: Approve

=== modified file 'landscape/monitor/networkactivity.py'
--- landscape/monitor/networkactivity.py	2010-09-20 20:53:24 +0000
+++ landscape/monitor/networkactivity.py	2011-04-14 10:32:33 +0000
@@ -21,6 +21,8 @@
     run_interval = 30
     _rollover_maxint = 0
 
+    max_network_items_to_exchange = 200
+
     def __init__(self, network_activity_file="/proc/net/dev",
                  create_time=time.time):
         self._source_file = network_activity_file
@@ -39,10 +41,19 @@
         self.call_on_accepted("network-activity", self.exchange, True)
 
     def create_message(self):
-        network_activity = self._network_activity
+        network_activity = {}
+        items = 0
+        for interface, data in list(self._network_activity.items()):
+            if data:
+                network_activity[interface] = []
+                while data and items < self.max_network_items_to_exchange:
+                    item = data.pop(0)
+                    network_activity[interface].append(item)
+                    items += 1
+                if items >= self.max_network_items_to_exchange:
+                    break
         if not network_activity:
             return
-        self._network_activity = {}
         return {"type": "network-activity", "activities": network_activity}
 
     def send_message(self, urgent):

=== modified file 'landscape/monitor/tests/test_networkactivity.py'
--- landscape/monitor/tests/test_networkactivity.py	2010-09-17 13:41:22 +0000
+++ landscape/monitor/tests/test_networkactivity.py	2011-04-14 10:32:33 +0000
@@ -10,8 +10,8 @@
     stats_template = """\
 Inter-|   Receive                           |  Transmit
  face |bytes    packets compressed multicast|bytes    packets errs drop fifo
-    lo:%(lo_in)d   %(lo_in_p)d       0         0       %(lo_out)d %(lo_out_p)d    0    0    0
-    eth0: %(eth0_in)d   12539      0     62  %(eth0_out)d   12579    0    0   0
+    lo:%(lo_in)d   %(lo_in_p)d   0     0   %(lo_out)d %(lo_out_p)d  0  0  0
+    eth0: %(eth0_in)d   12539    0     62  %(eth0_out)d   12579  0  0  0
     %(extra)s
 """
 
@@ -31,12 +31,12 @@
     def write_activity(self, lo_in=0, lo_out=0, eth0_in=0, eth0_out=0,
                         extra="", lo_in_p=0, lo_out_p=0, **kw):
         kw.update(dict(
-            lo_in = lo_in,
-            lo_out = lo_out,
-            lo_in_p = lo_in_p,
-            lo_out_p = lo_out_p,
-            eth0_in = eth0_in,
-            eth0_out = eth0_out,
+            lo_in=lo_in,
+            lo_out=lo_out,
+            lo_in_p=lo_in_p,
+            lo_out_p=lo_out_p,
+            eth0_in=eth0_in,
+            eth0_out=eth0_out,
             extra=extra))
         self.activity_file.seek(0, 0)
         self.activity_file.truncate()
@@ -188,3 +188,31 @@
     def test_config(self):
         """The network activity plugin is enabled by default."""
         self.assertIn("NetworkActivity", self.config.plugin_factories)
+
+    def test_limit_amount_of_items(self):
+        """
+        The network plugin doesn't send too many items at once in a single
+        network message, to not crush the server.
+        """
+        def extra(data):
+            result = ""
+            for i in range(50):
+                result += (
+"""eth%d: %d   12539      0     62  %d   12579    0    0   0\n    """
+                    % (i, data, data))
+            return result
+        for i in range(1, 10):
+            data = i * 1000
+            self.write_activity(lo_out=data, eth0_out=data, extra=extra(data))
+            self.plugin.run()
+            self.reactor.advance(self.monitor.step_size)
+        # We have created 408 items. It should be sent in 3 messages.
+        message = self.plugin.create_message()
+        items = sum(len(i) for i in message["activities"].values())
+        self.assertEqual(200, items)
+        message = self.plugin.create_message()
+        items = sum(len(i) for i in message["activities"].values())
+        self.assertEqual(200, items)
+        message = self.plugin.create_message()
+        items = sum(len(i) for i in message["activities"].values())
+        self.assertEqual(8, items)