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

luminous: debian: correct ceph-common relationship with older radosgw package #24997

Merged
merged 1 commit into from Jan 10, 2019

Conversation

mcv21
Copy link
Contributor

@mcv21 mcv21 commented Nov 8, 2018

@mcv21
Copy link
Contributor Author

mcv21 commented Nov 8, 2018

(the docs test looks to have failed due to a network error...)

@tchaikov
Copy link
Contributor

tchaikov commented Nov 8, 2018

@mcv21 Matthew, thanks for fixing the broken debian packaging. normally, if a bug exists in both LTS branches and master, we intend to

  1. create a ticket at http://tracker.ceph.com , mark the "Backport:" field of tracker with the impacted branches.
  2. fix it in master, then
  3. change the status of the tracker to "Pending Backport", and then
  4. backport the fix to the impacted branches by cherry-picking the fix to these branches

@mcv21
Copy link
Contributor Author

mcv21 commented Nov 8, 2018

The adjacent PR #24996 fixes it in master (this is just a cherry-pick of that); it's not really office hours right now, so do you want to make the tracker ticket? Otherwise I'll do so tomorrow.

@tchaikov
Copy link
Contributor

tchaikov commented Nov 9, 2018

@mcv21 by "cherry-pick" , i mean git cherry-pick -x. so we can connect the fix in LTS branches to the one in master. and to avoid to extra efforts (for example, the sha1 of the commit changes if you update the commit targeting master), you might want to wait until the PR targeting master is merged.

yeah, it'd be great if you could help on it.

@mcv21
Copy link
Contributor Author

mcv21 commented Nov 9, 2018

OK (I did cherry-pick, but missed the -x). As you suggest, I'll wait to re-do the cherry-pick until #24996 is merged. I've opened https://tracker.ceph.com/issues/36741 (and linked that from the other PR).

@mcv21
Copy link
Contributor Author

mcv21 commented Nov 9, 2018

[the docs build failure is some bit of Jenkins having a network issue...]

 Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://github.com/ceph/ceph +refs/pull/*:refs/remotes/origin/pr/*" returned status code 128:
stdout: 
stderr: error: RPC failed; curl 18 transfer closed with outstanding read data remaining
fatal: The remote end hung up unexpectedly

Fixes: https://tracker.ceph.com/issues/36741

9fd30b9 moved
/etc/bash_completion.d/radosgw-admin from radosgw to ceph-common. This
means that if you try and install a newer ceph-common over an older
radosgw, there's a conflict, and the install fails:

```
Unpacking ceph-common (12.2.8-1xenial) over (10.2.9-0ubuntu0.16.04.1) ...
dpkg: error processing archive ceph-common_12.2.8-1xenial_amd64.deb (--install):
 trying to overwrite '/etc/bash_completion.d/radosgw-admin', which is also in package radosgw 10.2.9-0ubuntu0.16.04.1
```

Per Debian policy (
https://www.debian.org/doc/debian-policy/ch-relationships.html#overwriting-files-in-other-packages
) the correct way to handle a package taking over a file is for a
versioned Replaces and Breaks.

The change went into 12.0.3, so this commit adds Replaces and Breaks
against radosgw less than that version. It should be backported to
Luminous to avoid issues with upgrades from older versions (Jewel and
Kraken).

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
(cherry picked from commit dd24ddc)
@mcv21 mcv21 changed the title Note move of /etc/bash_completion.d/radosgw-admin from radosgw package debian: correct ceph-common relationship with older radosgw package Nov 15, 2018
@mcv21
Copy link
Contributor Author

mcv21 commented Nov 15, 2018

@tchaikov The original PR has been merged (thanks :) ), so I have now re-done this PR with a git cherry-pick -x of that commit.

@tchaikov
Copy link
Contributor

jenkins, retest this please.

@tchaikov tchaikov added this to the luminous milestone Nov 15, 2018
@mcv21
Copy link
Contributor Author

mcv21 commented Nov 15, 2018

PR text updated to reflect new tracker issue made for the luminous backport
[do you want me to open a PR with the relevant Mimic cherry-pick too?]

@tchaikov
Copy link
Contributor

@mcv21 then you'd need to create a backport tracker ticket for mimic first. @smithfarm kindly created the one for luminous.

@smithfarm
Copy link
Contributor

@tchaikov @mvc21 mimic backport tracker issue is https://tracker.ceph.com/issues/37273

@smithfarm
Copy link
Contributor

smithfarm commented Nov 15, 2018

@mcv21 You are welcome to do the cherry-picking to mimic, but not required - the tracker is open, someone will pick it up.

@mcv21
Copy link
Contributor Author

mcv21 commented Nov 15, 2018

@smithfarm thanks, I figured I'd do it while I was thinking about it - #25115

@smithfarm smithfarm changed the title debian: correct ceph-common relationship with older radosgw package luminous: debian: correct ceph-common relationship with older radosgw package Nov 15, 2018
@yuriw
Copy link
Contributor

yuriw commented Jan 7, 2019

@mcv21
Copy link
Contributor Author

mcv21 commented Jan 8, 2019

@yuriw I'm not sure what I should understand by your comment, but I can't see that trello card.

@tchaikov
Copy link
Contributor

tchaikov commented Jan 8, 2019

@mcv21 i think it's a note for Yuri himself. but probably you can consider it as a message that your change is now included in his test batch, and the test branch is named wip-yuri-testing-2019-01-07-1727-luminous . if you are really curious, you can search the tests against this branch at pulpito, see http://pulpito.ceph.com/?branch=wip-yuri-testing-2019-01-07-1727-luminous

@mcv21
Copy link
Contributor Author

mcv21 commented Jan 8, 2019

@tchaikov thanks for satisfying my curiosity :)

@yuriw yuriw merged commit 9ac6bed into ceph:luminous Jan 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants