From c974096f522b1b4910f65343222bea91722c7f1a Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Tue, 14 May 2019 23:11:10 -0500
Subject: [PATCH] Increase nodepool image journal size

DIB uses 64MB as the default ext4 journal size, which is far below
the mkfs.ext4 default for the 80GB disks that nodepool instances
use. This change will increase the journal size to 512MB which is
the default size for ext4 filesystems built on disks 64-128GB in
size.

The relevant mkfs source where default journal sizes are calculated
is available here:
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/ext2fs/mkjournal.c#333

http://www.linux-mag.com/id/7666/ shows that an undersized journal
can have a large impact on file operations when dealing with lots
of small files. With larger files, there is negligible performance
impact. So worst case this change may not improve performance, but
with the number of jobs using small python source files and small
.git repo files, this should cause a marginal performance increase
for the nodepool use case.

Change-Id: I07a67e2e51d8d139e27da83aa16899a11d8b3f34
---
 nodepool/nb03.openstack.org.yaml |  3 +++
 nodepool/nodepool.yaml           | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/nodepool/nb03.openstack.org.yaml b/nodepool/nb03.openstack.org.yaml
index aec8dd9968..03a94cfc09 100644
--- a/nodepool/nb03.openstack.org.yaml
+++ b/nodepool/nb03.openstack.org.yaml
@@ -72,6 +72,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.london.linaro-london.openstack.org/ubuntu-ports'
@@ -95,6 +96,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_GRUB_TIMEOUT: '0'
@@ -119,6 +121,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.london.linaro-london.openstack.org/debian'
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 426e9d4741..a6d4b95e0c 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -129,6 +129,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       DIB_EPEL_DISABLED: '1'
@@ -152,6 +153,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/debian'
@@ -177,6 +179,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       GIT_HTTP_LOW_SPEED_TIME: '300'
@@ -199,6 +202,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       GIT_HTTP_LOW_SPEED_TIME: '300'
@@ -219,6 +223,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       GENTOO_PYTHON_TARGETS: 'python2_7 python3_6'
@@ -243,6 +248,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
@@ -265,6 +271,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
@@ -287,6 +294,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
@@ -309,6 +317,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_GRUB_TIMEOUT: '0'
@@ -334,6 +343,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_GRUB_TIMEOUT: '0'
@@ -360,6 +370,7 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_JOURNAL_SIZE: '512'
       DIB_APT_LOCAL_CACHE: '0'
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_GRUB_TIMEOUT: '0'