p_usrloc: new parameter "mdb_availability_control" has been created. #1529
Conversation
|
@lbalaceanu - any comments on this patch? |
src/modules/p_usrloc/p_usrloc_mod.c
Outdated
| @@ -307,6 +309,13 @@ static int mod_init(void) | |||
| } | |||
| #endif | |||
|
|
|||
| if((write_on_master_db_shared = shm_malloc(sizeof(dbm_write_t))) == NULL) { | |||
There was a problem hiding this comment.
Make sure to shm_free this allocated memory.
There was a problem hiding this comment.
The parameter will be created once at the beginning of mod_init and used so long as the process runs, therefore i haven't freed it.
src/modules/p_usrloc/p_usrloc_mod.h
Outdated
| @@ -123,5 +123,11 @@ extern int connection_expires; | |||
| extern int alg_location; | |||
|
|
|||
| extern int max_loc_nr; | |||
| typedef struct dbm_write { | |||
There was a problem hiding this comment.
Structure name must be a noun. Start with sth like mdb_
There was a problem hiding this comment.
has been changed with "db_shared_param".
| @@ -96,7 +96,10 @@ void check_dbs(unsigned int ticks, void *param){ | |||
| ul_db_handle_list_t * tmp2, * new_element; | |||
| int found; | |||
| int i; | |||
|
|
|||
|
|
|||
| if(mdb_availability_control) { | |||
There was a problem hiding this comment.
mdb_availability_control is also checked inside check_master_db() function.
There was a problem hiding this comment.
correct, i m removing the one inside the check_master_db() function.
src/modules/p_usrloc/ul_db_watch.c
Outdated
| @@ -149,6 +152,25 @@ void check_dbs(unsigned int ticks, void *param){ | |||
| lock_release(list_lock); | |||
| } | |||
|
|
|||
| void check_master_db(int dbm_write_default) { | |||
| if(mdb_availability_control) { | |||
| if(mdb.write.dbh){ | |||
There was a problem hiding this comment.
Is it necessary to close the connection each time when verifying it?
There was a problem hiding this comment.
There is unfortunately no other function other than "db_init_f init;" that could be used to check if the master db is available. Therefore each time a new mdb handler is created from the scratch and this requires first closing the existing mdb handler.
| @@ -677,6 +677,26 @@ modparam("usrloc", "db_update_as_insert", 1) | |||
| ... | |||
| modparam("p_usrloc", "default_db_url", "mysql://ser:ser@localhost/ser") | |||
| ... | |||
| </programlisting> | |||
There was a problem hiding this comment.
Since this is related to write_on_master_db, please move this documentation under the write_on_master_db parameter.
| @@ -102,13 +102,16 @@ int ul_db_child_init(void) { | |||
| if(ul_db_child_locnr_init() == -1) return -1; | |||
|
|
|||
| LM_INFO("location number is %d\n", max_loc_nr); | |||
| if(db_master_write){ | |||
| lock_get(&write_on_master_db_shared->lock); | |||
There was a problem hiding this comment.
Check whether in ul_db_init() you need to acquire locks at all. It seems like this function is called one time only, before any fork is done, so most probably no synchronisation is needed. Same for lock release.
There was a problem hiding this comment.
p_usrloc_mod.c:
The fork() system call is triggered in the init_db_check() function, which takes place just before calling the ul_db_child_init() function where the above mentioned lock checking mechanism is used.
- The new parameter "mdb_availability_control" overwrites the "write_on_db" parameter based on the availability of master database.
|
Thank you @hdikme. Closing the pull request. |
Pre-Submission Checklist
in
doc/subfolder, the README file is autogenerated)Type Of Change
Checklist:
Description