Skip to content

Commit

Permalink
Removes the Nova Ephemeral truncate patch
Browse files Browse the repository at this point in the history
Removing the truncate patch because of possible stability issues.
  • Loading branch information
casusbelli committed Oct 18, 2017
1 parent a9b8571 commit 24195f3
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 230 deletions.
19 changes: 0 additions & 19 deletions full_quobyte_patch/Ocata/full_quobyte_ocata_nova.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
diff --git nova/virt/libvirt/imagebackend.py nova/virt/libvirt/imagebackend.py
index 8dd227e..eaf5c81 100644
--- nova/virt/libvirt/imagebackend.py
+++ nova/virt/libvirt/imagebackend.py
@@ -232,9 +232,11 @@ class Image(object):
if os.path.exists(base) and size > self.get_disk_size(base):
self.resize_image(size)

- if (self.preallocate and self._can_fallocate() and
- os.access(self.path, os.W_OK)):
- utils.execute('fallocate', '-n', '-l', size, self.path)
+ if (self.preallocate and os.access(self.path, os.W_OK)):
+ LOG.debug('Truncating new image at %(path)s to virtual size '
+ '(patched for Quobyte).',
+ {'path': self.path})
+ utils.execute('truncate', '-s', size, self.path)

def _can_fallocate(self):
"""Check once per class, whether fallocate(1) is available,
diff --git nova/virt/libvirt/volume/quobyte.py nova/virt/libvirt/volume/quobyte.py
index 284a084..f36aacb 100644
--- nova/virt/libvirt/volume/quobyte.py
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
diff --git nova/tests/unit/virt/libvirt/test_imagebackend.py nova/tests/unit/virt/libvirt/test_imagebackend.py
index b3cc277..2c6dff9 100644
--- nova/tests/unit/virt/libvirt/test_imagebackend.py
+++ nova/tests/unit/virt/libvirt/test_imagebackend.py
@@ -120,9 +120,8 @@ class _ImageTestCase(object):
image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)

self.assertEqual(fake_processutils.fake_execute_get_log(),
- ['fallocate -l 1 %s.fallocate_test' % self.PATH,
- 'fallocate -n -l %s %s' % (self.SIZE, self.PATH),
- 'fallocate -n -l %s %s' % (self.SIZE, self.PATH)])
+ ['truncate -s %s %s' % (self.SIZE, self.PATH),
+ 'truncate -s %s %s' % (self.SIZE, self.PATH)])

def test_prealloc_image_without_write_access(self):
CONF.set_override('preallocate_images', 'space')
diff --git nova/tests/unit/virt/libvirt/volume/test_quobyte.py nova/tests/unit/virt/libvirt/volume/test_quobyte.py
index a43a79a..7f867fa 100644
--- nova/tests/unit/virt/libvirt/volume/test_quobyte.py
Expand Down
1 change: 0 additions & 1 deletion full_quobyte_patch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ When complete these patches contain all relevant fixes and changes for the given
- Fixes bug [1530860](https://bugs.launchpad.net/nova/+bug/1530860) with patch [432344](https://review.openstack.org/#/c/432344/) in order to prevent systemd service restarts from unmounting Nova mounts
- Fixes bug [1679976](https://bugs.launchpad.net/nova/+bug/1679976) with patch [453537](https://review.openstack.org/#/c/453537/) disallowing a specific and potentially bad exit code during volume mounts
- Removes the requirement to support extended attributes from Nova mounts with patch [428646](https://review.openstack.org/#/c/428646/) for improved performance
- Exchanges Nova fallocate on qcow2 ephemeral images with a truncate command for improved performance with Quobyte

The patches come in two versions, the pure driver and the full source patch. For Cinder these are:

Expand Down

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions truncate_ephemeral_patch/Ocata/truncate-ephemeral_Nova-Ocata.patch

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions truncate_ephemeral_patch/Pike/truncate-ephemeral_Nova-Pike.patch

This file was deleted.

This file was deleted.

28 changes: 0 additions & 28 deletions truncate_ephemeral_patch/README.md

This file was deleted.

8 changes: 4 additions & 4 deletions xattr-removal_patch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Backports of performance optimizations that remove the usage of xattr from the N

Both flavors come in two versions, the vanilla release :

1. _xattr-removal_Nova-<Release Name>.patch_ - The pure driver patch for patching package based installations that strip tests and other development elements
2. _xattr-removal_<Release Name>-Mitaka_full_source_tree.patch_ - The full source patch including updates of unit tests and release notes files
1. _xattr-removal_Nova-RELEASENAME.patch_ - The pure driver patch for patching package based installations that strip tests and other development elements
2. _xattr-removal_RELEASENAME-Mitaka_full_source_tree.patch_ - The full source patch including updates of unit tests and release notes files

And the _upon-systemd-run-patch_ versions:

1. _xattr-removal_Nova-<Release Name>_upon-systemd-run-patch.patch_ - The pure driver patch for patching package based installations that strip tests and other development elements
2. _xattr-removal_<Release Name>-Mitaka_upon-systemd-run-patch_full_source_tree.patch_ - The full source patch including updates of unit tests and release notes files
1. _xattr-removal_Nova-RELEASENAME_upon-systemd-run-patch.patch_ - The pure driver patch for patching package based installations that strip tests and other development elements
2. _xattr-removal_RELEASENAME-Mitaka_upon-systemd-run-patch_full_source_tree.patch_ - The full source patch including updates of unit tests and release notes files


### Installation
Expand Down

0 comments on commit 24195f3

Please sign in to comment.