Merge ~adam-collard/maas:received-pronunciation into maas:master

[Adam Collard]

Fix spelling of receiv{e,ed,ing}

[MAAS Lander (maas-lander)]

UNIT TESTS
-b received-pronunciation lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1086/consoleText
COMMIT: 74579b1350769cdbce0d595e47fa1298aa9d25c5

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b received-pronunciation lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 74579b1350769cdbce0d595e47fa1298aa9d25c5

review: Approve

diff --git a/src/maasserver/api/boot_resources.py b/src/maasserver/api/boot_resources.py
index bf2caee..6100c89 100644
--- a/src/maasserver/api/boot_resources.py
+++ b/src/maasserver/api/boot_resources.py
@@ -383,7 +383,7 @@ class BootResourceFileUploadHandler(OperationsHandler):
             raise MAASAPIBadRequest("Missing data.")
         if size != len(data):
             raise MAASAPIBadRequest(
-                "Content-Length doesn't equal size of recieved data."
+                "Content-Length doesn't equal size of received data."
             )
         if resource.rtype not in ALLOW_UPLOAD_RTYPES:
             raise MAASAPIForbidden(
@@ -399,7 +399,7 @@ class BootResourceFileUploadHandler(OperationsHandler):
             # than expected.
             current_size = stream.tell()
             if current_size + size > rfile.largefile.total_size:
-                raise MAASAPIBadRequest("Too much data recieved.")
+                raise MAASAPIBadRequest("Too much data received.")
 
             stream.write(data)
             rfile.largefile.size = current_size + size
diff --git a/src/maasserver/bootresources.py b/src/maasserver/bootresources.py
index 89e9c3a..90044ce 100644
--- a/src/maasserver/bootresources.py
+++ b/src/maasserver/bootresources.py
@@ -1187,7 +1187,7 @@ def download_all_boot_resources(
 
     This process is long running and can be triggered to be stopped through
     a postgres notification of `sys_stop_import`. When that notification is
-    recieved the running import will be stopped.
+    received the running import will be stopped.
 
     :param sources: List of dicts describing the Simplestreams sources from
         which we should download.
diff --git a/src/maasserver/rack_controller.py b/src/maasserver/rack_controller.py
index 3187868..4e6c883 100644
--- a/src/maasserver/rack_controller.py
+++ b/src/maasserver/rack_controller.py
@@ -178,7 +178,7 @@ class RackControllerService(Service):
         rack_id = int(rack_id)
 
         log.debug(
-            "[pid:{pid()}] recieved {action} action for rack: {rack_id}",
+            "[pid:{pid()}] received {action} action for rack: {rack_id}",
             pid=os.getpid,
             action=action,
             rack_id=rack_id,
@@ -191,7 +191,7 @@ class RackControllerService(Service):
                 )
             else:
                 log.warn(
-                    "[pid:{pid()}] recieved unwatched when not watching "
+                    "[pid:{pid()}] received unwatched when not watching "
                     "for rack: {rack_id}",
                     pid=os.getpid,
                     rack_id=rack_id,
@@ -205,7 +205,7 @@ class RackControllerService(Service):
                 )
             else:
                 log.warn(
-                    "[pid:{pid()}] recieved watched when already watching "
+                    "[pid:{pid()}] received watched when already watching "
                     "for rack: {rack_id}",
                     pid=os.getpid,
                     rack_id=rack_id,
@@ -248,7 +248,7 @@ class RackControllerService(Service):
             )
         else:
             log.warn(
-                "[pid:{pid()}] recieved DHCP push notify when not watching "
+                "[pid:{pid()}] received DHCP push notify when not watching "
                 "for rack: {rack_id}",
                 pid=os.getpid,
                 rack_id=rack_id,
@@ -302,7 +302,7 @@ class RackControllerService(Service):
                 log.info(
                     f"[pid:{os.getpid()}] watched rack is not in the DB, un-watching: {rack_id}"
                 )
-                # Note: since proper unwatch message might come later, "recieved unwatched when not watching"
+                # Note: since proper unwatch message might come later, "received unwatched when not watching"
                 # warning might show up.
                 self.watching.discard(rack_id)
             else:
diff --git a/src/maasserver/region_controller.py b/src/maasserver/region_controller.py
index 8302717..60397e8 100644
--- a/src/maasserver/region_controller.py
+++ b/src/maasserver/region_controller.py
@@ -8,19 +8,19 @@ This service is ran only on the master regiond process for a region controller.
 
 DNS:
     The regiond process listens for messages from Postgres on channel
-    'sys_dns'. Any time a message is recieved on that channel the DNS is marked
+    'sys_dns'. Any time a message is received on that channel the DNS is marked
     as requiring an update. Once marked for update the DNS configuration is
     updated and bind9 is told to reload.
 
 Proxy:
     The regiond process listens for messages from Postgres on channel
-    'sys_proxy'. Any time a message is recieved on that channel the maas-proxy
+    'sys_proxy'. Any time a message is received on that channel the maas-proxy
     is marked as requiring an update. Once marked for update the proxy
     configuration is updated and maas-proxy is told to reload.
 
 RBAC:
     The regiond process listens for messages from Postgres on channel
-    'sys_rbac'. Any time a message is recieved on that channel the RBAC
+    'sys_rbac'. Any time a message is received on that channel the RBAC
     micro-service is marked as required a sync. Once marked for sync the
     RBAC micro-service will be pushed the changed information.
 """
diff --git a/src/maasserver/regiondservices/syslog.py b/src/maasserver/regiondservices/syslog.py
index 086ab8c..9e50306 100644
--- a/src/maasserver/regiondservices/syslog.py
+++ b/src/maasserver/regiondservices/syslog.py
@@ -67,7 +67,7 @@ class RegionSyslogService(TimerService):
         else:
             if this_region.is_rack_controller:
                 # Region controller is also a rack controller, need to forward
-                # the recieved syslog message to the other region peers.
+                # the received syslog message to the other region peers.
                 peers = self._getPeers(this_region)
             else:
                 # Only a region controller, no need to forward logs.
diff --git a/src/maasserver/rpc/leases.py b/src/maasserver/rpc/leases.py
index 6016bc5..83a24d0 100644
--- a/src/maasserver/rpc/leases.py
+++ b/src/maasserver/rpc/leases.py
@@ -78,7 +78,7 @@ def update_lease(
         raise LeaseUpdateError("Unknown lease action: %s" % action)
 
     # Get the subnet for this IP address. If no subnet exists then something
-    # is wrong as we should not be recieving message about unknown subnets.
+    # is wrong as we should not be receiving message about unknown subnets.
     subnet = Subnet.objects.get_best_subnet_for_ip(ip)
     if subnet is None:
         raise LeaseUpdateError("No subnet exists for: %s" % ip)
@@ -111,7 +111,7 @@ def update_lease(
         )
     )
 
-    # We will recieve actions on all addresses in the subnet. We only want
+    # We will receive actions on all addresses in the subnet. We only want
     # to update the addresses in the dynamic range.
     dynamic_range = subnet.get_dynamic_range_for_ip(IPAddress(ip))
     if dynamic_range is None:
diff --git a/src/maasserver/rpc/regionservice.py b/src/maasserver/rpc/regionservice.py
index ebdea8a..757abc8 100644
--- a/src/maasserver/rpc/regionservice.py
+++ b/src/maasserver/rpc/regionservice.py
@@ -157,7 +157,7 @@ class Region(RPCProtocol):
 
         # Wait for the record to be handled. This will cause the cluster to
         # send one at a time. So they are processed in order no matter which
-        # region recieves the message.
+        # region receives the message.
         return d
 
     @amp.StartTLS.responder
diff --git a/src/maasserver/status_monitor.py b/src/maasserver/status_monitor.py
index 9a15ea0..5211991 100644
--- a/src/maasserver/status_monitor.py
+++ b/src/maasserver/status_monitor.py
@@ -177,7 +177,7 @@ def mark_nodes_failed_after_missing_script_timeout(now, node_timeout):
             # The node running the scripts checks if the script has run past
             # its time limit. The node will try to kill the script and move on
             # by signaling the region. If after 5 minutes past the timeout the
-            # region hasn't recieved the signal mark_failed and stop the node.
+            # region hasn't received the signal mark_failed and stop the node.
             script_expires = (
                 script_result.started + timeout + timedelta(minutes=5)
             )
diff --git a/src/metadataserver/api_twisted.py b/src/metadataserver/api_twisted.py
index 070e0c1..c5f3789 100644
--- a/src/metadataserver/api_twisted.py
+++ b/src/metadataserver/api_twisted.py
@@ -276,7 +276,7 @@ def _create_vmhost_for_deployment(node):
 
 
 class StatusWorkerService(TimerService):
-    """Service to update nodes from recieved status messages."""
+    """Service to update nodes from received status messages."""
 
     check_interval = 60  # Every second.
 
diff --git a/src/provisioningserver/rackdservices/lease_socket_service.py b/src/provisioningserver/rackdservices/lease_socket_service.py
index eff546e..e917637 100644
--- a/src/provisioningserver/rackdservices/lease_socket_service.py
+++ b/src/provisioningserver/rackdservices/lease_socket_service.py
@@ -1,7 +1,7 @@
 # Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Twisted service recieves lease information from the MAAS dhcpd.sock."""
+"""Twisted service receives lease information from the MAAS dhcpd.sock."""
 
 
 from collections import deque
@@ -28,7 +28,7 @@ def get_socket_path():
 
 
 class LeaseSocketService(Service, DatagramProtocol):
-    """Service for recieving lease information over MAAS dhcpd.sock."""
+    """Service for receiving lease information over MAAS dhcpd.sock."""
 
     # None, or a Deferred that will fire when the processor exits.
     done = None
diff --git a/src/provisioningserver/rpc/common.py b/src/provisioningserver/rpc/common.py
index 40e091f..34e8183 100644
--- a/src/provisioningserver/rpc/common.py
+++ b/src/provisioningserver/rpc/common.py
@@ -331,14 +331,14 @@ class RPCProtocol(amp.AMP):
 
     def _answerReceived(self, box):
         """
-        Override `_answerRecieved` to log recieving RPC response.
+        Override `_answerRecieved` to log receiving RPC response.
         """
-        log.debug("[RPC <- recieved] {box}", box=box)
+        log.debug("[RPC <- received] {box}", box=box)
         return super()._answerReceived(box)
 
     def _errorReceived(self, box):
         """
-        Override `_errorReceived` to log recieving RPC response.
+        Override `_errorReceived` to log receiving RPC response.
         """
         log.debug("[RPC <- error] {box}", box=box)
         return super()._errorReceived(box)