Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configuration reload #296

Merged
merged 57 commits into from
Oct 24, 2014
Merged

Configuration reload #296

merged 57 commits into from
Oct 24, 2014

Conversation

studzien
Copy link
Contributor

No description provided.

Pawel Pikula and others added 30 commits October 15, 2014 12:23
close ldap connections when pool it is stopped
a48b6a4
add stop function to some core modules
3ec28bd
allow to register/unregister virtualhosts
f242125
add reload function to gen_mod
13f4539
reload config command
bb92c94
add stop function to auth modules
2f1f279
fix config change function
1d45523
* get config filename from commandline parameters
cc4c64e 
* improve error reporting
* backup old config files
* ignore some changes, which don't require restart like acl
delete only local processes while stoping eldap pool
4c3e8fc
allow to stop db backend without checking local options
ede856e
fix override config strategies and restarting rdbms and auth systems
917ff05
don't replace node_start entry
bdaaa6c
check config version on running node, fix listeners restart
ef25f8b
fix local_config grouping
2399e3a 
restart only listeners that have changed
Remove sending conf file while reloading cluster; add local only reload
3b7b401 
The commands that are now available in the mongooseimctl are:
* reload_local
* reload_cluster.
The commit also removes making backups of existing config files
introduces some refactorings.
Close client connections to domain to be removed; verify the config file
647d1bd 
Now all the client connections associated with a domain to be removed
are closed. Additionally, a config file on each node is compared to the
one on the initiating node.

The whole cluster reload mechanism works as follows:
1. Parse the configuration file on the initiating node.
2. Compute a diff between current configuration and the one read from
   the provided file
3. Compute a hash of the current node's configuration (config version)
4. Compute a hash of the new configuration read from file (file version)
5. Apply new configuration on the current node
6. Send configuration diff computed on the initiating node to other nodes
   along with the config version, file version and the file path
7. Compute config version and file version (after parsing it) on the
   other nodes and verify that they match their counterparts from
   the initiating node; if any doesn't match cancel the operation
8. Apply the configuration diff on the other nodes
Fix computing file and config versions that are compared between nodes
d3e8615
@erszcz
Export config checksumming functions for testing
bbc4980 
(cherry picked from commit 985b1f271cd7210955b7cee02311bf0b499048ba)
@erszcz
Delimit functions in a sane way
2949edb 
(cherry picked from commit 4a4f583abafd8e9d72eb65c1220a51a9d7b0dd29)
@erszcz
Extract loops over options to standalone functions
5e31806 
(cherry picked from commit e604ff204b41d0b36d3e6a8a375b5c0d67b7c290)
(cherry picked from commit bc8b07b6f78ea54e78f04f432da2b74c439dfe11)
@erszcz
Fix local_config host configuration reloading
556a519 
`reload_local` (hence `reload_cluster` too) was not idempotent.
This was caused by lame implementation of stopping a module,
which left a placeholder in the database instead of properly cleaning
up after removing the last module for a given

