Skip to content
This repository has been archived by the owner on Oct 29, 2018. It is now read-only.

Finnish-6.17.0-2 #68

Merged
merged 79 commits into from
Nov 30, 2017
Merged

Finnish-6.17.0-2 #68

merged 79 commits into from
Nov 30, 2017

Conversation

iluwatar
Copy link
Contributor

Changelist

  • PVAYLADEV-809 / XRJD #190 The xroad package xroad-common has been split into four packages to allow removing unnecessary dependencies in the future. The package xroad-common still remains but is now a metapackage that depends on the new packages xroad-nginx, xroad-confclient, and xroad-signer which in turn depend on the new package xroad-base. X-Road packages that were dependant on xroad-common are, for now, still dependant on that package.e
  • PVAYLADEV-921 Ansible playbook support for selecting the security server variant (ee, fi, vanilla) to be installed, defaults to vanilla
  • PVAYLADEV-883 Added feature to limit environmental monitoringdata result, via env-monitor parameter
  • PVAYLADEV-962 Fixed path that is displayed to user in central server and security server backup
  • PVAYLADEV-978 / XRJD #185 Fixed xroad-jetty high resource usage
  • PVAYLADEV-947 / XRJD #179 Defined an documented a common way that should be used to transfer loosely defined security tokens (like JSON Web Tokens) as SOAP headers over X-Road.

Additional notes about the xroad-common package split

On Ubuntu machines, X-Road packages should be updated with apt-get upgrade --with-new-pkgs so that the new packages are installed during the update. As an alternative to you can use apt upgrade which installs new dependencies by default. After update please verify that all the installed X-Road packages have the same version (e.g. 6.17.0).

@VitaliStupin
Copy link
Contributor

The upgrade fails (even with apt-get upgrade --with-new-pkgs):

Selecting previously unselected package xroad-base.
(Reading database ... 81950 files and directories currently installed.)
Preparing to unpack .../xroad-base_6.17.0-0.20171128113422git0d2804c_amd64.deb ...
system locale set to UTF-8 compatible.
Unpacking xroad-base (6.17.0-0.20171128113422git0d2804c) ...
dpkg: error processing archive /var/cache/apt/archives/xroad-base_6.17.0-0.20171128113422git0d2804c_amd64.deb (--unpack):
 trying to overwrite '/etc/sudoers.d/xroad-restore', which is also in package xroad-common 6.17.0-0.20171127154954gitb76a638
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Selecting previously unselected package xroad-confclient.
Preparing to unpack .../xroad-confclient_6.17.0-0.20171128113422git0d2804c_amd64.deb ...
Unpacking xroad-confclient (6.17.0-0.20171128113422git0d2804c) ...
dpkg: error processing archive /var/cache/apt/archives/xroad-confclient_6.17.0-0.20171128113422git0d2804c_amd64.deb (--unpack):
 trying to overwrite '/etc/xroad/conf.d/confclient-logback-service.xml', which is also in package xroad-common 6.17.0-0.20171127154954gitb76a638
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Selecting previously unselected package xroad-nginx.
Preparing to unpack .../xroad-nginx_6.17.0-0.20171128113422git0d2804c_amd64.deb ...
Unpacking xroad-nginx (6.17.0-0.20171128113422git0d2804c) ...
dpkg: error processing archive /var/cache/apt/archives/xroad-nginx_6.17.0-0.20171128113422git0d2804c_amd64.deb (--unpack):
 trying to overwrite '/etc/xroad/nginx/default-xroad.conf', which is also in package xroad-common 6.17.0-0.20171127154954gitb76a638
Selecting previously unselected package xroad-signer.
Preparing to unpack .../xroad-signer_6.17.0-0.20171128113422git0d2804c_amd64.deb ...
Unpacking xroad-signer (6.17.0-0.20171128113422git0d2804c) ...
dpkg: error processing archive /var/cache/apt/archives/xroad-signer_6.17.0-0.20171128113422git0d2804c_amd64.deb (--unpack):
 trying to overwrite '/etc/xroad/conf.d/signer.ini', which is also in package xroad-common 6.17.0-0.20171127154954gitb76a638

The problem can be later fixed with sudo apt-get -f install. But that is counter intuitive for administrators. Is it possible to somehow successfully upgrade in one command so that administrators would not see these errors?

@VitaliStupin
Copy link
Contributor

Something like that works as a one-liner (but it is ugly):

sudo apt-get dist-upgrade -y || sudo apt-get -f install -y; sudo apt-get dist-upgrade -y

@olli-lindgren
Copy link
Contributor

olli-lindgren commented Nov 28, 2017

I think the problem here might be that your version is 6.17.0-0.20171127154954gitb76a638 which is newer than the known "split version" in packages/xroad/debian/control: "Breaks: xroad-common (<= 6.17.0-0.20171018082348git2ecf68ed)"
Basically the control file needs to be told that the split breaks your latest package versions that do not have the package split in it yet. You should replace each "Breaks: xroad-common (<= 6.17.0-0.20171018082348git2ecf68ed)" with a build version past whatever is your latest build. That would probably mean merging your develop onto the PR at your end, then changing the build version in the control file to be past the merge point (and merging back to develop) and making sure the split is pulled by all developers. If any builds newer than the split point are done without the split in place, the installation will break like you described when trying to install a split package on top of that one.

That got confusing. Let me know if you want clarification on it.

The installation should work fine for releases, since the comparison is larger than the latest release (6.16). It's the development builds that will break until they have the control file updated with the latest possible non-split build.

One solution would be jumping to version 6.17.1 or higher I guess instead of doing the control file fixes until everyone has the split packages.

@VitaliStupin
Copy link
Contributor

As soon as it does not affect real users upgrading from release version then it is OK. I just tested upgrading from 6.16 and it worked properly.

@iluwatar iluwatar merged commit 029d780 into ria-ee:develop Nov 30, 2017
@kristoheero
Copy link
Contributor

Hi! You have renamed the file xroad-common.xroad-confclient.upstartxroad-confclient.xroad-confclient.upstart, but in .gitignore it still exists (packages/xroad/debian/xroad-common.xroad-confclient.upstart).

@iluwatar
Copy link
Contributor Author

iluwatar commented Dec 5, 2017

Ok, thanks for spotting this @kristoheero. We will correct this and it will be included in our next pull request.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants