Merge ~bjornt/maas:no-power-check-events into maas:master

[Björn Tillenius]

LP: #1860619 - maasserver_event table grows without bounds

Don't emit an event for querying power and delete them from the
database. It's the only thing we can do for 2.8 to improve the situation
a bit at least.

Long-term we need to think about how to cull the event table
periodically, so that it can't grow too much.

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-power-check-events lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7583/console
COMMIT: 9f4013c21918afce7fb7e5a8d3e400b05eda50bb

review: Needs Fixing

diff --git a/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py b/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py
index 57403be..bd68cba 100644
--- a/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py
+++ b/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py
@@ -6,39 +6,37 @@ from logging import DEBUG
 
 from django.db import migrations
 
-from provisioningserver.events import EVENT_TYPES
-
 CHANGED_EVENTS_INFO_TO_DEBUG = [
-    EVENT_TYPES.NODE_POWERED_ON,
-    EVENT_TYPES.NODE_POWERED_OFF,
-    EVENT_TYPES.NODE_POWER_QUERIED,
-    EVENT_TYPES.NODE_PXE_REQUEST,
-    EVENT_TYPES.NODE_INSTALLATION_FINISHED,
-    EVENT_TYPES.NODE_CHANGED_STATUS,
-    EVENT_TYPES.REQUEST_NODE_START_COMMISSIONING,
-    EVENT_TYPES.REQUEST_NODE_ABORT_COMMISSIONING,
-    EVENT_TYPES.REQUEST_NODE_START_TESTING,
-    EVENT_TYPES.REQUEST_NODE_ABORT_TESTING,
-    EVENT_TYPES.REQUEST_NODE_OVERRIDE_FAILED_TESTING,
-    EVENT_TYPES.REQUEST_NODE_ABORT_DEPLOYMENT,
-    EVENT_TYPES.REQUEST_NODE_ACQUIRE,
-    EVENT_TYPES.REQUEST_NODE_ERASE_DISK,
-    EVENT_TYPES.REQUEST_NODE_ABORT_ERASE_DISK,
-    EVENT_TYPES.REQUEST_NODE_RELEASE,
-    EVENT_TYPES.REQUEST_NODE_MARK_FAILED,
-    EVENT_TYPES.REQUEST_NODE_MARK_BROKEN,
-    EVENT_TYPES.REQUEST_NODE_MARK_FIXED,
-    EVENT_TYPES.REQUEST_NODE_LOCK,
-    EVENT_TYPES.REQUEST_NODE_UNLOCK,
-    EVENT_TYPES.REQUEST_NODE_START_DEPLOYMENT,
-    EVENT_TYPES.REQUEST_NODE_START,
-    EVENT_TYPES.REQUEST_NODE_STOP,
-    EVENT_TYPES.REQUEST_NODE_START_RESCUE_MODE,
-    EVENT_TYPES.REQUEST_NODE_STOP_RESCUE_MODE,
-    EVENT_TYPES.REQUEST_CONTROLLER_REFRESH,
-    EVENT_TYPES.REQUEST_RACK_CONTROLLER_ADD_CHASSIS,
-    EVENT_TYPES.RACK_IMPORT_INFO,
-    EVENT_TYPES.REGION_IMPORT_INFO,
+    "NODE_POWERED_ON",
+    "NODE_POWERED_OFF",
+    "NODE_POWER_QUERIED",
+    "NODE_PXE_REQUEST",
+    "NODE_INSTALLATION_FINISHED",
+    "NODE_CHANGED_STATUS",
+    "REQUEST_NODE_START_COMMISSIONING",
+    "REQUEST_NODE_ABORT_COMMISSIONING",
+    "REQUEST_NODE_START_TESTING",
+    "REQUEST_NODE_ABORT_TESTING",
+    "REQUEST_NODE_OVERRIDE_FAILED_TESTING",
+    "REQUEST_NODE_ABORT_DEPLOYMENT",
+    "REQUEST_NODE_ACQUIRE",
+    "REQUEST_NODE_ERASE_DISK",
+    "REQUEST_NODE_ABORT_ERASE_DISK",
+    "REQUEST_NODE_RELEASE",
+    "REQUEST_NODE_MARK_FAILED",
+    "REQUEST_NODE_MARK_BROKEN",
+    "REQUEST_NODE_MARK_FIXED",
+    "REQUEST_NODE_LOCK",
+    "REQUEST_NODE_UNLOCK",
+    "REQUEST_NODE_START_DEPLOYMENT",
+    "REQUEST_NODE_START",
+    "REQUEST_NODE_STOP",
+    "REQUEST_NODE_START_RESCUE_MODE",
+    "REQUEST_NODE_STOP_RESCUE_MODE",
+    "REQUEST_CONTROLLER_REFRESH",
+    "REQUEST_RACK_CONTROLLER_ADD_CHASSIS",
+    "RACK_IMPORT_INFO",
+    "REGION_IMPORT_INFO",
 ]
 
 
