Hello community, here is the log from the commit of package cloud-netconfig for openSUSE:Factory checked in at 2019-05-22 15:41:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-netconfig (Old) and /work/SRC/openSUSE:Factory/.cloud-netconfig.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cloud-netconfig" Wed May 22 15:41:24 2019 rev:8 rq:704720 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-netconfig/cloud-netconfig.changes 2019-02-04 14:25:11.797059887 +0100 +++ /work/SRC/openSUSE:Factory/.cloud-netconfig.new.5148/cloud-netconfig.changes 2019-05-22 15:42:10.086427021 +0200 @@ -1,0 +2,7 @@ +Thu May 16 13:32:26 UTC 2019 - Joachim Gleissner <jgleissner@suse.com> + +- Update to version 1.0: + + pause and retry if API call throttling is detected in Azure + (bsc#1135257 bsc#1135263) + +------------------------------------------------------------------- Old: ---- cloud-netconfig-0.9.tar.bz2 New: ---- cloud-netconfig-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-netconfig.spec ++++++ --- /var/tmp/diff_new_pack.C3DDSj/_old 2019-05-22 15:42:11.994427012 +0200 +++ /var/tmp/diff_new_pack.C3DDSj/_new 2019-05-22 15:42:12.022427012 +0200 @@ -33,7 +33,7 @@ %endif Name: %{base_name}%{flavor_suffix} -Version: 0.9 +Version: 1.0 Release: 0 Summary: Network configuration scripts for %{csp_string} License: GPL-3.0-or-later ++++++ cloud-netconfig-0.9.tar.bz2 -> cloud-netconfig-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/COMMIT_EDITMSG new/cloud-netconfig-1.0/.git/COMMIT_EDITMSG --- old/cloud-netconfig-0.9/.git/COMMIT_EDITMSG 2019-01-30 16:53:11.210751715 +0100 +++ new/cloud-netconfig-1.0/.git/COMMIT_EDITMSG 2019-05-15 22:18:31.591315910 +0200 @@ -1,16 +1,19 @@ -run cloud-netconfig periodically (bsc#1118783 bsc#1122013) +slow API requests down if necessary -Install sytstemd timer that runs cloud-netconfig every minute. +If an instance has many IP addresses (about 40+) repeated requests to the +metadata server may be denied in Azure. This change makes cloud-netconfig slow +down when this situation is detected. [bsc#1135257 bsc#1135263] # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # -# On branch fixes +# On branch fix-azure-throttle # Changes to be committed: -# modified: Makefile # modified: VERSION +# modified: azure/functions.cloud-netconfig # modified: cloud-netconfig-azure.spec # modified: cloud-netconfig-ec2.spec # modified: cloud-netconfig.spec -# new file: systemd/cloud-netconfig.service -# new file: systemd/cloud-netconfig.timer +# +# Untracked files: +# cloud-netconfig-0.9.tar.bz2 # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/FETCH_HEAD new/cloud-netconfig-1.0/.git/FETCH_HEAD --- old/cloud-netconfig-0.9/.git/FETCH_HEAD 2019-01-31 14:11:27.871295487 +0100 +++ new/cloud-netconfig-1.0/.git/FETCH_HEAD 2019-05-15 22:09:32.234241555 +0200 @@ -1,2 +1 @@ 737eef55e55d7dfc91c693d4863c1ac0191d7481 branch 'master' of github.com:SUSE-Enceladus/cloud-netconfig -c706e96b9c508b7df831ed7d5c41e689372d357e not-for-merge branch 'fixes' of github.com:SUSE-Enceladus/cloud-netconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/HEAD new/cloud-netconfig-1.0/.git/HEAD --- old/cloud-netconfig-0.9/.git/HEAD 2019-01-31 14:11:23.071252410 +0100 +++ new/cloud-netconfig-1.0/.git/HEAD 2019-05-15 22:09:54.642451697 +0200 @@ -1 +1 @@ -ref: refs/heads/master +ref: refs/heads/fix-azure-throttle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/ORIG_HEAD new/cloud-netconfig-1.0/.git/ORIG_HEAD --- old/cloud-netconfig-0.9/.git/ORIG_HEAD 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.0/.git/ORIG_HEAD 2019-05-15 22:09:32.394243055 +0200 @@ -1 +1 @@ -2f1207e6cea5f7f0b14dab0982d39425437ec099 +737eef55e55d7dfc91c693d4863c1ac0191d7481 Binary files old/cloud-netconfig-0.9/.git/index and new/cloud-netconfig-1.0/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/logs/HEAD new/cloud-netconfig-1.0/.git/logs/HEAD --- old/cloud-netconfig-0.9/.git/logs/HEAD 2019-01-31 14:11:27.891295667 +0100 +++ new/cloud-netconfig-1.0/.git/logs/HEAD 2019-05-15 22:18:34.671345031 +0200 @@ -9,3 +9,7 @@ d43a993fe138431f16ee2a62a5e450551a4b1420 c706e96b9c508b7df831ed7d5c41e689372d357e Joachim Gleissner <jgleissner@suse.com> 1548863506 +0100 commit: run cloud-netconfig periodically (bsc#1118783 bsc#1122013) c706e96b9c508b7df831ed7d5c41e689372d357e 2f1207e6cea5f7f0b14dab0982d39425437ec099 Joachim Gleissner <jgleissner@suse.com> 1548940283 +0100 checkout: moving from fixes to master 2f1207e6cea5f7f0b14dab0982d39425437ec099 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1548940287 +0100 pull --rebase: Fast-forward +737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1548940329 +0100 reset: moving to HEAD +737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1557950956 +0100 reset: moving to HEAD +737eef55e55d7dfc91c693d4863c1ac0191d7481 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1557950994 +0100 checkout: moving from master to fix-azure-throttle +737eef55e55d7dfc91c693d4863c1ac0191d7481 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner@suse.com> 1557951273 +0100 commit: slow API requests down if necessary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/logs/refs/heads/fix-azure-throttle new/cloud-netconfig-1.0/.git/logs/refs/heads/fix-azure-throttle --- old/cloud-netconfig-0.9/.git/logs/refs/heads/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 +++ new/cloud-netconfig-1.0/.git/logs/refs/heads/fix-azure-throttle 2019-05-15 22:18:34.671345031 +0200 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 737eef55e55d7dfc91c693d4863c1ac0191d7481 Joachim Gleissner <jgleissner@suse.com> 1557950994 +0100 branch: Created from HEAD +737eef55e55d7dfc91c693d4863c1ac0191d7481 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner@suse.com> 1557951273 +0100 commit: slow API requests down if necessary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/logs/refs/remotes/origin/fix-azure-throttle new/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fix-azure-throttle --- old/cloud-netconfig-0.9/.git/logs/refs/remotes/origin/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 +++ new/cloud-netconfig-1.0/.git/logs/refs/remotes/origin/fix-azure-throttle 2019-05-15 22:19:00.291587328 +0200 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 Joachim Gleissner <jgleissner@suse.com> 1557951540 +0100 update by push Binary files old/cloud-netconfig-0.9/.git/objects/13/b39fb65834123021738237b8fc4d708112620a and new/cloud-netconfig-1.0/.git/objects/13/b39fb65834123021738237b8fc4d708112620a differ Binary files old/cloud-netconfig-0.9/.git/objects/4a/dd01ba4a5e729e023d967d743c180b9fae8b6e and new/cloud-netconfig-1.0/.git/objects/4a/dd01ba4a5e729e023d967d743c180b9fae8b6e differ Binary files old/cloud-netconfig-0.9/.git/objects/70/11b267c7f77f50c531103e1b331d6d8d330d24 and new/cloud-netconfig-1.0/.git/objects/70/11b267c7f77f50c531103e1b331d6d8d330d24 differ Binary files old/cloud-netconfig-0.9/.git/objects/7c/04573ce239e4de2f37db3b00307cc2268605eb and new/cloud-netconfig-1.0/.git/objects/7c/04573ce239e4de2f37db3b00307cc2268605eb differ Binary files old/cloud-netconfig-0.9/.git/objects/97/d11cb66ab2c429a8202573fe7ef3bf66321798 and new/cloud-netconfig-1.0/.git/objects/97/d11cb66ab2c429a8202573fe7ef3bf66321798 differ Binary files old/cloud-netconfig-0.9/.git/objects/a2/c0140c77324435d782eaab908478462ad12456 and new/cloud-netconfig-1.0/.git/objects/a2/c0140c77324435d782eaab908478462ad12456 differ Binary files old/cloud-netconfig-0.9/.git/objects/d3/827e75a5cadb9fe4a27e1cb9b6d192e7323120 and new/cloud-netconfig-1.0/.git/objects/d3/827e75a5cadb9fe4a27e1cb9b6d192e7323120 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 new/cloud-netconfig-1.0/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 --- old/cloud-netconfig-0.9/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 1970-01-01 01:00:00.000000000 +0100 +++ new/cloud-netconfig-1.0/.git/objects/ef/84f3b5b4c1383fb8850bdb33f20f155616e9d9 2019-05-15 22:18:34.671345031 +0200 @@ -0,0 +1 @@ +x
RËnÛ0ì™_±@/-Œ8’%ê
4EåGmÙ±l§Ií€è"ז‹tDʯ¯/“¢COÝÓb03˜Á.WUUÝð©ÁgB8nÎ|F1ìÄèt<¡}»‘“Çk†Q Ù±¥z!âšR€T„bÍc—±'ü(°|Æ7v­6r kL¡j+Ƌ²‚áK­%Öðáqókÿ€m®ªàRÆÔí„Ž×qˆEmPcÿm±Ùmt¹‹—é†ióៀÃ,¹œ»Œâ”£ttœ€Ÿ.ÓÅb9Rc~Žö×éˆ>GÓD_ŠÁ\µhnwœUvt>œUB?,·gÞ¡[ü©{«l{]eû|‘Lz7©Zô>ûåì”Óû‡du0žîLњ™ô1j‡È.c?ÓŸæ“€?~)5}¯ŽÞxsEàêÄ'}ò³É ëÿ«Ñ[u€džBÏ j£Ašƒ„r 9jÍê!é˜Å€6Lr„‚iš˜<A:ûµ¥¡†w,W
ßiœ·f;dÅW£ÀH*4L0Ã@cœ·WªØ r²ŽìRBrnjlÃmQjà“Žœ'kÏ·ª WrmïóœŒf=(­¹èÒ4̔Êfµ=Ð ·Úð-×ü­ëzŽCCøœÞwòQæ\ \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/refs/heads/fix-azure-throttle new/cloud-netconfig-1.0/.git/refs/heads/fix-azure-throttle --- old/cloud-netconfig-0.9/.git/refs/heads/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 +++ new/cloud-netconfig-1.0/.git/refs/heads/fix-azure-throttle 2019-05-15 22:18:34.671345031 +0200 @@ -0,0 +1 @@ +ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/.git/refs/remotes/origin/fix-azure-throttle new/cloud-netconfig-1.0/.git/refs/remotes/origin/fix-azure-throttle --- old/cloud-netconfig-0.9/.git/refs/remotes/origin/fix-azure-throttle 1970-01-01 01:00:00.000000000 +0100 +++ new/cloud-netconfig-1.0/.git/refs/remotes/origin/fix-azure-throttle 2019-05-15 22:19:00.291587328 +0200 @@ -0,0 +1 @@ +ef84f3b5b4c1383fb8850bdb33f20f155616e9d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/VERSION new/cloud-netconfig-1.0/VERSION --- old/cloud-netconfig-0.9/VERSION 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.0/VERSION 2019-05-15 22:13:24.984426821 +0200 @@ -1 +1 @@ -0.9 +1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/azure/functions.cloud-netconfig new/cloud-netconfig-1.0/azure/functions.cloud-netconfig --- old/cloud-netconfig-0.9/azure/functions.cloud-netconfig 2019-01-29 17:25:43.522230722 +0100 +++ new/cloud-netconfig-1.0/azure/functions.cloud-netconfig 2019-05-15 22:10:36.470844110 +0200 @@ -21,6 +21,29 @@ URL_APX='?format=text&api-version=2017-04-02' CURL="curl -m 3 -H $URL_HDR" + +# ------------------------------------------------------------------- +# look up a meta data item +# +get_from_metadata() +{ + local url="${METADATA_BASE_URL}${1}${URL_APX}" + local result=$($CURL $url 2>/dev/null) + local count=0 + + while [[ $result == "Too many requests" ]]; do + count=$((count+1)) + if [[ $count -gt 10 ]]; then + return + fi + sleep 0.5 + result=$($CURL $url 2>/dev/null) + done + + echo -n $result +} + + # ------------------------------------------------------------------- # get the MAC address from the metadata server # format is uppercase without semicolons @@ -30,7 +53,7 @@ local if_idx="$1" test -z "$if_idx" && return - $CURL "${METADATA_BASE_URL}${if_idx}/macAddress${URL_APX}" 2>/dev/null + get_from_metadata "${if_idx}/macAddress" } # ------------------------------------------------------------------- @@ -42,12 +65,11 @@ local if_idx="$1" count=0 prefixlen="$2" test -z "$if_idx" && return - $CURL "${METADATA_BASE_URL}${if_idx}/ipv4/ipAddress/${URL_APX}" 2>/dev/null | \ - while read idx || [[ -n "$idx" ]] ; do + for idx in `get_from_metadata "${if_idx}/ipv4/ipAddress"` ; do [[ $count -ge 1 ]] && echo -n " " - $CURL "${METADATA_BASE_URL}${if_idx}/ipv4/ipAddress/${idx}/privateIpAddress${URL_APX}" 2>/dev/null + get_from_metadata "${if_idx}/ipv4/ipAddress/${idx}/privateIpAddress" echo -n "/" - $CURL "${METADATA_BASE_URL}${if_idx}/ipv4/subnet/0/prefix${URL_APX}" 2>/dev/null + get_from_metadata "${if_idx}/ipv4/subnet/0/prefix" count=$((count+1)) done } @@ -62,7 +84,7 @@ local oldopt=$(shopt -p nocasematch) shopt -s nocasematch - $CURL "${METADATA_BASE_URL}${URL_APX}" 2>/dev/null | \ + get_from_metadata | \ while read idx || [[ -n "$idx" ]] ; do if [[ "$(get_iface_mac $idx)" == "${hwaddr//:/}" ]]; then get_ipv4_addresses_by_index $idx Binary files old/cloud-netconfig-0.9/cloud-netconfig-0.9.tar.bz2 and new/cloud-netconfig-1.0/cloud-netconfig-0.9.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/cloud-netconfig-azure.spec new/cloud-netconfig-1.0/cloud-netconfig-azure.spec --- old/cloud-netconfig-0.9/cloud-netconfig-azure.spec 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.0/cloud-netconfig-azure.spec 2019-05-15 22:13:48.776650510 +0200 @@ -18,7 +18,7 @@ %define base_name cloud-netconfig Name: %{base_name}-azure -Version: 0.9 +Version: 1.0 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for Microsoft Azure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/cloud-netconfig-ec2.spec new/cloud-netconfig-1.0/cloud-netconfig-ec2.spec --- old/cloud-netconfig-0.9/cloud-netconfig-ec2.spec 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.0/cloud-netconfig-ec2.spec 2019-05-15 22:13:53.952699180 +0200 @@ -18,7 +18,7 @@ %define base_name cloud-netconfig Name: %{base_name}-ec2 -Version: 0.9 +Version: 1.0 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for Amazon EC2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cloud-netconfig-0.9/cloud-netconfig.spec new/cloud-netconfig-1.0/cloud-netconfig.spec --- old/cloud-netconfig-0.9/cloud-netconfig.spec 2019-01-31 14:11:27.887295630 +0100 +++ new/cloud-netconfig-1.0/cloud-netconfig.spec 2019-05-15 22:14:00.660762259 +0200 @@ -32,7 +32,7 @@ %endif Name: %{base_name}%{flavor_suffix} -Version: 0.9 +Version: 1.0 Release: 0 License: GPL-3.0+ Summary: Network configuration scripts for %{csp_string}