hammer: build/ops: init-rbdmap uses distro-specific functions #6528
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
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> (cherry picked from commit 1560057) Conflicts: ceph.spec.in Merge conflict because there were other commits that introduced systemd & SUSE specific bits in the master which havent yet reached hammer. Since this commit only removed redhat-lsb-core from *el distros removing the specific lines
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> (cherry picked from commit c567341)
|
@theanalyst note that #5790 is going to be merged before this one. You may want to check if it applies cleanly on top of it. |
ghost
pushed a commit
that referenced
this pull request
Nov 11, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Nov 13, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Nov 13, 2015
ghost
pushed a commit
that referenced
this pull request
Nov 16, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Nov 19, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Nov 19, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Nov 19, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Nov 21, 2015
init-rbdmap uses distro-specific functions Reviewed-by: Boris Ranto <branto@redhat.com>
ghost
merged commit
|
It passed a run of the upgrade/hammer suite ( see http://tracker.ceph.com/issues/13356#note-30 for details ). |
ghost
changed the title
This pull request was closed.
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.
http://tracker.ceph.com/issues/13695