Remove workers from primary node to split responsibilities

Author: lvoytek

charmcraft.yaml

@@ -94,6 +94,6 @@ config:
       type: boolean
     workers:
       description: |
-        The number of git-ubuntu worker processes to maintain.
+        The number of git-ubuntu worker processes to maintain per secondary node.
       default: 2
       type: int

src/charm.py

@@ -233,10 +233,7 @@ def _refresh_importer_node(self) -> None:
         if self._is_primary:
             if not node.setup_primary_node(
                 GIT_UBUNTU_USER_HOME_DIR,
-                self._node_id,
-                self._num_workers,
                 GIT_UBUNTU_SYSTEM_USER_USERNAME,
-                will_publish,
                 self._controller_port,
             ):
                 self.unit.status = ops.BlockedStatus("Failed to install git-ubuntu services.")

src/importer_node.py

@@ -57,38 +57,21 @@ def setup_secondary_node(
 
 def setup_primary_node(
     git_ubuntu_user_home: str,
-    node_id: int,
-    num_workers: int,
     system_user: str,
-    push_to_lp: bool,
     primary_port: int,
 ) -> bool:
-    """Set up necessary services for a primary git-ubuntu importer node.
+    """Set up poller and broker services to create a primary git-ubuntu importer node.
 
     Args:
         git_ubuntu_user_home: The home directory of the git-ubuntu user.
-        node_id: The unique ID of this node.
-        num_workers: The number of worker instances to set up.
         system_user: The user + group to run the services as.
-        push_to_lp: True if publishing repositories to Launchpad.
         primary_port: The network port used for worker assignments.
 
     Returns:
         True if installation succeeded, False otherwise.
     """
     services_folder = pathops.LocalPath(git_ubuntu_user_home, "services")
 
-    if not setup_secondary_node(
-        git_ubuntu_user_home,
-        node_id,
-        num_workers,
-        system_user,
-        push_to_lp,
-        primary_port,
-        "127.0.0.1",
-    ):
-        return False
-
     # Setup broker service.
     if not git_ubuntu.setup_broker_service(
         services_folder.as_posix(),

tests/integration/test_charm.py

@@ -67,18 +67,19 @@ def get_services_dict(unit_name: str, juju: jubilant.Juju) -> dict[str, dict[str
                 == "git-ubuntu importer service poller"
             )
 
-        node_id = int(unit_name.split("/")[-1])
+        else:
+            node_id = int(unit_name.split("/")[-1])
 
-        assert services[f"git-ubuntu-importer-service-worker{node_id}_0.service"]["active"]
-        assert (
-            services[f"git-ubuntu-importer-service-worker{node_id}_0.service"]["description"]
-            == "git-ubuntu importer service worker"
-        )
-        assert services[f"git-ubuntu-importer-service-worker{node_id}_1.service"]["active"]
-        assert (
-            services[f"git-ubuntu-importer-service-worker{node_id}_1.service"]["description"]
-            == "git-ubuntu importer service worker"
-        )
+            assert services[f"git-ubuntu-importer-service-worker{node_id}_0.service"]["active"]
+            assert (
+                services[f"git-ubuntu-importer-service-worker{node_id}_0.service"]["description"]
+                == "git-ubuntu importer service worker"
+            )
+            assert services[f"git-ubuntu-importer-service-worker{node_id}_1.service"]["active"]
+            assert (
+                services[f"git-ubuntu-importer-service-worker{node_id}_1.service"]["description"]
+                == "git-ubuntu importer service worker"
+            )
 
 
 def test_installed_apps(app: str, juju: jubilant.Juju):

tests/unit/test_importer_node.py

@@ -37,19 +37,14 @@ def test_setup_secondary_node_failure(mock_setup_worker):
 
 @patch("importer_node.git_ubuntu.setup_poller_service")
 @patch("importer_node.git_ubuntu.setup_broker_service")
-@patch("importer_node.setup_secondary_node")
-def test_setup_primary_node_success(mock_secondary, mock_broker, mock_poller):
+def test_setup_primary_node_success(mock_broker, mock_poller):
     """Test successful primary node setup."""
-    mock_secondary.return_value = True
     mock_broker.return_value = True
     mock_poller.return_value = True
 
-    result = importer_node.setup_primary_node(
-        "/var/local/git-ubuntu", 1, 2, "git-ubuntu", True, 1692
-    )
+    result = importer_node.setup_primary_node("/var/local/git-ubuntu", "git-ubuntu", 1692)
 
     assert result is True
-    mock_secondary.assert_called_once()
     mock_broker.assert_called_once()
     mock_poller.assert_called_once()
 
@@ -59,9 +54,7 @@ def test_setup_primary_node_secondary_failure(mock_secondary):
     """Test primary node setup with secondary failure."""
     mock_secondary.return_value = False
 
-    result = importer_node.setup_primary_node(
-        "/var/local/git-ubuntu", 1, 2, "git-ubuntu", True, 1692
-    )
+    result = importer_node.setup_primary_node("/var/local/git-ubuntu", "git-ubuntu", 1692)
 
     assert result is False
 
@@ -73,9 +66,7 @@ def test_setup_primary_node_broker_failure(mock_secondary, mock_broker):
     mock_secondary.return_value = True
     mock_broker.return_value = False
 
-    result = importer_node.setup_primary_node(
-        "/var/local/git-ubuntu", 1, 2, "git-ubuntu", True, 1692
-    )
+    result = importer_node.setup_primary_node("/var/local/git-ubuntu", "git-ubuntu", 1692)
 
     assert result is False
 
@@ -89,9 +80,7 @@ def test_setup_primary_node_poller_failure(mock_secondary, mock_broker, mock_pol
     mock_broker.return_value = True
     mock_poller.return_value = False
 
-    result = importer_node.setup_primary_node(
-        "/var/local/git-ubuntu", 1, 2, "git-ubuntu", True, 1692
-    )
+    result = importer_node.setup_primary_node("/var/local/git-ubuntu", "git-ubuntu", 1692)
 
     assert result is False