<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>227709</bug_id>
          
          <creation_ts>2021-07-06 09:26:04 -0700</creation_ts>
          <short_desc>[webkitscmpy] Handle failed `git log` process</short_desc>
          <delta_ts>2021-07-13 16:58:23 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>Other</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Aakash Jain">aakash_jain</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>angelos</cc>
    
    <cc>ap</cc>
    
    <cc>jbedard</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1774966</commentid>
    <comment_count>0</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2021-07-06 09:26:04 -0700</bug_when>
    <thetext>Incorrect commit identifier on igalia-jsc32-armv7-ews (https://ews-build.webkit.org/#/workers/81). Earlier this bot was having issues with git (e.g.: https://ews-build.webkit.org/#/builders/38/builds/31141). After the issue was fixed, the commit identifiers incorrectly started from 2@main. e.g.: https://ews-build.webkit.org/#/builders/38/builds/31142, https://ews-build.webkit.org/#/builders/38/builds/31234</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776321</commentid>
    <comment_count>1</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-07-12 08:07:01 -0700</bug_when>
    <thetext>This is fallout from https://bugs.webkit.org/show_bug.cgi?id=225616, we have a bad cache. This cache is trivial to clear (it&apos;s in .git/identifiers.json), but I don&apos;t know how to access this bot.

I&apos;ll need to explore a bit to understand how we got a bad cache, because that&apos;s clearly a bug. But now that we have a bad one, this behavior is not surprising.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776581</commentid>
    <comment_count>2</comment_count>
    <who name="Angelos Oikonomopoulos">angelos</who>
    <bug_when>2021-07-13 02:35:34 -0700</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #1)
&gt; This is fallout from https://bugs.webkit.org/show_bug.cgi?id=225616, we have
&gt; a bad cache. This cache is trivial to clear (it&apos;s in .git/identifiers.json),
&gt; but I don&apos;t know how to access this bot.

Thanks for the tip, I just deleted .git/identifiers.json in igalia-jsc32-armv7-ews-02.

&gt; I&apos;ll need to explore a bit to understand how we got a bad cache, because
&gt; that&apos;s clearly a bug. But now that we have a bad one, this behavior is not
&gt; surprising.

FWIW the issue that Aakash linked to above caused git to exit early for lots of operations, so perhaps this broke some assumption about a git operation that &quot;cannot possibly fail&quot; in the code that manages the identifier cache?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776629</commentid>
    <comment_count>3</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-07-13 08:09:34 -0700</bug_when>
    <thetext>(In reply to Angelos Oikonomopoulos from comment #2)
&gt; (In reply to Jonathan Bedard from comment #1)
&gt; &gt; This is fallout from https://bugs.webkit.org/show_bug.cgi?id=225616, we have
&gt; &gt; a bad cache. This cache is trivial to clear (it&apos;s in .git/identifiers.json),
&gt; &gt; but I don&apos;t know how to access this bot.
&gt; 
&gt; Thanks for the tip, I just deleted .git/identifiers.json in
&gt; igalia-jsc32-armv7-ews-02.
&gt; 
&gt; &gt; I&apos;ll need to explore a bit to understand how we got a bad cache, because
&gt; &gt; that&apos;s clearly a bug. But now that we have a bad one, this behavior is not
&gt; &gt; surprising.
&gt; 
&gt; FWIW the issue that Aakash linked to above caused git to exit early for lots
&gt; of operations, so perhaps this broke some assumption about a git operation
&gt; that &quot;cannot possibly fail&quot; in the code that manages the identifier cache?

Almost certainly `git log`, I guess I need to start checking exit codes for that process</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776632</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-07-13 08:33:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/80520002&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776634</commentid>
    <comment_count>5</comment_count>
      <attachid>433406</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-07-13 08:37:53 -0700</bug_when>
    <thetext>Created attachment 433406
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776680</commentid>
    <comment_count>6</comment_count>
      <attachid>433422</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-07-13 11:06:59 -0700</bug_when>
    <thetext>Created attachment 433422
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776767</commentid>
    <comment_count>7</comment_count>
      <attachid>433422</attachid>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2021-07-13 15:02:12 -0700</bug_when>
    <thetext>Comment on attachment 433422
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=433422&amp;action=review

rs=me

&gt; Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:166
&gt; +                    return

what is the consequence of returning here?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776774</commentid>
    <comment_count>8</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-07-13 15:39:12 -0700</bug_when>
    <thetext>(In reply to Aakash Jain from comment #7)
&gt; Comment on attachment 433422 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=433422&amp;action=review
&gt; 
&gt; rs=me
&gt; 
&gt; &gt; Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:166
&gt; &gt; +                    return
&gt; 
&gt; what is the consequence of returning here?

By returning here, we basically throw out the whole result of `git log`, since we don&apos;t cache it until after we finish the commands (because we essentially need to cache it backwards). If we don&apos;t have a cache, we compute things the way we did before the cache.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776777</commentid>
    <comment_count>9</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2021-07-13 15:41:49 -0700</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #8)
&gt; By returning here, we basically throw out the whole result of `git log`,
&gt; since we don&apos;t cache it until after we finish the commands (because we
&gt; essentially need to cache it backwards). If we don&apos;t have a cache, we
&gt; compute things the way we did before the cache.
ok, sounds good.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776779</commentid>
    <comment_count>10</comment_count>
      <attachid>433452</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-07-13 15:44:09 -0700</bug_when>
    <thetext>Created attachment 433452
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1776807</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-13 16:58:21 -0700</bug_when>
    <thetext>Committed r279898 (239648@main): &lt;https://commits.webkit.org/239648@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 433452.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433406</attachid>
            <date>2021-07-13 08:37:53 -0700</date>
            <delta_ts>2021-07-13 11:06:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227709-20210713083752.patch</filename>
            <type>text/plain</type>
            <size>2618</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3OTg3MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE2IEBACisyMDIxLTA3LTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBmYWlsZWQgYGdpdCBsb2dgIHByb2Nl
c3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzcw
OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODA1MjAwMDI+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz
Y21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBT
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6Cisg
ICAgICAgIChHaXQuQ2FjaGUucG9wdWxhdGUpOiBEbyBub3QgcG9wdWxhdGUgY2FjaGUgaWYgYGdp
dCBsb2dgIGZhaWxzLgorCiAyMDIxLTA3LTEzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj
aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIEV4cG9zZSBzdXBwb3J0IGZvciBj
bGllbnQgY2VydGlmaWNhdGUgYXV0aApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi
a2l0c2NtcHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv
d2Via2l0c2NtcHkvc2V0dXAucHkJKHJldmlzaW9uIDI3OTg3MikKKysrIFRvb2xzL1NjcmlwdHMv
bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsy
OSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAot
ICAgIHZlcnNpb249JzAuMTQuNicsCisgICAgdmVyc2lvbj0nMC4xNC43JywKICAgICBkZXNjcmlw
dGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9z
aXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmll
cnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt
cHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi
a2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3OTg3MikKKysrIFRv
b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5
CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAg
ICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJr
aXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQog
Ci12ZXJzaW9uID0gVmVyc2lvbigwLCAxNCwgNikKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDE0LCA3
KQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAs
IDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJz
aW9uKDEsIDUpKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl
YmtpdHNjbXB5L2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJh
cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI3OTg3
MikKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv
Y2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTYxLDYgKzE2MSw5IEBAIGNsYXNzIEdpdChT
Y20pOgogICAgICAgICAgICAgICAgICAgICBpbnRlcnNlY3RlZCA9IF9hcHBlbmQoYnJhbmNoLCBo
YXNoLCByZXZpc2lvbj1yZXZpc2lvbikKIAogICAgICAgICAgICAgZmluYWxseToKKyAgICAgICAg
ICAgICAgICAjIElmIG91ciBgZ2l0IGxvZ2Agb3BlcmF0aW9uIGZhaWxlZCwgd2UgY2FuJ3QgY291
bnQgb24gdGhlIHZhbGlkaXR5IG9mIG91ciBjYWNoZQorICAgICAgICAgICAgICAgIGlmIGxvZyBh
bmQgbG9nLnJldHVybmNvZGUgPiAwOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4KICAgICAg
ICAgICAgICAgICBpZiBsb2c6CiAgICAgICAgICAgICAgICAgICAgIGxvZy5raWxsKCkKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433422</attachid>
            <date>2021-07-13 11:06:59 -0700</date>
            <delta_ts>2021-07-13 15:44:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227709-20210713110658.patch</filename>
            <type>text/plain</type>
            <size>2605</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3OTg3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE2IEBACisyMDIxLTA3LTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBmYWlsZWQgYGdpdCBsb2dgIHByb2Nl
c3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzcw
OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODA1MjAwMDI+CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz
Y21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBT
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6Cisg
ICAgICAgIChHaXQuQ2FjaGUucG9wdWxhdGUpOiBEbyBub3QgcG9wdWxhdGUgY2FjaGUgaWYgYGdp
dCBsb2dgIGZhaWxzLgorCiAyMDIxLTA3LTEzICBLZXZpbiBOZWFsICA8a2V2aW5fbmVhbEBhcHBs
ZS5jb20+CiAKICAgICAgICAgW3Jlc3VsdHMud2Via2l0Lm9yZ10gbGlua2lmeSB1cmxzIGluIGNv
bW1pdCBtZXNzYWdlcwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
c2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt
cHkvc2V0dXAucHkJKHJldmlzaW9uIDI3OTg3NykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGRl
ZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNp
b249JzAuMTQuNicsCisgICAgdmVyc2lvbj0nMC4xNC43JywKICAgICBkZXNjcmlwdGlvbj0nTGli
cmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4n
LAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRl
eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0
X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3OTg3NykKKysrIFRvb2xzL1Njcmlw
dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5n
IGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBs
ZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkg
LS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9u
ID0gVmVyc2lvbigwLCAxNCwgNikKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDE0LCA3KQogCiBBdXRv
SW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkp
CiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUp
KSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5
L2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI3OTg3NykKKysrIFRv
b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5w
eQkod29ya2luZyBjb3B5KQpAQCAtMTYxLDYgKzE2MSw5IEBAIGNsYXNzIEdpdChTY20pOgogICAg
ICAgICAgICAgICAgICAgICBpbnRlcnNlY3RlZCA9IF9hcHBlbmQoYnJhbmNoLCBoYXNoLCByZXZp
c2lvbj1yZXZpc2lvbikKIAogICAgICAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgICAgICAj
IElmIG91ciBgZ2l0IGxvZ2Agb3BlcmF0aW9uIGZhaWxlZCwgd2UgY2FuJ3QgY291bnQgb24gdGhl
IHZhbGlkaXR5IG9mIG91ciBjYWNoZQorICAgICAgICAgICAgICAgIGlmIGxvZyBhbmQgbG9nLnJl
dHVybmNvZGU6CisgICAgICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICAgICAgIGlm
IGxvZzoKICAgICAgICAgICAgICAgICAgICAgbG9nLmtpbGwoKQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433452</attachid>
            <date>2021-07-13 15:44:09 -0700</date>
            <delta_ts>2021-07-13 16:58:22 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-227709-20210713154408.patch</filename>
            <type>text/plain</type>
            <size>2598</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3OTg5NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE2IEBACisyMDIxLTA3LTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBmYWlsZWQgYGdpdCBsb2dgIHByb2Nl
c3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzcw
OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODA1MjAwMDI+CisKKyAgICAgICAgUnViYmVyLXN0
YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFy
aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAg
KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6
CisgICAgICAgIChHaXQuQ2FjaGUucG9wdWxhdGUpOiBEbyBub3QgcG9wdWxhdGUgY2FjaGUgaWYg
YGdpdCBsb2dgIGZhaWxzLgorCiAyMDIxLTA3LTEzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz
dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgPjRLIFJlZmVyZXIgc2hvdWxkIGhhdmUgdGFp
bGluZyAvCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w
eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1
cC5weQkocmV2aXNpb24gMjc5ODk0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0
c2NtcHkvc2V0dXAucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRt
ZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMC4x
NC42JywKKyAgICB2ZXJzaW9uPScwLjE0LjcnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRl
c2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAg
bG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29s
cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz
Y21weS9fX2luaXRfXy5weQkocmV2aXNpb24gMjc5ODk0KQorKysgVG9vbHMvU2NyaXB0cy9saWJy
YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkK
QEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGlu
c3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJh
LWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJz
aW9uKDAsIDE0LCA2KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMTQsIDcpCiAKIEF1dG9JbnN0YWxs
LnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9J
bnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpJbmRl
eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwv
Z2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5
L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjc5ODk0KQorKysgVG9vbHMvU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CSh3b3Jr
aW5nIGNvcHkpCkBAIC0xNjEsNiArMTYxLDkgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAg
ICAgICAgICAgIGludGVyc2VjdGVkID0gX2FwcGVuZChicmFuY2gsIGhhc2gsIHJldmlzaW9uPXJl
dmlzaW9uKQogCiAgICAgICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgICAgICMgSWYgb3Vy
IGBnaXQgbG9nYCBvcGVyYXRpb24gZmFpbGVkLCB3ZSBjYW4ndCBjb3VudCBvbiB0aGUgdmFsaWRp
dHkgb2Ygb3VyIGNhY2hlCisgICAgICAgICAgICAgICAgaWYgbG9nIGFuZCBsb2cucmV0dXJuY29k
ZToKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgICAgICAgICAgaWYgbG9nOgog
ICAgICAgICAgICAgICAgICAgICBsb2cua2lsbCgpCiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>