From 9d6a34a8e4119aad4496be87f8d1b6a67d2c083b Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Thu, 18 Jul 2019 22:44:10 +0800 Subject: [PATCH 1/2] Show state name in state transition log This will show log like "State transition: init -> wait, ...", which is much straightforward than showing state number "state 1->2". Signed-off-by: Chenxiong Qi --- module_build_service/models.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/module_build_service/models.py b/module_build_service/models.py index 9d09c04e..ba3bc10b 100644 --- a/module_build_service/models.py +++ b/module_build_service/models.py @@ -785,9 +785,10 @@ class ModuleBuild(MBSBase): from module_build_service.monitor import builder_success_counter, builder_failed_counter - if INVERSE_BUILD_STATES[self.state] in ["done", "failed"]: + new_state_name = INVERSE_BUILD_STATES[self.state] + if new_state_name in ["done", "failed"]: self.time_completed = now - if INVERSE_BUILD_STATES[self.state] == "done": + if new_state_name == "done": builder_success_counter.inc() else: builder_failed_counter.labels(reason=failure_type).inc() @@ -799,7 +800,10 @@ class ModuleBuild(MBSBase): mbt = ModuleBuildTrace(state_time=now, state=self.state, state_reason=state_reason) self.module_builds_trace.append(mbt) - log.info("%r, state %r->%r" % (self, old_state, self.state)) + log.info( + "State transition: %r -> %r, %r", + INVERSE_BUILD_STATES[old_state], new_state_name, self) + if old_state != self.state: module_build_service.messaging.publish( service="mbs", From 4b1ab34c84d928d94be941642f16150c1afde3b4 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Thu, 18 Jul 2019 22:46:39 +0800 Subject: [PATCH 2/2] Log full modulemd in debug level in modules.wait handler A full modulemd is usually a loooon text. This change would be much easier for reading logs at INFO level only. Signed-off-by: Chenxiong Qi --- module_build_service/scheduler/handlers/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 63535658..cb3ae92f 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -316,7 +316,7 @@ def wait(config, db_session, msg): build_logs.start(db_session, build) log.info("Found build=%r from message" % build) - log.info("%r", build.modulemd) + log.debug("%r", build.modulemd) if build.state != msg.module_build_state: log.warning(