← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~daniel-thewatkins/cloud-init/+git/cloud-init:apt-pipelining into cloud-init:master


Dan Watkins has proposed merging ~daniel-thewatkins/cloud-init/+git/cloud-init:apt-pipelining into cloud-init:master.

Commit message:
cc_apt_pipelining: stop disabling pipelining by default
This was introduced due to Ubuntu using S3 mirrors, and S3 having a
buggy pipelining implementation.  Those Ubuntu mirrors are no longer in
production and, furthremore, apt has also grown the ability to handle
servers with broken pipelining.
As such, we can stop disabling pipelining, which should result in
improved apt download speeds.
LP: #1794982

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1794982 in cloud-init: "drop /etc/apt/apt.conf.d/90cloud-init-pipelining in 16.04+"

For more details, see:
Your team cloud-init commiters is requested to review the proposed merge of ~daniel-thewatkins/cloud-init/+git/cloud-init:apt-pipelining into cloud-init:master.
diff --git a/cloudinit/config/cc_apt_pipelining.py b/cloudinit/config/cc_apt_pipelining.py
index cdf28cd..459332a 100644
--- a/cloudinit/config/cc_apt_pipelining.py
+++ b/cloudinit/config/cc_apt_pipelining.py
@@ -49,7 +49,7 @@ APT_PIPE_TPL = ("//Written by cloud-init per 'apt_pipelining'\n"
 def handle(_name, cfg, _cloud, log, _args):
-    apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", False)
+    apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", 'os')
     apt_pipe_value_s = str(apt_pipe_value).lower().strip()
     if apt_pipe_value_s == "false":
@@ -59,7 +59,7 @@ def handle(_name, cfg, _cloud, log, _args):
     elif apt_pipe_value_s in [str(b) for b in range(0, 6)]:
         write_apt_snippet(apt_pipe_value_s, log, DEFAULT_FILE)
-        log.warn("Invalid option for apt_pipeling: %s", apt_pipe_value)
+        log.warn("Invalid option for apt_pipelining: %s", apt_pipe_value)
 def write_apt_snippet(setting, log, f_name):

Follow ups