diff --git a/src/maasserver/migrations/maasserver/0208_no_power_query_events.py b/src/maasserver/migrations/maasserver/0208_no_power_query_events.py
new file mode 100644
index 0000000..8494baf
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0208_no_power_query_events.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2020-01-14 21:55
+from __future__ import unicode_literals
+
+import collections
+
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.db import migrations
+from django.db.models import Count
+
+
+def delete_power_query_events(apps, schema_editor):
+    Event = apps.get_model("maasserver", "Event")
+    EventType = apps.get_model("maasserver", "EventType")
+    power_query_event_types = EventType.objects.filter(
+        name__in=["NODE_POWER_QUERIED_DEBUG", "NODE_POWER_QUERIED"]
+    )
+    power_query_events = Event.objects.filter(type__in=power_query_event_types)
+    power_query_events.delete()
+    power_query_event_types.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("maasserver", "0207_notification_dismissable")]
+
+    operations = [migrations.RunPython(delete_power_query_events)]
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index cde4250..7e867cd 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -5650,14 +5650,10 @@ class Node(CleanSave, TimestampedModel):
             power_error = (
                 response["error_msg"] if "error_msg" in response else None
             )
-            # Add event log for success or failure.
-            # Use power_error for failure message.
             if power_error is None:
-                message = "Power state queried: %s" % power_state
-                Event.objects.create_node_event(
-                    self,
-                    EVENT_TYPES.NODE_POWER_QUERIED,
-                    event_description=message,
+                log.debug(
+                    f"Power state queried for node {self.system_id}: "
+                    f"{power_state}"
                 )
             else:
                 Event.objects.create_node_event(
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index d27487f..d116e5c 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -9194,32 +9194,6 @@ class TestNode_PowerQuery(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @defer.inlineCallbacks
-    def test__creates_node_event_with_no_power_error(self):
-        node = yield deferToDatabase(
-            transactional(factory.make_Node), power_state=POWER_STATE.ON
-        )
-        mock_create_node_event = self.patch(Event.objects, "create_node_event")
-        mock_power_control = self.patch(node, "_power_control_node")
-        mock_power_control.return_value = defer.succeed(
-            {"state": POWER_STATE.ON}
-        )
-        observed_state = yield node.power_query()
-
-        self.assertEqual(POWER_STATE.ON, observed_state)
-        self.assertThat(
-            mock_power_control, MockCalledOnceWith(ANY, power_query, ANY)
-        )
-        self.assertThat(
-            mock_create_node_event,
-            MockCalledOnceWith(
-                node,
-                EVENT_TYPES.NODE_POWER_QUERIED,
-                event_description="Power state queried: %s" % POWER_STATE.ON,
-            ),
-        )
-
-    @wait_for_reactor
-    @defer.inlineCallbacks
     def test__creates_node_event_with_power_error(self):
         node = yield deferToDatabase(
             transactional(factory.make_Node), power_state=POWER_STATE.ERROR
diff --git a/src/provisioningserver/events.py b/src/provisioningserver/events.py
index 20566f2..1a1018a 100644
--- a/src/provisioningserver/events.py
+++ b/src/provisioningserver/events.py
@@ -52,8 +52,6 @@ class EVENT_TYPES:
     NODE_POWER_ON_FAILED = "NODE_POWER_ON_FAILED"
     NODE_POWER_OFF_FAILED = "NODE_POWER_OFF_FAILED"
     NODE_POWER_CYCLE_FAILED = "NODE_POWER_CYCLE_FAILED"
-    NODE_POWER_QUERIED = "NODE_POWER_QUERIED"
-    NODE_POWER_QUERIED_DEBUG = "NODE_POWER_QUERIED_DEBUG"
     NODE_POWER_QUERY_FAILED = "NODE_POWER_QUERY_FAILED"
     # PXE request event.
     NODE_PXE_REQUEST = "NODE_PXE_REQUEST"
@@ -201,12 +199,6 @@ EVENT_DETAILS = {
     EVENT_TYPES.NODE_POWER_CYCLE_FAILED: EventDetail(
         description="Failed to power cycle node", level=ERROR
     ),
-    EVENT_TYPES.NODE_POWER_QUERIED: EventDetail(
-        description="Queried node's BMC", level=DEBUG
-    ),
-    EVENT_TYPES.NODE_POWER_QUERIED_DEBUG: EventDetail(
-        description="Queried node's BMC", level=DEBUG
-    ),
     EVENT_TYPES.NODE_POWER_QUERY_FAILED: EventDetail(
         description="Failed to query node's BMC", level=WARN
     ),
diff --git a/src/provisioningserver/rpc/power.py b/src/provisioningserver/rpc/power.py
index bc8bde4..aac60e6 100644
--- a/src/provisioningserver/rpc/power.py
+++ b/src/provisioningserver/rpc/power.py
@@ -376,11 +376,8 @@ def get_power_state(system_id, hostname, power_type, context, clock=reactor):
 @inlineCallbacks
 def power_query_success(system_id, hostname, state):
     """Report a node that for which power querying has succeeded."""
-    message = "Power state queried: %s" % state
+    log.debug(f"Power state queried for node {system_id}: {state}")
     yield power_state_update(system_id, state)
-    yield send_node_event(
-        EVENT_TYPES.NODE_POWER_QUERIED_DEBUG, system_id, hostname, message
-    )
 
 
 @inlineCallbacks
diff --git a/src/provisioningserver/rpc/tests/test_power.py b/src/provisioningserver/rpc/tests/test_power.py
index bc7dd1f..d8a5575 100644
--- a/src/provisioningserver/rpc/tests/test_power.py
+++ b/src/provisioningserver/rpc/tests/test_power.py
@@ -789,26 +789,6 @@ class TestPowerQuery(MAASTestCase):
             ),
         )
 
-    def test_power_query_success_emits_event(self):
-        system_id = factory.make_name("system_id")
-        hostname = factory.make_name("hostname")
-        state = factory.make_name("state")
-        message = "Power state queried: %s" % state
-        SendEvent, _, io = self.patch_rpc_methods()
-        d = power.power_query_success(system_id, hostname, state)
-        # This blocks until the deferred is complete.
-        io.flush()
-        self.assertIsNone(extract_result(d))
-        self.assertThat(
-            SendEvent,
-            MockCalledOnceWith(
-                ANY,
-                type_name=EVENT_TYPES.NODE_POWER_QUERIED_DEBUG,
-                system_id=system_id,
-                description=message,
-            ),
-        )
-
     def test_get_power_state_queries_node(self):
         system_id = factory.make_name("system_id")
         hostname = factory.make_name("hostname")