Merge lp:~hloeung/ubuntu-repository-cache/show-status-metadata-sync-leader into lp:ubuntu-repository-cache

[Haw Loeung]

Update status msg showing current metadata sync leader

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~hloeung/ubuntu-repository-cache/show-status-metadata-sync-leader]

363. By Haw Loeung on 2022-08-01

Update status msg showing current metadata sync leader

364. By Haw Loeung on 2022-08-01

Include which unit is the metadata sync leader in status msg

[James Simpson (jsimpso)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 363

=== modified file 'reactive/ubuntu_repository_cache.py'
--- reactive/ubuntu_repository_cache.py	2022-07-25 00:19:34 +0000
+++ reactive/ubuntu_repository_cache.py	2022-08-01 01:25:54 +0000
@@ -85,6 +85,15 @@
 @reactive.when('ubuntu-repository-cache.started')
 @reactive.when_not('ubuntu-repository-cache.active', 'ubuntu-repository-cache.apache2-restart-required')
 def set_active(version_file='version'):
+    config = hookenv.config()
+
+    leader = ''
+    leader_unit = config['leader_unit']
+    if leader_unit == '':
+        leader_unit = hookenv.leader_get(attribute="leader_id")
+    if hookenv.local_unit() == leader_unit:
+        leader = ', metadata sync leader {}'.format(leader_unit)
+
     revision = ''
     if os.path.exists(version_file):
         with open(version_file) as f:
@@ -100,7 +109,8 @@
             revision = ' (source version/commit {}-{})'.format(date, ver)
         else:
             revision = ' (source version/commit {})'.format(ver)
-    status.active('Ready{}'.format(revision))
+
+    status.active('Ready{}{}'.format(leader, revision))
     reactive.set_flag('ubuntu-repository-cache.active')
 
 

=== modified file 'tests/unit/test_ubuntu_repository_cache.py'
--- tests/unit/test_ubuntu_repository_cache.py	2022-07-25 00:19:34 +0000
+++ tests/unit/test_ubuntu_repository_cache.py	2022-08-01 01:25:54 +0000
@@ -43,7 +43,7 @@
         patcher = mock.patch('charmhelpers.core.hookenv.local_unit')
         self.mock_local_unit = patcher.start()
         self.addCleanup(patcher.stop)
-        self.mock_local_unit.return_value = 'mock-ubuntu-repository-cache/0'
+        self.mock_local_unit.return_value = 'ubuntu-repository-cache/0'
 
         patcher = mock.patch('charmhelpers.core.hookenv.config')
         self.mock_config = patcher.start()
@@ -62,13 +62,36 @@
         if os.path.exists('.juju-persistent-config'):
             os.unlink('.juju-persistent-config')
 
+    @mock.patch('charmhelpers.core.hookenv.leader_get')
     @mock.patch('charms.reactive.set_flag')
-    def test_set_active(self, set_flag):
+    def test_set_active(self, set_flag, leader_get):
+        self.mock_config.return_value['leader_unit'] = ''
         ubuntu_repository_cache.set_active()
         status.active.assert_called_once_with('Ready')
         set_flag.assert_called_once_with('ubuntu-repository-cache.active')
 
         status.active.reset_mock()
+        self.mock_config.return_value['leader_unit'] = 'ubuntu-repository-cache/0'
+        ubuntu_repository_cache.set_active()
+        status.active.assert_called_once_with('Ready, metadata sync leader ubuntu-repository-cache/0')
+
+        status.active.reset_mock()
+        self.mock_config.return_value['leader_unit'] = ''
+        leader_get.return_value = 'ubuntu-repository-cache/0'
+        ubuntu_repository_cache.set_active()
+        status.active.assert_called_once_with('Ready, metadata sync leader ubuntu-repository-cache/0')
+        status.active.reset_mock()
+        self.mock_config.return_value['leader_unit'] = 'ubuntu-repository-cache/0'
+        # bzr - "revision-id: [e-mail]-20210131223324-uax4glwgttv0wftp"
+        ubuntu_repository_cache.set_active(os.path.join(self.charm_dir, 'tests/unit/files/version'))
+        status.active.assert_called_once_with(
+            'Ready, metadata sync leader ubuntu-repository-cache/0 (source version/commit 20210131-uax4glwg)'
+        )
+
+        self.mock_config.return_value['leader_unit'] = ''
+        leader_get.return_value = ''
+
+        status.active.reset_mock()
         # bzr - "revision-id: [e-mail]-20210131223324-uax4glwgttv0wftp"
         ubuntu_repository_cache.set_active(os.path.join(self.charm_dir, 'tests/unit/files/version'))
         status.active.assert_called_once_with('Ready (source version/commit 20210131-uax4glwg)')