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

Init rbdmap patchset. #6445

Merged
merged 2 commits into from Nov 5, 2015

Conversation

Projects
None yet
4 participants
@b-ranto
Copy link
Contributor

commented Nov 2, 2015

I aimed this for infernalis initially hoping that it would get "back-ported" to master. However it does not seem that way (the original patches are in infernalis for quite some time). Opening another PR for master.

b-ranto added some commits Oct 23, 2015

init-rbdmap: Rewrite to use logger + clean-up
This patch rewrites the init-rbdmap init script so that it uses logger
instead of the log_* functions. The patch also fixes various smaller
bugs like:
* MAP_RV was undefined if mapping already existed
* UMNT_RV and UMAP_RV were almost always empty (if they succeeded) ->
  removed them
* use of continue instead RET_OP in various places (RET_OP was not being
  checked after the switch to logger messages)
* removed use of DESC (used only twice and only one occurrence actually
  made sense)

Signed-off-by: Boris Ranto <branto@redhat.com>
ceph.spec.in: We no longer need redhat-lsb-core
Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>

@b-ranto b-ranto referenced this pull request Nov 2, 2015

Closed

rbdmap: systemd support #6443

@smithfarm smithfarm added the build/ops label Nov 3, 2015

@b-ranto

This comment has been minimized.

Copy link
Contributor Author

commented Nov 5, 2015

Can we please get this merged? The commits are already in infernalis, only master is missing them and it blocks PR #6443 rbdmap systemd support (the patches directly depend on them).

@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Nov 5, 2015

the pr for infernalis is #6363

@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Nov 5, 2015

lgtm

tchaikov added a commit that referenced this pull request Nov 5, 2015

Merge pull request #6445 from ceph/wip-init-rbdmap
Init rbdmap patchset.

Reviewed-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov merged commit 01e0a75 into master Nov 5, 2015

@tchaikov tchaikov deleted the wip-init-rbdmap branch Nov 5, 2015

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.