Merge lp:~ltrager/maas/lp1665143 into lp:~maas-committers/maas/trunk

Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: no longer in the source branch.
Merged at revision: 5745
Proposed branch: lp:~ltrager/maas/lp1665143
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 57 lines (+29/-2)
3 files modified
src/maasserver/migrations/builtin/maasserver/0113_set_filepath_limit_to_linux_max.py (+27/-0)
src/maasserver/models/blockdevice.py (+1/-1)
src/maasserver/models/bootsource.py (+1/-1)
To merge this branch: bzr merge lp:~ltrager/maas/lp1665143
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+317404@code.launchpad.net

Commit message

Set the FileFieldPath to the Linux kernel PATH_MAX limit.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good.

I wish there was an easy way to backport this, since it will no doubt affect 2.1 and earlier as well.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1.8 MiB)

The attempt to merge lp:~ltrager/maas/lp1665143 into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Fetched 306 kB in 0s (626 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is already the newest version (0.10.4-0.1build2).
python-psycopg2 is a...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'src/maasserver/migrations/builtin/maasserver/0113_set_filepath_limit_to_linux_max.py'
2--- src/maasserver/migrations/builtin/maasserver/0113_set_filepath_limit_to_linux_max.py 1970-01-01 00:00:00 +0000
3+++ src/maasserver/migrations/builtin/maasserver/0113_set_filepath_limit_to_linux_max.py 2017-02-15 23:15:17 +0000
4@@ -0,0 +1,27 @@
5+# -*- coding: utf-8 -*-
6+from __future__ import unicode_literals
7+
8+from django.db import (
9+ migrations,
10+ models,
11+)
12+
13+
14+class Migration(migrations.Migration):
15+
16+ dependencies = [
17+ ('maasserver', '0112_update_notification'),
18+ ]
19+
20+ operations = [
21+ migrations.AlterField(
22+ model_name='blockdevice',
23+ name='id_path',
24+ field=models.FilePathField(help_text='Path of by-id alias. (e.g. /dev/disk/by-id/wwn-0x50004...)', max_length=4096, null=True, blank=True),
25+ ),
26+ migrations.AlterField(
27+ model_name='bootsource',
28+ name='keyring_filename',
29+ field=models.FilePathField(help_text='The path to the keyring file for this BootSource.', max_length=4096, blank=True),
30+ ),
31+ ]
32
33=== modified file 'src/maasserver/models/blockdevice.py'
34--- src/maasserver/models/blockdevice.py 2017-01-03 14:51:04 +0000
35+++ src/maasserver/models/blockdevice.py 2017-02-15 23:15:17 +0000
36@@ -123,7 +123,7 @@
37 help_text="Name of block device. (e.g. sda)")
38
39 id_path = FilePathField(
40- blank=True, null=True,
41+ blank=True, null=True, max_length=4096,
42 help_text="Path of by-id alias. (e.g. /dev/disk/by-id/wwn-0x50004...)")
43
44 size = BigIntegerField(
45
46=== modified file 'src/maasserver/models/bootsource.py'
47--- src/maasserver/models/bootsource.py 2016-09-03 08:59:30 +0000
48+++ src/maasserver/models/bootsource.py 2017-02-15 23:15:17 +0000
49@@ -29,7 +29,7 @@
50 blank=False, unique=True, help_text="The URL of the BootSource.")
51
52 keyring_filename = FilePathField(
53- blank=True,
54+ blank=True, max_length=4096,
55 help_text="The path to the keyring file for this BootSource.")
56
57 keyring_data = EditableBinaryField(