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

common: recursive implementation of config::expand_meta … #1046

Merged
merged 4 commits into from Jan 7, 2014
Merged

common: recursive implementation of config::expand_meta … #1046

merged 4 commits into from Jan 7, 2014
+318 −56

Commits on Jan 5, 2014

  1. common: multiple variable occurence expansion test 

    http://tracker.ceph.com/issues/7103 refs #7103

Signed-off-by: Loic Dachary <loic@dachary.org>
    Loic Dachary committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    5bb1545 View commit details
    Browse the repository at this point in the history

  2. common: cosmetic inversion of tests arguments 

    Signed-off-by: Loic Dachary <loic@dachary.org>
    Loic Dachary committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    87db534 View commit details
    Browse the repository at this point in the history

  3. common: recursive implementation of config::expand_meta 

    Using a recursive implementation of variable expansions make it easier
to protect against loops and provide human readable messages when they
happen.

It also enables one variable to be substituted multiple times in the
same configuration option instead of just once because it is confused
with a variable expansion loop.

http://tracker.ceph.com/issues/7103 fixes: #7103

Signed-off-by: Loic Dachary <loic@dachary.org>
    Loic Dachary committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    9485409 View commit details
    Browse the repository at this point in the history

  4. common: unit tests for config::expand_meta 

    Part of the config.cc tests are in test/confutils.cc but they do not
cover meta variable expansion. Create unittest_config for config.{h,cc}
specific tests.

The test_md_config_t is made a friend of md_config_t to allow testing
private and protected methods.

test/cli/ceph-conf/show-config-value.t is used to check that the human
readable message message shows as expected when there is an expansion
loop.

Signed-off-by: Loic Dachary <loic@dachary.org>
    Loic Dachary committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    3f34dc7 View commit details
    Browse the repository at this point in the history