Merge ~cgrabowski/maas:fix_missing_localIdent_on_burst_connections into maas:master

[Christian Grabowski]

remove conditional to allow additional connections perform handshake

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_missing_localIdent_on_burst_connections lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1437197d57b9d779fd5554c6659b3b9ffb35f6ab

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/provisioningserver/rpc/clusterservice.py b/src/provisioningserver/rpc/clusterservice.py
index d9baf8d..32d5ad4 100644
--- a/src/provisioningserver/rpc/clusterservice.py
+++ b/src/provisioningserver/rpc/clusterservice.py
@@ -1139,16 +1139,6 @@ class ClusterClient(Cluster):
             self.transport.loseConnection()
             self.authenticated.set(None)
             self.ready.fail(RuntimeError("Service not running."))
-        elif self.eventloop in self.service.connections:
-            log.msg(
-                "Event-loop '%s' is already connected; "
-                "dropping connection." % self.ident
-            )
-            self.transport.loseConnection()
-            self.authenticated.set(None)
-            self.ready.fail(
-                KeyError("Event-loop '%s' already connected." % self.eventloop)
-            )
         else:
             return self.performHandshake().addCallbacks(
                 self.handshakeSucceeded, self.handshakeFailed
@@ -1275,7 +1265,7 @@ class ClusterClientService(TimerService):
             return self._tryUpdate().addCallback(call, self.getClient)
         except exceptions.AllConnectionsBusy:
             return self.connections.scale_up_connections().addCallback(
-                call, self.getClient
+                call, self.getClient, busy_ok=True
             )
 
     def getAllClients(self):
diff --git a/src/provisioningserver/rpc/tests/test_clusterservice.py b/src/provisioningserver/rpc/tests/test_clusterservice.py
index 04b7d66..cd15e04 100644
--- a/src/provisioningserver/rpc/tests/test_clusterservice.py
+++ b/src/provisioningserver/rpc/tests/test_clusterservice.py
@@ -1624,35 +1624,6 @@ class TestClusterClient(MAASTestCase):
             {client.eventloop: [client]},
         )
 
-    def test_disconnects_when_there_is_an_existing_connection(self):
-        client = self.make_running_client()
-
-        # Pretend that a connection already exists for this address.
-        client.service.connections.connections[client.eventloop] = [
-            sentinel.connection
-        ]
-
-        # Connect via an in-memory transport.
-        transport = StringTransportWithDisconnection()
-        transport.protocol = client
-        client.makeConnection(transport)
-
-        # authenticated was set to None to signify that authentication was not
-        # attempted.
-        self.assertIsNone(extract_result(client.authenticated.get()))
-        # ready was set with KeyError to signify that a connection to the
-        # same event-loop already existed.
-        self.assertRaises(KeyError, extract_result, client.ready.get())
-
-        # The connections list is unchanged because the new connection
-        # immediately disconnects.
-        self.assertEqual(
-            client.service.connections,
-            {client.eventloop: [sentinel.connection]},
-        )
-        self.assertFalse(client.connected)
-        self.assertIsNone(client.transport)
-
     def test_disconnects_when_service_is_not_running(self):
         client = self.make_running_client()
         client.service.running = False
diff --git a/src/provisioningserver/rpc/tests/test_connectionpool.py b/src/provisioningserver/rpc/tests/test_connectionpool.py
index 692d5e6..dc06bd4 100644
--- a/src/provisioningserver/rpc/tests/test_connectionpool.py
+++ b/src/provisioningserver/rpc/tests/test_connectionpool.py
@@ -8,6 +8,7 @@ from twisted.internet.endpoints import TCP6ClientEndpoint
 from twisted.internet.task import Clock
 
 from maastesting import get_testing_timeout
+from maastesting.factory import factory
 from maastesting.testcase import MAASTestCase, MAASTwistedRunTest
 from maastesting.twisted import extract_result
 from provisioningserver.rpc import connectionpool as connectionpoolModule
@@ -140,6 +141,37 @@ class TestConnectionPool(MAASTestCase):
             cp.scale_up_connections(),
         )
 
+    def test_scale_up_connections_registers_the_new_connection_with_the_region(
+        self,
+    ):
+        cp = ConnectionPool(Clock(), Mock(), max_conns=2)
+        eventloop = Mock()
+        address = (factory.make_ip_address(), 5240)
+        service = Mock()
+        connection1 = ClusterClient(address, eventloop, service)
+        connection2 = ClusterClient(address, eventloop, service)
+        connect = self.patch(cp, "connect")
+
+        def call_connectionMade(*args, **kwargs):
+            connection2.connectionMade()
+            return succeed(connection2)
+
+        connect.side_effect = call_connectionMade
+
+        authRegion = self.patch(connection2, "authenticateRegion")
+        authRegion.return_value = succeed(True)
+        register = self.patch(connection2, "registerRackWithRegion")
+
+        def set_ident(*args, **kwargs):
+            connection2.localIdent = factory.make_name()
+            return succeed(True)
+
+        register.side_effect = set_ident
+
+        cp[eventloop] = [connection1]
+        cp.scale_up_connections()
+        self.assertIsNotNone(connection2.localIdent)
+
     def test_get_connection(self):
         cp = ConnectionPool(Clock(), Mock(), max_idle_conns=2, max_conns=2)
         eventloops = [Mock() for _ in range(3)]