From b3c3c5a71edcde07e46b7bb9f76bf821bb9f5bdc Mon Sep 17 00:00:00 2001 From: Victor Romano Date: Wed, 30 Nov 2022 16:56:58 -0300 Subject: [PATCH] Increase SM rabbit enable timeout On DC with central cloud as standard, sometimes occurs that RabbitMQ doesn't start properly and keeps restarting by sm. Part of the solution is increasing the startup time from 60 to 90, so the sm doesn't restart the service before the service is being initialized. This, alongside [1], fixes the problem. Test Plan: PASS - Run sm-restart service rabbit successfully check rabbit was running as expected. This test was used to recreate the bug. PASS - Reboot the host successfully and check rabbit was running as expected. PASS - Lock/unlock and check if rabbit was running as expected. Regression test: PASS - Install and bootstrap DC PASS - Install and bootstrap DX [1] https://review.opendev.org/c/starlingx/config-files/+/865693 Closes-bug: 1997966 Signed-off-by: Victor Romano Change-Id: I1425324c72ae41c66558709dead6f1ff92a3230a --- service-mgmt/sm-db/database/create_sm_db.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service-mgmt/sm-db/database/create_sm_db.sql b/service-mgmt/sm-db/database/create_sm_db.sql index 1c8a7fb7..809176da 100644 --- a/service-mgmt/sm-db/database/create_sm_db.sql +++ b/service-mgmt/sm-db/database/create_sm_db.sql @@ -379,7 +379,7 @@ INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','enable','ocf-script','heartbeat INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','disable','ocf-script','heartbeat','pgsql','stop','',1,1,1,60,''); INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','audit-enabled','ocf-script','heartbeat','pgsql','monitor','',2,2,2,60,30); INSERT INTO "SERVICE_ACTIONS" VALUES('postgres','audit-disabled','ocf-script','heartbeat','pgsql','monitor','',0,0,0,60,30); -INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','enable','ocf-script','rabbitmq','stx.rabbitmq-server','start','',2,2,2,60,20); +INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','enable','ocf-script','rabbitmq','stx.rabbitmq-server','start','',2,2,2,90,20); INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','disable','ocf-script','rabbitmq','stx.rabbitmq-server','stop','',1,1,1,60,20); INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','audit-enabled','ocf-script','rabbitmq','stx.rabbitmq-server','monitor','',2,2,2,30,20); INSERT INTO "SERVICE_ACTIONS" VALUES('rabbit','audit-disabled','ocf-script','rabbitmq','stx.rabbitmq-server','monitor','',0,0,0,15,20);