osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42285?usp=email )
Change subject: hlr: pyhss: run the pyhss_hss service ......................................................................
hlr: pyhss: run the pyhss_hss service
Database preparations used to be done in PyHSS by all services if they noticed that this was needed. The time between checking and creating the tables caused a race condition where two services attempting to create tables at the same time will result at one of them failing, we have seen this in our ttcn3-hlr-test-pyhss jobs sometimes:
[Database] [DEBUG] Table apn already exists [Database] [DEBUG] Table auc already exists [Database] [DEBUG] Table subscriber already exists … [testenv][pyhss] pyhss_gsup: setup script failed
I have fixed this upstream by letting only the main service (pyhss_hss) prepare the database: https://github.com/nickvsnetworking/pyhss/commit/8b8a2202c345fbb7262c9d07d03...
This means that we now need to run the pyhss_hss service in the HLR tests, so pyhss_gsup doesn't fail with:
[Database] [INFO] Waiting for the main service to prepare the database ERROR: 127.0.0.1:4222 did not become available within 5s! [testenv][pyhss] pyhss_gsup: setup script failed
Change-Id: I4fe689c8d8617432175ba403b45021c0f646970b --- M hlr/testenv_pyhss.cfg 1 file changed, 5 insertions(+), 0 deletions(-)
Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
diff --git a/hlr/testenv_pyhss.cfg b/hlr/testenv_pyhss.cfg index 7a70872..2e81987 100644 --- a/hlr/testenv_pyhss.cfg +++ b/hlr/testenv_pyhss.cfg @@ -10,6 +10,11 @@ package=no copy=pyhss/redis.conf
+[pyhss_hss] +program=cd ../pyhss_gsup && ./run_in_venv.sh pyhss_hss +make=pyhss +package=pyhss + [pyhss_gsup] program=./run_in_venv.sh pyhss_gsup setup=wait_for_port.py -p 4222