resource: Support waiting for reserved resources until available
Before this patch, almost everything was in place to support concurrent osmo-gsm-tester instances sharing a common state dir. However, during resource reservation, if the reservation couldn't be done due to too many resources being in use, osmo-gsm-tester would fail and skip the test suite. With this patch, OGT will wait until some reserved resources are released and then try requesting the reservation again. Change-Id: I938602ee890712fda82fd3f812d8edb1bcd05e08
This commit is contained in:
parent
998be6574b
commit
600c799ee0
|
|
@ -340,6 +340,7 @@ apt-get install \
|
|||
python3-yaml \
|
||||
python3-mako \
|
||||
python3-gi \
|
||||
python3-watchdog \
|
||||
locales
|
||||
----
|
||||
|
||||
|
|
|
|||
|
|
@ -116,6 +116,59 @@ cnf -: DBG: MAIN CONFIG:
|
|||
*** end: all resources
|
||||
|
||||
- request some resources
|
||||
--- testowner: Verifying 2 x arfcn (candidates: 10)
|
||||
--- testowner: DBG: Picked - _hash: e620569450f8259b3f0212ec19c285dd07df063c
|
||||
arfcn: '512'
|
||||
band: GSM-1800
|
||||
- _hash: 022621e513c5a5bf33b77430a1e9c886be676fa1
|
||||
arfcn: '514'
|
||||
band: GSM-1800
|
||||
--- testowner: Verifying 2 x bts (candidates: 3)
|
||||
--- testowner: DBG: Picked - _hash: d2aa7c1124943de352351b650ca0c751784da6b6
|
||||
addr: 10.42.42.114
|
||||
band: GSM-1800
|
||||
ciphers:
|
||||
- a5_0
|
||||
- a5_1
|
||||
direct_pcu: 'True'
|
||||
ipa_unit_id: '1'
|
||||
label: sysmoBTS 1002
|
||||
type: osmo-bts-sysmo
|
||||
- _hash: 2158317d5e0055070e7174c2498dedf53a2957e9
|
||||
addr: 10.42.42.50
|
||||
band: GSM-1800
|
||||
ciphers:
|
||||
- a5_0
|
||||
- a5_1
|
||||
ipa_unit_id: '6'
|
||||
label: Ettus B200
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'True'
|
||||
type: osmo-bts-trx
|
||||
--- testowner: Verifying 1 x ip_address (candidates: 5)
|
||||
--- testowner: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c
|
||||
addr: 10.42.42.2
|
||||
--- testowner: Verifying 2 x modem (candidates: 4)
|
||||
--- testowner: DBG: Picked - _hash: 0b538cb6ad799fbd7c2953fd3b4463a76c7cc9c0
|
||||
auth_algo: comp128v1
|
||||
ciphers:
|
||||
- a5_0
|
||||
- a5_1
|
||||
imsi: '901700000009031'
|
||||
ki: 80A37E6FDEA931EAC92FFA5F671EFEAD
|
||||
label: sierra_1
|
||||
path: /sierra_1
|
||||
- _hash: 3a6e7747dfe7dfdf817bd3351031bd08051605c3
|
||||
auth_algo: comp128v1
|
||||
ciphers:
|
||||
- a5_0
|
||||
- a5_1
|
||||
imsi: '901700000009029'
|
||||
ki: 00969E283349D354A8239E877F2E0866
|
||||
label: sierra_2
|
||||
path: /sierra_2
|
||||
--- testowner: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/resource_test/conf/test_work/state_dir
|
||||
--- testowner: Reserving 2 x arfcn (candidates: 10)
|
||||
--- testowner: DBG: Picked - _hash: e620569450f8259b3f0212ec19c285dd07df063c
|
||||
arfcn: '512'
|
||||
|
|
@ -168,6 +221,7 @@ cnf -: DBG: MAIN CONFIG:
|
|||
ki: 00969E283349D354A8239E877F2E0866
|
||||
label: sierra_2
|
||||
path: /sierra_2
|
||||
--- testowner: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/resource_test/conf/test_work/state_dir, is_recursive=False>
|
||||
~~~ currently reserved:
|
||||
arfcn:
|
||||
- _hash: e620569450f8259b3f0212ec19c285dd07df063c
|
||||
|
|
@ -290,3 +344,27 @@ resources(testowner)={'arfcn': [{'_hash': 'e620569450f8259b3f0212ec19c285dd07df0
|
|||
3rd subset should not match, pass
|
||||
3rd subset should not match, pass
|
||||
4th subset should not match, pass
|
||||
*** concurrent allocation:
|
||||
--- testowner1: Verifying 2 x arfcn (candidates: 10)
|
||||
--- testowner1: Verifying 2 x bts (candidates: 3)
|
||||
--- testowner1: Verifying 1 x ip_address (candidates: 5)
|
||||
--- testowner1: Verifying 2 x modem (candidates: 4)
|
||||
--- testowner1: Reserving 2 x arfcn (candidates: 10)
|
||||
--- testowner1: Reserving 2 x bts (candidates: 3)
|
||||
--- testowner1: Reserving 1 x ip_address (candidates: 5)
|
||||
--- testowner1: Reserving 2 x modem (candidates: 4)
|
||||
- 2nd instance reserve() start
|
||||
--- testowner2: Verifying 2 x arfcn (candidates: 10)
|
||||
--- testowner2: Verifying 2 x bts (candidates: 3)
|
||||
--- testowner2: Verifying 1 x ip_address (candidates: 5)
|
||||
--- testowner2: Verifying 2 x modem (candidates: 4)
|
||||
--- testowner2: Reserving 2 x arfcn (candidates: 8)
|
||||
--- testowner2: Reserving 2 x bts (candidates: 1)
|
||||
--- testowner2: Unable to reserve resources, too many currently reserved. Waiting until some are available again
|
||||
- 1st instance free()
|
||||
--- testowner2: Reserving 2 x arfcn (candidates: 10)
|
||||
--- testowner2: Reserving 2 x bts (candidates: 3)
|
||||
--- testowner2: Reserving 1 x ip_address (candidates: 5)
|
||||
--- testowner2: Reserving 2 x modem (candidates: 4)
|
||||
- 2nd instance reserve() done
|
||||
*** end: concurrent allocation
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ import sys
|
|||
import pprint
|
||||
import shutil
|
||||
import atexit
|
||||
import time
|
||||
import threading
|
||||
import _prep
|
||||
from osmo_gsm_tester.core import config, log, util, resource
|
||||
from osmo_gsm_tester.core.schema import generate_schemas
|
||||
|
|
@ -128,4 +130,26 @@ subset = { 'unordered_list_set': [4] }
|
|||
if not resource.item_matches(superset, subset):
|
||||
print('4th subset should not match, pass')
|
||||
|
||||
print('*** concurrent allocation:')
|
||||
origin1 = log.Origin(None, 'testowner1')
|
||||
origin2 = log.Origin(None, 'testowner2')
|
||||
# We disable dbg() for second thread since FileWatch output result is
|
||||
# non-deterministic, since sometimes 1 Modiffied event is triggered, sometimes 2.
|
||||
origin1.dbg = origin2.dbg = lambda obj, *messages, _src=3, **named_items: None
|
||||
resources2 = None
|
||||
def second_ogt_instance():
|
||||
# should block here until "resources" are freed.
|
||||
print('- 2nd instance reserve() start')
|
||||
resources2 = pool.reserve(origin2, config.replicate_times(want), config.replicate_times(modifiers))
|
||||
print('- 2nd instance reserve() done')
|
||||
resources2.free()
|
||||
resources = pool.reserve(origin1, config.replicate_times(want), config.replicate_times(modifiers))
|
||||
th = threading.Thread(target=second_ogt_instance)
|
||||
th.start()
|
||||
time.sleep(1.0)
|
||||
print('- 1st instance free()')
|
||||
resources.free()
|
||||
th.join()
|
||||
print('*** end: concurrent allocation')
|
||||
|
||||
# vim: expandtab tabstop=4 shiftwidth=4
|
||||
|
|
|
|||
|
|
@ -43,6 +43,57 @@ tst test_suite: DBG: {combining='resources'}
|
|||
tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite↪{combining_scenarios='resources'}]
|
||||
tst test_suite: DBG: {combining='modifiers'}
|
||||
tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite↪{combining_scenarios='modifiers'}]
|
||||
tst test_suite: Verifying 3 x bts (candidates: 6)
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- max_power_red: '3'
|
||||
nominal_power: '10'
|
||||
- max_power_red: '0'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- nominal_power: '10'
|
||||
- max_power_red: '1'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
|
||||
addr: 10.42.42.114
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '1'
|
||||
label: sysmoBTS 1002
|
||||
type: sysmo
|
||||
tst test_suite: Verifying 1 x ip_address (candidates: 3)
|
||||
tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
|
||||
addr: 10.42.42.1
|
||||
tst test_suite: Verifying 2 x modem (candidates: 16)
|
||||
tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
||||
imsi: '901700000007801'
|
||||
ki: D620F48487B1B782DA55DF6717F08FF9
|
||||
label: m7801
|
||||
path: /wavecom_0
|
||||
- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254
|
||||
imsi: '901700000007802'
|
||||
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
|
||||
label: m7802
|
||||
path: /wavecom_1
|
||||
tst test_suite: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/suite_test/test_work/state_dir
|
||||
tst test_suite: Reserving 3 x bts (candidates: 6)
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
|
|
@ -93,6 +144,7 @@ tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
|||
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
|
||||
label: m7802
|
||||
path: /wavecom_1
|
||||
tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False>
|
||||
|
||||
----------------------------------------------
|
||||
trial test_suite hello_world.py
|
||||
|
|
@ -204,6 +256,60 @@ tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT]
|
|||
tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite↪{combining_scenarios='modifiers'}] [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite↪{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]]
|
||||
tst test_suite: Verifying 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- max_power_red: '3'
|
||||
nominal_power: '10'
|
||||
- max_power_red: '0'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- nominal_power: '10'
|
||||
- max_power_red: '1'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
|
||||
addr: 10.42.42.114
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '1'
|
||||
label: sysmoBTS 1002
|
||||
type: sysmo
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 1 x ip_address (candidates: 3) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
|
||||
addr: 10.42.42.1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 2 x modem (candidates: 16) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
||||
imsi: '901700000007801'
|
||||
ki: D620F48487B1B782DA55DF6717F08FF9
|
||||
label: m7801
|
||||
path: /wavecom_0
|
||||
- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254
|
||||
imsi: '901700000007802'
|
||||
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
|
||||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/suite_test/test_work/state_dir [util.py:[LINENR]]
|
||||
tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
|
|
@ -257,6 +363,7 @@ tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
|||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]
|
||||
|
||||
----------------------------------------------
|
||||
trial test_suite hello_world.py
|
||||
|
|
@ -294,6 +401,60 @@ tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT]
|
|||
tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite↪{combining_scenarios='modifiers'}] [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite↪{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]]
|
||||
tst test_suite: Verifying 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- max_power_red: '3'
|
||||
nominal_power: '10'
|
||||
- max_power_red: '0'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- nominal_power: '10'
|
||||
- max_power_red: '1'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
|
||||
addr: 10.42.42.114
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '1'
|
||||
label: sysmoBTS 1002
|
||||
type: sysmo
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 1 x ip_address (candidates: 3) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
|
||||
addr: 10.42.42.1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 2 x modem (candidates: 16) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
||||
imsi: '901700000007801'
|
||||
ki: D620F48487B1B782DA55DF6717F08FF9
|
||||
label: m7801
|
||||
path: /wavecom_0
|
||||
- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254
|
||||
imsi: '901700000007802'
|
||||
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
|
||||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/suite_test/test_work/state_dir [util.py:[LINENR]]
|
||||
tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
|
|
@ -347,6 +508,7 @@ tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
|||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]
|
||||
|
||||
----------------------------------------------
|
||||
trial test_suite hello_world.py
|
||||
|
|
@ -380,6 +542,60 @@ tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT]
|
|||
tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite↪{combining_scenarios='modifiers'}] [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={bts=[{'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}]}, scenario='foo'} [test_suite↪{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]]
|
||||
tst test_suite: Verifying 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- max_power_red: '3'
|
||||
nominal_power: '10'
|
||||
- max_power_red: '0'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- nominal_power: '10'
|
||||
- max_power_red: '1'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
|
||||
addr: 10.42.42.114
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '1'
|
||||
label: sysmoBTS 1002
|
||||
type: sysmo
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 1 x ip_address (candidates: 3) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
|
||||
addr: 10.42.42.1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 2 x modem (candidates: 16) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
||||
imsi: '901700000007801'
|
||||
ki: D620F48487B1B782DA55DF6717F08FF9
|
||||
label: m7801
|
||||
path: /wavecom_0
|
||||
- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254
|
||||
imsi: '901700000007802'
|
||||
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
|
||||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/suite_test/test_work/state_dir [util.py:[LINENR]]
|
||||
tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
|
|
@ -433,6 +649,7 @@ tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
|||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]
|
||||
resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',
|
||||
'_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',
|
||||
'addr': '10.42.42.53',
|
||||
|
|
@ -516,6 +733,60 @@ tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT]
|
|||
tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite↪{combining_scenarios='modifiers'}] [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite↪{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]]
|
||||
tst test_suite: Verifying 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- max_power_red: '3'
|
||||
nominal_power: '10'
|
||||
- max_power_red: '0'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009
|
||||
addr: 10.42.42.53
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '7'
|
||||
label: sysmoCell 5000
|
||||
osmo_trx:
|
||||
clock_reference: external
|
||||
launch_trx: 'False'
|
||||
trx_ip: 10.42.42.112
|
||||
trx_list:
|
||||
- nominal_power: '10'
|
||||
- max_power_red: '1'
|
||||
nominal_power: '12'
|
||||
type: osmo-bts-trx
|
||||
- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9
|
||||
addr: 10.42.42.114
|
||||
band: GSM-1800
|
||||
ipa_unit_id: '1'
|
||||
label: sysmoBTS 1002
|
||||
type: sysmo
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 1 x ip_address (candidates: 3) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4
|
||||
addr: 10.42.42.1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: Verifying 2 x modem (candidates: 16) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
||||
imsi: '901700000007801'
|
||||
ki: D620F48487B1B782DA55DF6717F08FF9
|
||||
label: m7801
|
||||
path: /wavecom_0
|
||||
- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254
|
||||
imsi: '901700000007802'
|
||||
ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
|
||||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/suite_test/test_work/state_dir [util.py:[LINENR]]
|
||||
tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]]
|
||||
tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace
|
||||
addr: 10.42.42.53
|
||||
|
|
@ -569,6 +840,7 @@ tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f
|
|||
label: m7802
|
||||
path: /wavecom_1
|
||||
[resource.py:[LINENR]]
|
||||
tst test_suite: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]
|
||||
resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace',
|
||||
'_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]',
|
||||
'addr': '10.42.42.53',
|
||||
|
|
@ -662,10 +934,16 @@ tst suiteC: DBG: {combining='resources'} [suite.py:[LINENR]]
|
|||
tst {combining_scenarios='resources'}: DBG: {definition_conf={ip_address=[{'addr': '10.42.42.2'}]}} [suiteC↪{combining_scenarios='resources'}] [suite.py:[LINENR]]
|
||||
tst suiteC: DBG: {combining='modifiers'} [suite.py:[LINENR]]
|
||||
tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [suiteC↪{combining_scenarios='modifiers'}] [suite.py:[LINENR]]
|
||||
tst suiteC: Verifying 1 x ip_address (candidates: 3) [resource.py:[LINENR]]
|
||||
tst suiteC: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c
|
||||
addr: 10.42.42.2
|
||||
[resource.py:[LINENR]]
|
||||
tst suiteC: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/suite_test/test_work/state_dir [util.py:[LINENR]]
|
||||
tst suiteC: Reserving 1 x ip_address (candidates: 3) [resource.py:[LINENR]]
|
||||
tst suiteC: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c
|
||||
addr: 10.42.42.2
|
||||
[resource.py:[LINENR]]
|
||||
tst suiteC: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/suite_test/test_work/state_dir, is_recursive=False> [util.py:[LINENR]]
|
||||
|
||||
----------------------------------------------
|
||||
trial suiteC test_template_overlay.py
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ from . import log
|
|||
from . import config
|
||||
from . import util
|
||||
from . import schema
|
||||
from .event_loop import MainLoop
|
||||
|
||||
from .util import is_dict, is_list
|
||||
|
||||
|
|
@ -48,6 +49,7 @@ class ResourcesPool(log.Origin):
|
|||
_registered_exit_handler = False
|
||||
|
||||
def __init__(self):
|
||||
self.reserved_modified = False
|
||||
self.config_path = config.get_main_config_value(config.CFG_RESOURCES_CONF)
|
||||
self.state_dir = config.get_state_dir()
|
||||
super().__init__(log.C_CNF, conf=self.config_path, state=self.state_dir.path)
|
||||
|
|
@ -57,6 +59,11 @@ class ResourcesPool(log.Origin):
|
|||
self.all_resources = Resources(config.read(self.config_path, schema.get_resources_schema()) or {})
|
||||
self.all_resources.set_hashes()
|
||||
|
||||
# Used by FileWatch in reserve() method below
|
||||
def reserve_resources_fw_cb(self, event):
|
||||
if event.event_type == 'modified':
|
||||
self.reserved_modified = True
|
||||
|
||||
def reserve(self, origin, want, modifiers):
|
||||
'''
|
||||
attempt to reserve the resources specified in the dict 'want' for
|
||||
|
|
@ -94,18 +101,42 @@ class ResourcesPool(log.Origin):
|
|||
|
||||
origin_id = origin.origin_id()
|
||||
|
||||
with self.state_dir.lock(origin_id):
|
||||
rrfile_path = self.state_dir.mk_parentdir(RESERVED_RESOURCES_FILE)
|
||||
reserved = Resources(config.read(rrfile_path, if_missing_return={}))
|
||||
to_be_reserved = self.all_resources.without(reserved).find(origin, want)
|
||||
# Make sure wanted resources can ever be reserved, even if all
|
||||
# resources are unallocated. It will throw an exception if not
|
||||
# possible:
|
||||
self.all_resources.find(origin, want, None, False, True, 'Verifying')
|
||||
self.reserved_modified = True # go through on first attempt
|
||||
rrfile_path = self.state_dir.mk_parentdir(RESERVED_RESOURCES_FILE)
|
||||
fw = util.FileWatch(origin, rrfile_path, self.reserve_resources_fw_cb)
|
||||
fw.start()
|
||||
while True:
|
||||
# First, figure out if RESERVED_RESOURCES_FILE was modified since last time we checked:
|
||||
modified = False
|
||||
try:
|
||||
fw.get_lock().acquire()
|
||||
if self.reserved_modified:
|
||||
modified = True
|
||||
self.reserved_modified = False
|
||||
finally:
|
||||
fw.get_lock().release()
|
||||
|
||||
to_be_reserved.mark_reserved_by(origin_id)
|
||||
|
||||
reserved.add(to_be_reserved)
|
||||
config.write(rrfile_path, reserved)
|
||||
|
||||
self.remember_to_free(to_be_reserved)
|
||||
return ReservedResources(self, origin, to_be_reserved, modifiers)
|
||||
if modified: # file was modified, attempt to reserve resources
|
||||
# It should be possible at some point to reserve the wanted
|
||||
# resources, so try and wait for some to be released if it's not
|
||||
# possible to allocate them now:
|
||||
try:
|
||||
with self.state_dir.lock(origin_id):
|
||||
reserved = Resources(config.read(rrfile_path, if_missing_return={}))
|
||||
to_be_reserved = self.all_resources.without(reserved).find(origin, want)
|
||||
to_be_reserved.mark_reserved_by(origin_id)
|
||||
reserved.add(to_be_reserved)
|
||||
fw.stop()
|
||||
config.write(rrfile_path, reserved)
|
||||
self.remember_to_free(to_be_reserved)
|
||||
return ReservedResources(self, origin, to_be_reserved, modifiers)
|
||||
except NoResourceExn:
|
||||
origin.log('Unable to reserve resources, too many currently reserved. Waiting until some are available again')
|
||||
MainLoop.sleep(1)
|
||||
|
||||
def free(self, origin, to_be_freed):
|
||||
log.ctx(origin)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ import atexit
|
|||
import threading
|
||||
import importlib.util
|
||||
import subprocess
|
||||
from watchdog.observers import Observer
|
||||
from watchdog.events import FileSystemEventHandler
|
||||
|
||||
# This mirrors enum osmo_auth_algo in libosmocore/include/osmocom/crypt/auth.h
|
||||
# so that the index within the tuple matches the enum value.
|
||||
|
|
@ -302,6 +304,51 @@ class Dir():
|
|||
def __repr__(self):
|
||||
return self.path
|
||||
|
||||
class FileWatch(FileSystemEventHandler):
|
||||
def __init__(self, origin, watch_path, event_func):
|
||||
FileSystemEventHandler.__init__(self)
|
||||
self.origin = origin
|
||||
self.watch_path = watch_path
|
||||
self.event_func = event_func
|
||||
self.observer = Observer()
|
||||
self.watch = None
|
||||
self.mutex = threading.Lock()
|
||||
|
||||
def get_lock(self):
|
||||
return self.mutex
|
||||
|
||||
def start(self):
|
||||
dir = os.path.abspath(os.path.dirname(self.watch_path))
|
||||
self.origin.dbg('FileWatch: scheduling watch for directory %s' % dir)
|
||||
self.watch = self.observer.schedule(self, dir, recursive = False)
|
||||
self.observer.start()
|
||||
|
||||
def stop(self):
|
||||
if self.watch:
|
||||
self.origin.dbg('FileWatch: unscheduling watch %r' % self.watch)
|
||||
self.observer.unschedule(self.watch)
|
||||
self.watch = None
|
||||
if self.observer.is_alive():
|
||||
self.observer.stop()
|
||||
self.observer.join()
|
||||
|
||||
def __del__(self):
|
||||
self.stop()
|
||||
self.observer = None
|
||||
|
||||
# Override from FileSystemEventHandler
|
||||
def on_any_event(self, event):
|
||||
if event.is_directory:
|
||||
return None
|
||||
if os.path.abspath(event.src_path) != os.path.abspath(self.watch_path):
|
||||
return None
|
||||
self.origin.dbg('FileWatch: received event %r' % event)
|
||||
try:
|
||||
self.mutex.acquire()
|
||||
self.event_func(event)
|
||||
finally:
|
||||
self.mutex.release()
|
||||
|
||||
def touch_file(path):
|
||||
with open(path, 'a') as f:
|
||||
f.close()
|
||||
|
|
|
|||
Loading…
Reference in New Issue