(cherry picked from commit 745eb2f786483ce011fccff0f4d9c285dc0fe1a6)
(cherry picked from commit 31aeaa86cbf5feec64549abcc5411cdec5eb4509)
@erszcz
Add logging about node/cluster config reloads
bd36c9e 
(cherry picked from commit 45195c361c2ba659045a588aff8737a60669c553)
@erszcz
DRY when destructuring config tuples
3620bec 
(cherry picked from commit e39f7dec35810f97a7809afb869bf745fabd5d8e)
@erszcz
Fix whitespace
51d8a00 
(cherry picked from commit b9c1a2a6a6d2785742a774cb008b09a117b3d4d9)
@erszcz
Extract find_modules_to_start, find_modules_to_change
d475f75 
(cherry picked from commit 9025dcc4357b19d9c739224b32e42ef7ba7eb732)
@erszcz
Switch to #compare_result{} record
4c42f7d 
(cherry picked from commit 01db9c58e88a671ef00442f9881aef08d00d93af)
@erszcz
Fix badmatch (variable name reuse)
7bc7fe2 
(cherry picked from commit 48b09820a2092fb1678c0a2ef990b093b264b16a)
@erszcz
Refactor for simplicity
0f148ca 
(cherry picked from commit 8acf730866e319da1a7d24a3f1fcbe38c4fe05e0)
@erszcz
Use CamelCase for variables
b1fe57c 
(cherry picked from commit 7f513a5c3dfc0d9f1ef63ffa65283eb3c7fbe110)
@erszcz
Cleanup initial option categorization
43042cf 
(cherry picked from commit 9f7989923697d2877cd3a800b999c0b2070ff531)
erszcz and others added 14 commits October 15, 2014 12:24
@erszcz
Test group_host_changes/1
ba0ac0e 
(cherry picked from commit c77910d446a9e09aecab82e56d4d4134f05b00a1)
@erszcz
Test starting up new modules when dynamically reloading config
820e14a 
(cherry picked from commit 8b5e9f31a82007abfe9259d8ae75596fb54bd0ac)
@erszcz
Make sure we ask for ejabberd's config
6923c4e 
Without this change, when doing application:start(ejabberd)
the call sometimes (non-deterministically!) returned undefined.
This lead to trying a different (non-existent) config file and failing
the add_a_module test case.

(cherry picked from commit e8a8f84b2f6a0fe2702677ea2295c4a0c4a7b84f)
@erszcz
Add delete_a_module testcase
62904eb 
(cherry picked from commit 3634ac60c81eb57e14fb5a0576542b2fa4cb7405)
@erszcz
Add reload_a_module testcase
597a899 
(cherry picked from commit 46da2b6994c7041abaa345dddafcceae02a81d60)
@erszcz
Adjust log level of config reloading
d8cad7c 
(cherry picked from commit 295b0b1e934f44298cd8f824613914e3ddab6cc9)
@erszcz
Rewrite path/file management in ejabberd_config_SUITE
9c46b2b 
(cherry picked from commit 0b7e723fbad21d545b249be7e2b347d72288cd33)
@erszcz
Make reload_a_module case also run by default
bdaf901 
(cherry picked from commit 6c206f92b1477bfc929d3a49827e38dc1cf1bda2)
@erszcz
Make the when/then comments sensible
d78a7cc 
(cherry picked from commit 90541228e91324eb48f589032ca5b0ee5915adac)
@erszcz
Add split_config test stub (already passes, not a lot of checks)
70ecb30 
(cherry picked from commit 713cf67ecf520b48a57ee32a81f633d74ff4f612)
@erszcz
Extend split_config case to check for loaded modules and domain_certfile
b758cdf 
(cherry picked from commit 168b697f9a99516b8d79de7092ddc2bb00ea1b94)
@erszcz
Depend on pa:6fc8ef5742
19fa186 
(cherry picked from commit b501c0b486a08b0e72d6594cb14675bddf12beb4)

Conflicts:
	rebar.config
	rel/reltool.config
Exit dummy ejabberd_sup process for real in the auth_http test
1a977a2
Use tests for live configuration reload
d9e48b0
@mongoose-im
Copy link
Collaborator

travis is using test branch conf-reload from https://github.com/esl/ejabberd_tests/tree/conf-reload

@studzien studzien force-pushed the conf-reload branch 8 times, most recently from 389c515 to f53fe79 Compare October 17, 2014 08:42
michalwski added a commit that referenced this pull request Oct 24, 2014
@michalwski
Merge pull request #296 from esl/conf-reload
0ba3f21 
Configuration reload
@michalwski michalwski merged commit 0ba3f21 into master Oct 24, 2014
@michalwski michalwski deleted the conf-reload branch December 5, 2014 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@studzien @mongoose-im @michalwski @erszcz