cmake: FreeBSD specific excludes in CMakeLists.txt part 2 #10973
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| set(parse_secret_files | ||
| common/secret.c) | ||
| add_library(parse_secret_objs OBJECT ${parse_secret_files}) | ||
| if(LINUX) |
There was a problem hiding this comment.
@wjwithagen could you please note why this is not secret.c is not buildable in FreeBSD? for example, keyutils is not available in FreeBSD?
and why krbd is not applicable to FreeBSD?
There was a problem hiding this comment.
@wjwithagen this is not addressed.
There was a problem hiding this comment.
i guess maybe we can check for KEYUTILS_FOUND instead?
wjwithagen
force-pushed
the
wip-wjw-freebsd-cmake-excludes-2
branch
from
bfefa00
to
6eb9f7b
Compare
|
@tchaikov |
wjwithagen
force-pushed
the
wip-wjw-freebsd-cmake-excludes-2
branch
from
6eb9f7b
to
20e08ba
Compare
|
@tchaikov |
wjwithagen
force-pushed
the
wip-wjw-freebsd-cmake-excludes-2
branch
from
8e81c1c
to
4cc1fe2
Compare
| @@ -696,7 +696,7 @@ install(PROGRAMS | |||
|
|
|||
| add_subdirectory(bash_completion) | |||
|
|
|||
| if(LINUX) | |||
| if(KEYUTILS_FOUND) | |||
There was a problem hiding this comment.
could you squash this commit into 05d72fb ?
- FreeBSD does not have keyutils or any kernel type security store So using secret.c is not really relevant here - Have common/secret.c depend on KEYUTILS_FOUND - This also excludes building mount.cephfs, Next to the fact that this is 100% linux bases mount stuff - krbd is the Linux kernel version for RBD based disks, but again completely Linux based and porting to FreeBSD, if any, has to follow a different route Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
- honor the WITH_RBD and WITH_LIBCEPHFS flags Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
- Honor WITH_LIBCEPHFS Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
- Honor WITH_AIO tests that depend on bluestore parts Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-wjw-freebsd-cmake-excludes-2
branch
from
4cc1fe2
to
2e9809a
Compare
|
pushed to gb as wip-10973. once gb are happy, it's good to merge. |
|
@tchaikov |
|
jenkins, retest this please |
cbodley
pushed a commit
to cbodley/ceph
that referenced
this pull request
Sep 19, 2016
- to avoid the scrub wave when the osd_scrub_max_interval reaches in a
high-load OSD, the scrub time is randomized.
- extract scrub_load_below_threshold() out of scrub_should_schedule()
- schedule an automatic scrub job at a time which is uniformly distributed
over [now+osd_scrub_min_interval,
now+osd_scrub_min_interval*(1+osd_scrub_time_limit]. before
this change this sort of scrubs will be performed once the hard interval
is end or system load is below the threshold, but with this change, the
jobs will be performed as long as the load is low or the interval of
the scheduled scrubs is longer than conf.osd_scrub_max_interval. all
automatic jobs should be performed in the configured time period, otherwise
they are postponed.
- the requested scrub job will be scheduled right away, before this change
it is queued with the timestamp of `now` and postponed after
osd_scrub_min_interval.
Fixes: ceph#10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5e44040)
Conflicts:
src/osd/OSD.cc
cbodley
pushed a commit
to cbodley/ceph
that referenced
this pull request
Sep 19, 2016
s/osd_scrub_interval_limit/osd_scrub_interval_randomize_ratio/ Fixes: ceph#10973 Signed-off-by: Kefu Chai <kchai@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes to the CMakeLists.txt files specific for FreeBSD building.
These are the items that can not (yet) be build on FreeBSD
Excluding build target based on