Merge lp:~therve/landscape-client/network-traffic-unmount-interface into lp:~landscape/landscape-client/trunk

[Thomas Herve]

[Free Ekanayaka (free.ekanayaka)]

Hi Thomas,

as discussed on IRC, I believe this works as long as the device is not unmounted and re-mounted during two subsequent plugin runs. Not sure if it's something we have to worry about.

[lp:~therve/landscape-client/network-traffic-unmount-interface]

295. By Thomas Herve on 2010-09-20

Disable rollover on 64 bits

[Jamu Kakar (jkakar)]

This looks fine to me, but comments would help explain some of the trickery going on, +1!

review: Approve

[Kevin McDermott (bigkevmcd)]

Like Jamu, I think this is fine to go, perhaps a timeline explaining what we do in each "problem" case might clarify the intent?

review: Approve

[lp:~therve/landscape-client/network-traffic-unmount-interface]

296. By Thomas Herve on 2010-09-20

Add comments.

=== modified file 'landscape/monitor/networkactivity.py'
--- landscape/monitor/networkactivity.py	2010-08-30 14:06:39 +0000
+++ landscape/monitor/networkactivity.py	2010-09-20 15:08:45 +0000
@@ -28,7 +28,8 @@
         # our last traffic sample for calculating a traffic delta
         self._last_activity = {}
         self._create_time = create_time
-        self._rollover_maxint = pow(2, 64) if is_64() else pow(2, 32)
+        # We don't rollover on 64 bits, as 16 exabytes is a lot.
+        self._rollover_maxint = 0 if is_64() else pow(2, 32)
 
     def register(self, registry):
         super(NetworkActivity, self).register(registry)
@@ -65,16 +66,22 @@
                 previous_out, previous_in = self._last_activity[interface]
                 delta_out = traffic["send_bytes"] - previous_out
                 delta_in = traffic["recv_bytes"] - previous_in
-                if not delta_out and not delta_in:
-                    continue
                 if delta_out < 0:
                     delta_out += self._rollover_maxint
                 if delta_in < 0:
                     delta_in += self._rollover_maxint
+                # If it's still zero or less, we discard the value. The next
+                # value will be compared to the current traffic, and
+                # hopefully things will catch up.
+                if delta_out <= 0 and delta_in <= 0:
+                    continue
 
                 yield interface, delta_out, delta_in
             self._last_activity[interface] = (
                 traffic["send_bytes"], traffic["recv_bytes"])
+        for interface in self._last_activity.keys():
+            if interface not in new_traffic:
+                del self._last_activity[interface]
 
     def run(self):
         """

=== modified file 'landscape/monitor/tests/test_networkactivity.py'
--- landscape/monitor/tests/test_networkactivity.py	2010-08-30 14:06:39 +0000
+++ landscape/monitor/tests/test_networkactivity.py	2010-09-20 15:08:45 +0000
@@ -20,8 +20,8 @@
         self.activity_file = open(self.makeFile(), "w+")
         self.write_activity()
         self.plugin = NetworkActivity(
-            network_activity_file = self.activity_file.name,
-            create_time = self.reactor.time)
+            network_activity_file=self.activity_file.name,
+            create_time=self.reactor.time)
         self.monitor.add(self.plugin)
 
     def tearDown(self):
@@ -38,6 +38,7 @@
             eth0_in = eth0_in,
             eth0_out = eth0_out,
             extra=extra))
+        self.activity_file.seek(0, 0)
         self.activity_file.truncate()
         self.activity_file.write(self.stats_template % kw)
         self.activity_file.flush()
@@ -50,7 +51,7 @@
         that messages are in the expected format and contain data with
         expected datatypes.
         """
-        plugin = NetworkActivity(create_time = self.reactor.time)
+        plugin = NetworkActivity(create_time=self.reactor.time)
         self.monitor.add(plugin)
         plugin.run()
         self.reactor.advance(self.monitor.step_size)
@@ -128,7 +129,7 @@
     def test_interface_temporarily_disappears(self):
         """
         When an interface is removed (ie usb hotplug) and then activated again
-        its delta will be retained.
+        its delta will not be retained, because the values may have been reset.
         """
         self.write_activity(extra="wlan0: 2222 0 0 0 2222 0 0 0 0")
         self.plugin.run()
@@ -137,11 +138,11 @@
         self.plugin.run()
         message = self.plugin.create_message()
         self.assertFalse(message)
-        self.write_activity(extra="wlan0: 3333 0 0 0 3333 0 0 0 0")
+        self.write_activity(extra="wlan0: 1000 0 0 0 1000 0 0 0 0")
         self.reactor.advance(self.monitor.step_size)
         self.plugin.run()
         message = self.plugin.create_message()
-        self.assertTrue(message)
+        self.assertFalse(message)
 
     def test_messaging_flushes(self):
         """