Ubuntu Mirror scripts

Merge lp:~tribaal/ubumirror/add-timeout-configuration-knob into lp:ubumirror

  1. add-timeout-configuration-knob
  2. Merge into trunk
Proposed by Chris Glass
Status: Merged
Merged at revision: 71
Proposed branch: lp:~tribaal/ubumirror/add-timeout-configuration-knob
Merge into: lp:ubumirror
Prerequisite: lp:~tribaal/ubumirror/resync-from-packages
Diff against target: 80 lines (+14/-5)
5 files modified
ubuarchive (+4/-2)
ubucdimage (+2/-1)
ubumirror.conf (+3/-0)
ubuports (+2/-1)
uburelease (+3/-1)
To merge this branch: bzr merge lp:~tribaal/ubumirror/add-timeout-configuration-knob
Reviewer Review Type Date Requested Status
Ubumirror Developers Pending
Review via email: mp+222450@code.launchpad.net

Description of the change

This branch introduces a new configuration knob in the /etc/ubumirror.conf file to tweak IO timeout values instead of hardcoding them in each script separately.

NB: This branch has a prerequisite.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuarchive'
2--- ubuarchive 2014-06-08 06:13:28 +0000
3+++ ubuarchive 2014-06-08 06:13:28 +0000
4@@ -65,7 +65,8 @@
5 set +e
6 echo "$(date -R): Initiating Ubuntu archive pool sync..."
7
8-rsync -av --timeout=600 --partial --delete --delete-after \
9+rsync -av --partial --delete --delete-after \
10+ --timeout=$IO_TIMEOUT \
11 --bwlimit=$SPEED \
12 --exclude "indices/" --exclude "dists/" --exclude "project/trace/${HOSTNAME}" \
13 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
14@@ -83,7 +84,8 @@
15
16 echo "$(date -R): Initiating Ubuntu archive dists and indices sync..."
17
18-rsync -av --timeout=600 --partial --delete --delete-after \
19+rsync -av --partial --delete --delete-after \
20+ --timeout=$IO_TIMEOUT \
21 --bwlimit=$SPEED \
22 --exclude "pool/" --exclude "project/trace/${HOSTNAME}" \
23 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
24
25=== modified file 'ubucdimage'
26--- ubucdimage 2010-03-18 17:52:36 +0000
27+++ ubucdimage 2014-06-08 06:13:28 +0000
28@@ -74,7 +74,8 @@
29
30 mkdir -p $UBUCDI_DIR/$FLAVOUR
31
32- rsync -av --partial --timeout=600 \
33+ rsync -av --partial \
34+ --timeout=$IO_TIMEOUT \
35 --bwlimit=$SPEED \
36 --exclude ".trace/${HOSTNAME}" \
37 $UBUCDI_EXCLUDE \
38
39=== modified file 'ubumirror.conf'
40--- ubumirror.conf 2010-03-13 06:43:00 +0000
41+++ ubumirror.conf 2014-06-08 06:13:28 +0000
42@@ -12,6 +12,9 @@
43 # Bandwidth limit for all mirror scripts - set to 0 for no limit.
44 SPEED=0
45
46+# I/O timeout for all mirror scripts - defaults to 600 seconds.
47+IO_TIMEOUT=600
48+
49 # UBUARC_DIR is the destination for the base of the archive directory
50 # The script won't run if this variable isn't set
51 #UBUARC_DIR="/srv/mirror/ubuntu"
52
53=== modified file 'ubuports'
54--- ubuports 2010-04-16 01:16:14 +0000
55+++ ubuports 2014-06-08 06:13:28 +0000
56@@ -65,7 +65,8 @@
57 set +e
58 echo "$(date -R): Initiating Ubuntu ports pool sync..."
59
60-rsync -av --timeout=600 --partial --delete --delete-after \
61+rsync -av --partial --delete --delete-after \
62+ --timeout=$IO_TIMEOUT \
63 --bwlimit=$SPEED \
64 --exclude "indices/" --exclude "dists/" \
65 --exclude "project/trace/${HOSTNAME}" \
66
67=== modified file 'uburelease'
68--- uburelease 2010-03-18 17:39:24 +0000
69+++ uburelease 2014-06-08 06:13:28 +0000
70@@ -65,7 +65,9 @@
71 set +e
72 echo "$(date -R): Initiating Ubuntu release CD image sync..."
73
74-rsync -av --partial --timeout=600 --bwlimit=$SPEED --delete-after \
75+rsync -av --partial --delete-after \
76+ --bwlimit=$SPEED
77+ --timeout=$IO_TIMEOUT \
78 --exclude ".trace/${HOSTNAME}" \
79 --exclude Archive-Update-in-Progress-* \
80 $UBUREL_EXCLUDE \

Subscribers

People subscribed via source and target branches

to status/vote changes: