Merge pull request #195 from martin-belanger/sticky

conf: Enable sticky-connections by default

Author: martin-belanger

NEWS.md

@@ -5,6 +5,7 @@
 - Fix issues with I/O controller connection audits
   - Eliminate pcie devices from list of I/O controller connections to audit
   - Add soaking timer to workaround race condition between kernel and user-space applications on "add" uevents. When the kernel adds a new nvme device (e.g. `/dev/nvme7`) and sends a "add" uevent to notify user-space applications, the attributes associated with that device (e.g. `/sys/class/nvme/nvme7/cntrltype`) may not be fully initialized which can lead `stacd` to dismiss a device that should get audited. 
+- Make `sticky-connections=enabled` the default (see `stacd.conf`) 
 
 ## Changes with release 1.1.5
 
@@ -32,7 +33,7 @@ stacd: Bug fix. Check that self._cfg_soak_tmr is not None before dereferencing i
 
 ## Changes with release 1.1.1
 
-Make `sticky-connections-disabled` by default
+Make `sticky-connections=disabled` the default (see `stacd.conf`) 
 
 ## Changes with release 1.1
 

doc/man/stacd.conf.xml

@@ -378,7 +378,7 @@
                             entries in <filename>stacd.conf</filename> have been removed.
                         </para>
 
-                        <formalpara><title>With <code>sticky-connections=disabled</code> (default)</title>
+                        <formalpara><title>With <code>sticky-connections=disabled</code></title>
                             <para>
                                 <code>stacd</code> immediately disconnects from
                                 a previously connected IOC if the response to a
@@ -411,7 +411,7 @@
                             </formalpara>
                         </formalpara>
 
-                        <formalpara><title>With <code>sticky-connections=enabled</code></title>
+                        <formalpara><title>With <code>sticky-connections=enabled (default)</code></title>
                             <para>
                                 <code>stacd</code> does not disconnect from IOCs
                                 when a DPLE is removed or a <literal>controller=</literal>

etc/stas/stacd.conf

@@ -202,8 +202,8 @@
 #
 #                     Type:    String
 #                     Range:   [disabled, enabled]
-#                     Default: disabled
-#sticky-connections=disabled
+#                     Default: enabled
+#sticky-connections=enabled
 
 [Controllers]
 # controller: I/O Controllers (IOC) are specified with this keyword.

staslib/conf.py

@@ -74,7 +74,7 @@ def __init__(self, conf_file='/dev/null'):
             ('Global', 'ignore-iface'): 'false',
             ('Global', 'ip-family'): 'ipv4+ipv6',
             ('Global', 'udev-rule'): 'enabled',
-            ('Global', 'sticky-connections'): 'disabled',
+            ('Global', 'sticky-connections'): 'enabled',
             ('Service Discovery', 'zeroconf'): 'enabled',
             ('Controllers', 'controller'): list(),
             ('Controllers', 'blacklist'): list(),

staslib/ctrl.py

@@ -61,7 +61,11 @@ def controller_id_dict(self) -> dict:
     def details(self) -> dict:
         '''@brief return detailed debug info about this controller'''
         details = super().details()
-        details.update(self._udev.get_attributes(self.device, ('hostid', 'hostnqn', 'model', 'serial')))
+        details.update(
+            self._udev.get_attributes(self.device,
+                                      ('hostid', 'hostnqn', 'model',
+                                       'serial', 'dctype', 'cntrltype'))
+        )
         return details
 
     def info(self) -> dict:

test/test-config.py

@@ -40,7 +40,7 @@ def test_config(self):
         self.assertFalse(service_conf.data_digest)
         self.assertTrue(service_conf.persistent_connections)
         self.assertTrue(service_conf.udev_rule_enabled)
-        self.assertFalse(service_conf.sticky_connections)
+        self.assertTrue(service_conf.sticky_connections)
         self.assertFalse(service_conf.ignore_iface)
         self.assertIn(6, service_conf.ip_family)
         self.assertNotIn(4, service_conf.ip_family)

test/test-controller.py

@@ -81,6 +81,8 @@ def test_get_device(self):
         self.assertEqual(
             controller.details(),
             {
+                'dctype': '',
+                'cntrltype': '',
                 'transport': 'tcp',
                 'traddr': '10.10.10.10',
                 'trsvcid': '8009',
@@ -99,6 +101,8 @@ def test_get_device(self):
         self.assertEqual(
             controller.info(),
             {
+                'dctype': '',
+                'cntrltype': '',
                 'transport': 'tcp',
                 'traddr': '10.10.10.10',
                 'trsvcid': '8009',