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.

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

system instance: fix default socket path, config file parsing #1577

Merged
merged 2 commits into from Jul 12, 2018

Conversation

Projects
None yet
4 participants
@garlick
Copy link
Member

garlick commented Jul 12, 2018

This PR fixes two issues that came up during initial system instance testing on the upgrade cluster.

@coveralls

This comment has been minimized.

Copy link

coveralls commented Jul 12, 2018

Coverage Status

Coverage decreased (-0.05%) to 79.412% when pulling 7ef695d on garlick:system_instance_fixes into fdf2c2c on flux-framework:master.

@garlick garlick force-pushed the garlick:system_instance_fixes branch from b3fb980 to 7ef695d Jul 12, 2018

garlick added some commits Jul 12, 2018

build: substitute runstatedir in autoconf < 2.70
Problem: flux clients cannot connect to the system
instance using compiled-in path.

The compiled in path is prefixed with $runstatedir,
but this variable is empty in versions of autoconf
before 2.70.

Add a conditional to configure.ac so that runstatedir
is substituted to /run in Makefile.am's if $runstatedir
is not set.

Fixes #1573
broker/boot_config: fix URI matching logic
Problem: config file must contain explicit rank setting,
which prevents sharing of config across an instance.

Fix logic error in URI matching, so that if a local
address is found in the tbon-endpoints URI, the rank
is the array index.

Fixes #1574
@garlick

This comment has been minimized.

Copy link
Member Author

garlick commented Jul 12, 2018

Rebased after merge of #1578

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jul 12, 2018

Codecov Report

Merging #1577 into master will decrease coverage by 0.04%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #1577      +/-   ##
==========================================
- Coverage   79.16%   79.11%   -0.05%     
==========================================
  Files         170      170              
  Lines       31181    31182       +1     
==========================================
- Hits        24685    24671      -14     
- Misses       6496     6511      +15
Impacted Files Coverage Δ
src/broker/boot_config.c 86.74% <100%> (+0.16%) ⬆️
src/broker/module.c 83.79% <0%> (-1.4%) ⬇️
src/broker/content-cache.c 72.88% <0%> (-1.28%) ⬇️
src/common/libflux/response.c 82.89% <0%> (-0.66%) ⬇️
src/broker/overlay.c 73.81% <0%> (-0.32%) ⬇️
src/common/libflux/handle.c 83.66% <0%> (-0.25%) ⬇️
src/common/libflux/message.c 80.78% <0%> (-0.24%) ⬇️
src/common/libflux/future.c 91.15% <0%> (+0.44%) ⬆️
@grondo

This comment has been minimized.

Copy link
Contributor

grondo commented Jul 12, 2018

Nice fixes, thanks!

@grondo grondo merged commit ce56834 into flux-framework:master Jul 12, 2018

4 checks passed

codecov/patch 100% of diff hit (target 79.16%)
Details
codecov/project Absolute coverage decreased by -0.04% but relative coverage increased by +20.83% compared to fdf2c2c
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.05%) to 79.412%
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.