<?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>187648</bug_id>
          
          <creation_ts>2018-07-13 10:53:34 -0700</creation_ts>
          <short_desc>[ MacOS iOS ] Layout Test storage/indexeddb/modern/opendatabase-after-storage-crash.html is flaky</short_desc>
          <delta_ts>2018-08-27 17:35:37 -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>WebKit Nightly Build</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="Truitt Savell">tsavell</reporter>
          <assigned_to name="Sihui Liu">sihui_liu</assigned_to>
          <cc>achristensen</cc>
    
    <cc>alecflett</cc>
    
    <cc>ap</cc>
    
    <cc>beidson</cc>
    
    <cc>cdumez</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ddorwin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>jsbell</cc>
    
    <cc>lforschler</cc>
    
    <cc>rniwa</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>sihui_liu</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1441914</commentid>
    <comment_count>0</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2018-07-13 10:53:34 -0700</bug_when>
    <thetext>The following layout test is flaky on MacOS and iOS

storage/indexeddb/modern/opendatabase-after-storage-crash.html

Probable cause:

Test was introduced in r233562 &lt;https://trac.webkit.org/changeset/233562/webkit&gt; It started as a flakey Failure and Timeout. The timeout issue was resolved in r233599 &lt;https://trac.webkit.org/changeset/233599/webkit&gt; 

Test is now a flakey failure. It has several different failure outputs linked below:
https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r233794%20(4094)/storage/indexeddb/modern/opendatabase-after-storage-crash-diff.txt
https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r233746%20(4072)/storage/indexeddb/modern/opendatabase-after-storage-crash-diff.txt
https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r233678%20(4041)/storage/indexeddb/modern/opendatabase-after-storage-crash-diff.txt
https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r233641%20(4029)/storage/indexeddb/modern/opendatabase-after-storage-crash-diff.txt

Flakiness Dashboard:

https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&amp;tests=storage%2Findexeddb%2Fmodern%2Fopendatabase-after-storage-crash.html

Creating this bug to track this test. Original Bug: https://bugs.webkit.org/show_bug.cgi?id=187123</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1442809</commentid>
    <comment_count>1</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2018-07-17 15:34:02 -0700</bug_when>
    <thetext>Looks like it&apos;s failing about half of the time now.

@@ -1 +1 @@
-Successfully opened the database in a new document
+Unexpected success during the first database open on document load. DB opening: opendatabase-after-storage-crash.htmlTue Jul 17 2018 12:03:43 GMT-0700 (PDT). Version opening: 1. SessionStorage value: undefined</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1442843</commentid>
    <comment_count>2</comment_count>
    <who name="Brady Eidson">beidson</who>
    <bug_when>2018-07-17 16:31:10 -0700</bug_when>
    <thetext>I&apos;ve tried to fix this a few times.

It&apos;s current inexplicable to me why the failure that is still happening is possible.

*sigh*</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443584</commentid>
    <comment_count>3</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2018-07-19 16:30:40 -0700</bug_when>
    <thetext>Marked test as flaky in https://trac.webkit.org/r234015.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443585</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2018-07-19 16:31:31 -0700</bug_when>
    <thetext>&lt;rdar://problem/42405935&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443630</commentid>
    <comment_count>5</comment_count>
      <attachid>345413</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2018-07-19 18:07:35 -0700</bug_when>
    <thetext>Created attachment 345413
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443953</commentid>
    <comment_count>6</comment_count>
      <attachid>345413</attachid>
    <who name="Brady Eidson">beidson</who>
    <bug_when>2018-07-20 16:46:59 -0700</bug_when>
    <thetext>Comment on attachment 345413
Patch

You should remove the mark-as-flaky</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443966</commentid>
    <comment_count>7</comment_count>
      <attachid>345490</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2018-07-20 17:02:16 -0700</bug_when>
    <thetext>Created attachment 345490
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443980</commentid>
    <comment_count>8</comment_count>
      <attachid>345490</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-07-20 17:41:52 -0700</bug_when>
    <thetext>Comment on attachment 345490
Patch for landing

Clearing flags on attachment: 345490

Committed r234077: &lt;https://trac.webkit.org/changeset/234077&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1443981</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-07-20 17:41:53 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1448137</commentid>
    <comment_count>10</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2018-08-06 09:21:40 -0700</bug_when>
    <thetext>after https://trac.webkit.org/changeset/234077 We began to see tests in the svg/ directory begin to flake randomly. 

This issue is detailed in https://bugs.webkit.org/show_bug.cgi?id=187931

I found that after this change to storage/indexeddb/modern/opendatabase-after-storage-crash.html that this test would set a state that caused any test in the svg/ directory to have a chance of timeout. 

I have skipped this test in: 
https://trac.webkit.org/changeset/234602/webkit</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1448302</commentid>
    <comment_count>11</comment_count>
      <attachid>346666</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2018-08-06 17:07:47 -0700</bug_when>
    <thetext>Created attachment 346666
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1449065</commentid>
    <comment_count>12</comment_count>
      <attachid>346852</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2018-08-09 11:29:16 -0700</bug_when>
    <thetext>Created attachment 346852
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1453635</commentid>
    <comment_count>13</comment_count>
      <attachid>346852</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-08-24 17:38:44 -0700</bug_when>
    <thetext>Comment on attachment 346852
Patch

Rejecting attachment 346852 from commit-queue.

Failed to run &quot;[&apos;/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch&apos;, &apos;--status-host=webkit-queues.webkit.org&apos;, &apos;--bot-id=webkit-cq-03&apos;, &apos;land-attachment&apos;, &apos;--force-clean&apos;, &apos;--non-interactive&apos;, &apos;--parent-command=commit-queue&apos;, 346852, &apos;--port=mac&apos;]&quot; exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as commit-queue@webkit.org...
Fetching: https://bugs.webkit.org/attachment.cgi?id=346852&amp;action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=187648&amp;ctype=xml&amp;excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Processing patch 346852 from bug 187648.
Fetching: https://bugs.webkit.org/attachment.cgi?id=346852
Failed to run &quot;[&apos;git&apos;, &apos;svn&apos;, &apos;dcommit&apos;, &apos;--rmdir&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/platform/wk2/TestExpectations
	M	LayoutTests/storage/indexeddb/modern/opendatabase-after-storage-crash.html

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:
Commits are currently disabled while we update infrastructure.
W: eed6554d82f4ac9a175e722742f09c327e278291 and refs/remotes/origin/master differ, using rebase:
:040000 040000 c39453c186f0451c3e13da98f776e98f671cdf31 9631be1100237ff43f4ef7c0005cc5185c77722d M	LayoutTests
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run &quot;[&apos;git&apos;, &apos;svn&apos;, &apos;dcommit&apos;, &apos;--rmdir&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/platform/wk2/TestExpectations
	M	LayoutTests/storage/indexeddb/modern/opendatabase-after-storage-crash.html

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:
Commits are currently disabled while we update infrastructure.
W: eed6554d82f4ac9a175e722742f09c327e278291 and refs/remotes/origin/master differ, using rebase:
:040000 040000 c39453c186f0451c3e13da98f776e98f671cdf31 9631be1100237ff43f4ef7c0005cc5185c77722d M	LayoutTests
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run &quot;[&apos;git&apos;, &apos;svn&apos;, &apos;dcommit&apos;, &apos;--rmdir&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.
Total errors found: 0 in 1 files

Full output: https://webkit-queues.webkit.org/results/8977468</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1454235</commentid>
    <comment_count>14</comment_count>
      <attachid>346852</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-08-27 17:35:35 -0700</bug_when>
    <thetext>Comment on attachment 346852
Patch

Clearing flags on attachment: 346852

Committed r235415: &lt;https://trac.webkit.org/changeset/235415&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1454236</commentid>
    <comment_count>15</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-08-27 17:35:37 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>345413</attachid>
            <date>2018-07-19 18:07:35 -0700</date>
            <delta_ts>2018-07-20 17:02:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-187648-20180719180735.patch</filename>
            <type>text/plain</type>
            <size>5903</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzOTAwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzA0ODA0ZTA1ODEyYzg4YjgyNDlj
YTZlNjhlNjQxMDhjNjkwNTllNC4uNjVlNTBjZWU0OWQ3YjRmYWM0NjRlOWU2ZDQxNDg1MzBhMmMz
ODZlMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA3LTE5ICBTaWh1aSBMaXUgIDxzaWh1
aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFsgTWFjT1MgaU9TIF0gTGF5b3V0IFRlc3Qgc3Rv
cmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0
bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTE4NzY0OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDI0MDU5MzU+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0ZXN0IHdhaXQgdW50
aWwgcmVxdWVzdCBmaW5pc2hlcyB0byBnZXQgY29ycmVjdCByZXN1bHQuCisKKyAgICAgICAgKiBz
dG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vb3BlbmRhdGFiYXNlLWFmdGVyLXN0b3JhZ2UtY3Jhc2gt
ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0
YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1sOgorCiAyMDE4LTA3LTE3ICBKaWV3ZW4gVGFu
ICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgdGVzdCBnYXJk
ZW5pbmcgYWZ0ZXIgcjIzMzg5OC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5k
ZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC1leHBlY3RlZC50
eHQgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vb3BlbmRhdGFiYXNlLWFm
dGVyLXN0b3JhZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0CmluZGV4IDU5ZWQ5OWZkNTgzNzJkNjMwN2Nh
MjQxYzEyNmQxMTJiMmMyYTE1NTcuLjQ3Yjg3MjdhOTM5NWI1ZDNjNGEzZDNmMWE2YTBkZTFlODE2
NTk0OWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9v
cGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0
VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdl
LWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMSArMSwyIEBACi1TdWNjZXNzZnVsbHkgb3BlbmVkIHRo
ZSBkYXRhYmFzZSBpbiBhIG5ldyBkb2N1bWVudAorUEFTUyBzZXNzaW9uU3RvcmFnZVtzdG9yYWdl
S2V5XSBpcyAiTWFkZSBpdCIKK1N1Y2Nlc3NmdWxseSBvcGVuZWQgZGF0YWJhc2Ugd2l0aCB2ZXJz
aW9uIDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v
b3BlbmRhdGFiYXNlLWFmdGVyLXN0b3JhZ2UtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL3N0b3Jh
Z2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1s
CmluZGV4IDczY2IzMzZlNTNjODFlYjU4NmRjZThlODVlNDZkYTU2NDRlZTVlZjcuLjQ0ZDczZDQy
ZDA5Y2ZjNzkwNmI4ZTM0YWM5OTE4MjJmZjA3YjdkODggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFz
aC5odG1sCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0
YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1sCkBAIC0xLDcgKzEsNyBAQAogPHNjcmlwdCBz
cmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3Jj
PSIuLi9yZXNvdXJjZXMvc2hhcmVkLmpzIj48L3NjcmlwdD4KIDxib2R5PgotSWYgdGhpcyB0ZXN0
IGNvbXBsZXRlcyBxdWlja2x5IGluc3RlYWQgb2YgaGFuZ2luZyBpbmRlZmluaXRlbHksIGl0IGhh
cyBwYXNzZWQuCitUaGlzIHRlc3QgdmVyaWZpZXMgd2hlbiBzdG9yYWdlIHByb2Nlc3MgY3Jhc2hl
cywgaW5kZXhlZERCIG9wZXJhdGlvbiBzaG91bGQgbm90IGhhbmcgaW5kZWZpbml0ZWx5LgogPC9i
b2R5PgogPHNjcmlwdD4KIApAQCAtMTIsNjYgKzEyLDY1IEBAIGZ1bmN0aW9uIGNvbnRpbnVlVGVz
dCgpCiB7CiAJdmFyIHJlcXVlc3QgPSB3aW5kb3cuaW5kZXhlZERCLm9wZW4oZGJuYW1lLCAyKTsK
IAlyZXF1ZXN0Lm9udXBncmFkZW5lZWRlZCA9IGZ1bmN0aW9uKGUpIHsKLQkJZG9jdW1lbnQuYm9k
eS5pbm5lckhUTUwgPSAib3BlbkRhdGFiYXNlIGNhbGwgYWZ0ZXIgc3RvcmFnZSBwcm9jZXNzIHRl
cm1pbmF0aW9uIHNob3VsZCBub3QgaGF2ZSByZXN1bHRlZCBpbiB1cGdyYWRlbmVlZGVkIjsKKwkJ
ZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAiVW5leHBlY3RlZCB1cGdyYWRlbmVlZGVkIGFmdGVy
IHN0b3JhZ2UgcHJvY2VzcyB0ZXJtaW5hdGlvbi4gRGF0YWJhc2U6IG5hbWUgIiArIGRibmFtZSAr
ICIsIHZlcnNpb24gMi4iOwogCQlpZiAod2luZG93LnRlc3RSdW5uZXIpCiAJCQl0ZXN0UnVubmVy
Lm5vdGlmeURvbmUoKTsKLQogCX0KLQkKKwogCXJlcXVlc3Qub25lcnJvciA9IGZ1bmN0aW9uKGUp
IHsKIAkJLy8gR29vZCwgd2UgcmVjZWl2ZWQgYW4gZXhwZWN0ZWQgZXJyb3IuCiAJCS8vIE5vdyBy
ZWxvYWQgdG8gc2VlIGlmIGEgbmV3IGRvY3VtZW50IGNvbm5lY3RzIHN1Y2Nlc3NmdWxseQogCQlp
ZiAoc2Vzc2lvblN0b3JhZ2Vbc3RvcmFnZUtleV0pIHsKLQkJCWRvY3VtZW50LmJvZHkuaW5uZXJI
VE1MID0gIlNob3VsZCBub3QgaGF2ZSByZWFjaGVkIHRoaXMgY29kZSB0d2ljZSEiOworCQkJZG9j
dW1lbnQuYm9keS5pbm5lckhUTUwgPSAiUmVjZWl2ZWQgZXJyb3IgbW9yZSB0aGFuIG9uY2UgdW5l
eHBlY3RlZGx5LiBEYXRhYmFzZTogbmFtZSAiICsgZGJuYW1lICsgIiwgdmVyc2lvbiAyLiI7CiAJ
CQlpZiAod2luZG93LnRlc3RSdW5uZXIpCiAJCQkJdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CiAJ
CQlyZXR1cm47CiAJCX0KLQkJCisKIAkJc2Vzc2lvblN0b3JhZ2Vbc3RvcmFnZUtleV0gPSAiTWFk
ZSBpdCI7CiAJCWxvY2F0aW9uLnJlbG9hZCgpOwogCX0KIAogCXJlcXVlc3Qub25zdWNjZXNzID0g
ZnVuY3Rpb24oZSkgewotCQlkb2N1bWVudC5ib2R5LmlubmVySFRNTCA9ICJVbmV4cGVjdGVkIHN1
Y2Nlc3MgZHVyaW5nIHRoZSBzZWNvbmQgZGF0YWJhc2Ugb3BlbiBhZnRlciBkb2N1bWVudCBsb2Fk
LiBTZXNzaW9uU3RvcmFnZSB2YWx1ZTogIiArIHNlc3Npb25TdG9yYWdlW3N0b3JhZ2VLZXldOwor
CQlkb2N1bWVudC5ib2R5LmlubmVySFRNTCA9ICJVbmV4cGVjdGVkIHVwZ3JhZGVuZWVkZWQgYWZ0
ZXIgc3RvcmFnZSBwcm9jZXNzIHRlcm1pbmF0aW9uLiBEYXRhYmFzZTogbmFtZSAiICsgZGJuYW1l
ICsgIiwgdmVyc2lvbiAyLiBTZXNzaW9uU3RvcmFnZSB2YWx1ZTogIiArIHNlc3Npb25TdG9yYWdl
W3N0b3JhZ2VLZXldICsgIi4iOwogCQlpZiAod2luZG93LnRlc3RSdW5uZXIpCiAJCQl0ZXN0UnVu
bmVyLm5vdGlmeURvbmUoKTsKIAl9CiB9CiAKLXZhciB2ZXJzaW9uVG9PcGVuID0gc2Vzc2lvblN0
b3JhZ2UuZmluaXNoZWRGaXJzdE9wZW4gPyAzIDogMTsKK3ZhciB2ZXJzaW9uVG9PcGVuID0gc2Vz
c2lvblN0b3JhZ2UuZG9uZUZpcnN0TG9hZCA/IDMgOiAxOwogdmFyIHJlcXVlc3QgPSB3aW5kb3cu
aW5kZXhlZERCLm9wZW4oZGJuYW1lLCB2ZXJzaW9uVG9PcGVuKTsKKwogcmVxdWVzdC5vbnVwZ3Jh
ZGVuZWVkZWQgPSBmdW5jdGlvbihlKSB7Ci0JaWYgKHNlc3Npb25TdG9yYWdlLmZpbmlzaGVkRmly
c3RPcGVuKSB7Ci0JCWRvY3VtZW50LmJvZHkuaW5uZXJIVE1MID0gIiI7Ci0JCWlmIChzZXNzaW9u
U3RvcmFnZVtzdG9yYWdlS2V5XSAhPSAiTWFkZSBpdCIpCi0JCQlkb2N1bWVudC5ib2R5LmlubmVy
SFRNTCArPSAiRXhwZWN0ZWQgZXJyb3IgaW4gdGhlIGZpcnN0IHBhc3Mgb2YgdGhlIHRlc3Qgd2Fz
IE5PVCBsb2dnZWQ8YnI+IjsKLQkJZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgKz0gIlN1Y2Nlc3Nm
dWxseSBvcGVuZWQgdGhlIGRhdGFiYXNlIGluIGEgbmV3IGRvY3VtZW50IgorCWlmIChzZXNzaW9u
U3RvcmFnZS5kb25lRmlyc3RMb2FkKSB7CisJCWRvY3VtZW50LmJvZHkuaW5uZXJIVE1MID0gIlN1
Y2Nlc3NmdWxseSBvcGVuZWQgZGF0YWJhc2Ugd2l0aCB2ZXJzaW9uICIgKyB2ZXJzaW9uVG9PcGVu
ICsgIi4iOworCQlzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3Nlc3Npb25TdG9yYWdlW3N0b3JhZ2VL
ZXldJywgJ01hZGUgaXQnKTsKKwogCQlpZiAod2luZG93LnRlc3RSdW5uZXIpCiAJCQl0ZXN0UnVu
bmVyLm5vdGlmeURvbmUoKTsKIAl9CiAJCi0Jc2Vzc2lvblN0b3JhZ2UuZmluaXNoZWRGaXJzdE9w
ZW4gPSB0cnVlOwotCQotCWlmICh3aW5kb3cudGVzdFJ1bm5lcikKLQkJdGVzdFJ1bm5lci50ZXJt
aW5hdGVTdG9yYWdlUHJvY2VzcygpOworCXNlc3Npb25TdG9yYWdlLmRvbmVGaXJzdExvYWQgPSB0
cnVlOwogCiAJLy8gU2V0IGFuIGVycm9yIGhhbmRsZXIgb24gdGhlIGRhdGFiYXNlIGNvbm5lY3Rp
b24gc28gb25jZSB0aGUgc3RvcmFnZSBwcm9jZXNzIHRlcm1pbmF0ZXMgd2Uga25vdyB0byBjb250
aW51ZSB0aGUgdGVzdAogCWUudGFyZ2V0LnJlc3VsdC5vbmVycm9yID0gZnVuY3Rpb24oZSkgewog
CQlzZXRUaW1lb3V0KGNvbnRpbnVlVGVzdCwgMCk7CiAJfQorCisJaWYgKHdpbmRvdy50ZXN0UnVu
bmVyKSB7CisJCXRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworCQl0ZXN0UnVubmVyLnRlcm1p
bmF0ZVN0b3JhZ2VQcm9jZXNzKCk7CisJfQogfQogCiByZXF1ZXN0Lm9uZXJyb3IgPSBmdW5jdGlv
bihlKSB7Ci0JZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAiVW5leHBlY3RlZCBlcnJvciBkdXJp
bmcgdGhlIGZpcnN0IGRhdGFiYXNlIG9wZW4gb24gZG9jdW1lbnQgbG9hZC4gTWVzc2FnZTogIiAr
IGUubWVzc2FnZSArICIuIERCIG9wZW5pbmc6ICIgKyBkYm5hbWUgKyAiLiBWZXJzaW9uIG9wZW5p
bmc6ICIgKyB2ZXJzaW9uVG9PcGVuICsgIi4gU2Vzc2lvblN0b3JhZ2UgdmFsdWU6ICIgKyBzZXNz
aW9uU3RvcmFnZVtzdG9yYWdlS2V5XTsKLQlpZiAod2luZG93LnRlc3RSdW5uZXIpCi0JCXRlc3RS
dW5uZXIubm90aWZ5RG9uZSgpOworCWlmICh2ZXJzaW9uVG9PcGVuID09IDEpCisJCWRvY3VtZW50
LmJvZHkuaW5uZXJIVE1MID0gIkVycm9yIG9uIG9wZW5pbmcgcmV1cWVzdCBmb3IgZGF0YWJhc2Ug
dmVyc2lvbiAxLiAoRkFJTDogdGVzdCBzaG91bGQgc3RvcCBhdCBvcGVuaW5nIHZlcnNpb24gMy4p
IjsgCiB9CiAKIHJlcXVlc3Qub25zdWNjZXNzID0gZnVuY3Rpb24oZSkgewotCWRvY3VtZW50LmJv
ZHkuaW5uZXJIVE1MID0gIlVuZXhwZWN0ZWQgc3VjY2VzcyBkdXJpbmcgdGhlIGZpcnN0IGRhdGFi
YXNlIG9wZW4gb24gZG9jdW1lbnQgbG9hZC4gREIgb3BlbmluZzogIiArIGRibmFtZSArICIuIFZl
cnNpb24gb3BlbmluZzogIiArIHZlcnNpb25Ub09wZW4gKyAiLiBTZXNzaW9uU3RvcmFnZSB2YWx1
ZTogIiArIHNlc3Npb25TdG9yYWdlW3N0b3JhZ2VLZXldOwotCWlmICh3aW5kb3cudGVzdFJ1bm5l
cikKLQkJdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisJaWYgKHZlcnNpb25Ub09wZW4gPT0gMSkK
KwkJZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAiU3VjY2VzcyBvbiBvcGVuaW5nIHJldXFlc3Qg
Zm9yIGRhdGFiYXNlIHZlcnNpb24gMS4gKEZBSUw6IHRlc3Qgc2hvdWxkIHN0b3AgYXQgb3Blbmlu
ZyB2ZXJzaW9uIDMuKSI7CiB9CiAKIDwvc2NyaXB0Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>345490</attachid>
            <date>2018-07-20 17:02:16 -0700</date>
            <delta_ts>2018-08-06 17:07:46 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-187648-20180720170216.patch</filename>
            <type>text/plain</type>
            <size>6748</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDc1CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2ZmNWQ1MTMyNzllOGQxNDExYWI4
N2ExMWQ2MzRiYjBhMjZlZGU0OS4uYjRiNzAxZTZlMjQ3MjcwM2RhYzcxYWE0MDMxZmI5YjJhNDdh
ZGU2YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA3LTIwICBTaWh1aSBMaXUgIDxzaWh1
aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFsgTWFjT1MgaU9TIF0gTGF5b3V0IFRlc3Qgc3Rv
cmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0
bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTE4NzY0OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDI0MDU5MzU+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgorCisgICAgICAgIE1ha2UgdGVzdCB3YWl0IHVudGls
IHJlcXVlc3RzIGZpbmlzaCB0byBnZXQgY29ycmVjdCByZXN1bHQsIGJlY2F1c2UgaW5kZXhlZERC
IG9wZXJhdGlvbnMgYXJlIGFzeW5jaHJvbm91cy4KKworICAgICAgICAqIHN0b3JhZ2UvaW5kZXhl
ZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC1leHBlY3RlZC50eHQ6
CisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1z
dG9yYWdlLWNyYXNoLmh0bWw6CisKIDIwMTgtMDctMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy
YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGNvbXBsZXRlZCBhbmltYXRpb25zIGZy
b20gR3JhcGhpY3NMYXllciwgdGh1cyBhdm9pZGluZyBleGNlc3NpdmUgYmFja2luZyBzdG9yZSBh
bGxvY2F0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVj
dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4
IDVkY2ExNWE5MTllNjNlMTJmNzMxYWVjZDIzMjA3YjhiMTNkZDA5ZDQuLmViMTc3NDBmNjAzZWI1
NDZkZGQzMTE3NjMxYjVjNWYzYjA0YjI5ZmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm
b3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9U
ZXN0RXhwZWN0YXRpb25zCkBAIC03MzYsNyArNzM2LDcgQEAgaHR0cC90ZXN0cy9uYXZpZ2F0aW9u
L3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCiBodHRwL3dwdC9jcm9zcy1v
cmlnaW4tcmVzb3VyY2UtcG9saWN5LyBbIFBhc3MgXQogCiBodHRwL3Rlc3RzL25hdmlnYXRpb24v
dXNlcmFnZW50LXJlbG9hZC5waHAgWyBQYXNzIF0KLXdlYmtpdC5vcmcvYi8xODc2NDggc3RvcmFn
ZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwg
WyBQYXNzIEZhaWx1cmUgXQorc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1h
ZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwgWyBQYXNzIF0KIAogCiAjIyMgRU5EIE9GICg1KSBQcm9n
cmVzc2lvbnMsIGV4cGVjdGVkIHN1Y2Nlc3NlcyB0aGF0IGFyZSBleHBlY3RlZCBmYWlsdXJlcyBp
biBXZWJLaXQxLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW9k
ZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFn
ZS1jcmFzaC1leHBlY3RlZC50eHQKaW5kZXggNTllZDk5ZmQ1ODM3MmQ2MzA3Y2EyNDFjMTI2ZDEx
MmIyYzJhMTU1Ny4uNDdiODcyN2E5Mzk1YjVkM2M0YTNkM2YxYTZhMGRlMWU4MTY1OTQ5YiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFz
ZS1hZnRlci1zdG9yYWdlLWNyYXNoLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9zdG9y
YWdlL2luZGV4ZWRkYi9tb2Rlcm4vb3BlbmRhdGFiYXNlLWFmdGVyLXN0b3JhZ2UtY3Jhc2gtZXhw
ZWN0ZWQudHh0CkBAIC0xICsxLDIgQEAKLVN1Y2Nlc3NmdWxseSBvcGVuZWQgdGhlIGRhdGFiYXNl
IGluIGEgbmV3IGRvY3VtZW50CitQQVNTIHNlc3Npb25TdG9yYWdlW3N0b3JhZ2VLZXldIGlzICJN
YWRlIGl0IgorU3VjY2Vzc2Z1bGx5IG9wZW5lZCBkYXRhYmFzZSB3aXRoIHZlcnNpb24gMy4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJh
c2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVk
ZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwKaW5kZXggNzNj
YjMzNmU1M2M4MWViNTg2ZGNlOGU4NWU0NmRhNTY0NGVlNWVmNy4uNDRkNzNkNDJkMDljZmM3OTA2
YjhlMzRhYzk5MTgyMmZmMDdiN2Q4OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9p
bmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwKKysr
IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRl
ci1zdG9yYWdlLWNyYXNoLmh0bWwKQEAgLTEsNyArMSw3IEBACiA8c2NyaXB0IHNyYz0iLi4vLi4v
Li4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uL3Jlc291
cmNlcy9zaGFyZWQuanMiPjwvc2NyaXB0PgogPGJvZHk+Ci1JZiB0aGlzIHRlc3QgY29tcGxldGVz
IHF1aWNrbHkgaW5zdGVhZCBvZiBoYW5naW5nIGluZGVmaW5pdGVseSwgaXQgaGFzIHBhc3NlZC4K
K1RoaXMgdGVzdCB2ZXJpZmllcyB3aGVuIHN0b3JhZ2UgcHJvY2VzcyBjcmFzaGVzLCBpbmRleGVk
REIgb3BlcmF0aW9uIHNob3VsZCBub3QgaGFuZyBpbmRlZmluaXRlbHkuCiA8L2JvZHk+CiA8c2Ny
aXB0PgogCkBAIC0xMiw2NiArMTIsNjUgQEAgZnVuY3Rpb24gY29udGludWVUZXN0KCkKIHsKIAl2
YXIgcmVxdWVzdCA9IHdpbmRvdy5pbmRleGVkREIub3BlbihkYm5hbWUsIDIpOwogCXJlcXVlc3Qu
b251cGdyYWRlbmVlZGVkID0gZnVuY3Rpb24oZSkgewotCQlkb2N1bWVudC5ib2R5LmlubmVySFRN
TCA9ICJvcGVuRGF0YWJhc2UgY2FsbCBhZnRlciBzdG9yYWdlIHByb2Nlc3MgdGVybWluYXRpb24g
c2hvdWxkIG5vdCBoYXZlIHJlc3VsdGVkIGluIHVwZ3JhZGVuZWVkZWQiOworCQlkb2N1bWVudC5i
b2R5LmlubmVySFRNTCA9ICJVbmV4cGVjdGVkIHVwZ3JhZGVuZWVkZWQgYWZ0ZXIgc3RvcmFnZSBw
cm9jZXNzIHRlcm1pbmF0aW9uLiBEYXRhYmFzZTogbmFtZSAiICsgZGJuYW1lICsgIiwgdmVyc2lv
biAyLiI7CiAJCWlmICh3aW5kb3cudGVzdFJ1bm5lcikKIAkJCXRlc3RSdW5uZXIubm90aWZ5RG9u
ZSgpOwotCiAJfQotCQorCiAJcmVxdWVzdC5vbmVycm9yID0gZnVuY3Rpb24oZSkgewogCQkvLyBH
b29kLCB3ZSByZWNlaXZlZCBhbiBleHBlY3RlZCBlcnJvci4KIAkJLy8gTm93IHJlbG9hZCB0byBz
ZWUgaWYgYSBuZXcgZG9jdW1lbnQgY29ubmVjdHMgc3VjY2Vzc2Z1bGx5CiAJCWlmIChzZXNzaW9u
U3RvcmFnZVtzdG9yYWdlS2V5XSkgewotCQkJZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAiU2hv
dWxkIG5vdCBoYXZlIHJlYWNoZWQgdGhpcyBjb2RlIHR3aWNlISI7CisJCQlkb2N1bWVudC5ib2R5
LmlubmVySFRNTCA9ICJSZWNlaXZlZCBlcnJvciBtb3JlIHRoYW4gb25jZSB1bmV4cGVjdGVkbHku
IERhdGFiYXNlOiBuYW1lICIgKyBkYm5hbWUgKyAiLCB2ZXJzaW9uIDIuIjsKIAkJCWlmICh3aW5k
b3cudGVzdFJ1bm5lcikKIAkJCQl0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKIAkJCXJldHVybjsK
IAkJfQotCQkKKwogCQlzZXNzaW9uU3RvcmFnZVtzdG9yYWdlS2V5XSA9ICJNYWRlIGl0IjsKIAkJ
bG9jYXRpb24ucmVsb2FkKCk7CiAJfQogCiAJcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbihl
KSB7Ci0JCWRvY3VtZW50LmJvZHkuaW5uZXJIVE1MID0gIlVuZXhwZWN0ZWQgc3VjY2VzcyBkdXJp
bmcgdGhlIHNlY29uZCBkYXRhYmFzZSBvcGVuIGFmdGVyIGRvY3VtZW50IGxvYWQuIFNlc3Npb25T
dG9yYWdlIHZhbHVlOiAiICsgc2Vzc2lvblN0b3JhZ2Vbc3RvcmFnZUtleV07CisJCWRvY3VtZW50
LmJvZHkuaW5uZXJIVE1MID0gIlVuZXhwZWN0ZWQgdXBncmFkZW5lZWRlZCBhZnRlciBzdG9yYWdl
IHByb2Nlc3MgdGVybWluYXRpb24uIERhdGFiYXNlOiBuYW1lICIgKyBkYm5hbWUgKyAiLCB2ZXJz
aW9uIDIuIFNlc3Npb25TdG9yYWdlIHZhbHVlOiAiICsgc2Vzc2lvblN0b3JhZ2Vbc3RvcmFnZUtl
eV0gKyAiLiI7CiAJCWlmICh3aW5kb3cudGVzdFJ1bm5lcikKIAkJCXRlc3RSdW5uZXIubm90aWZ5
RG9uZSgpOwogCX0KIH0KIAotdmFyIHZlcnNpb25Ub09wZW4gPSBzZXNzaW9uU3RvcmFnZS5maW5p
c2hlZEZpcnN0T3BlbiA/IDMgOiAxOwordmFyIHZlcnNpb25Ub09wZW4gPSBzZXNzaW9uU3RvcmFn
ZS5kb25lRmlyc3RMb2FkID8gMyA6IDE7CiB2YXIgcmVxdWVzdCA9IHdpbmRvdy5pbmRleGVkREIu
b3BlbihkYm5hbWUsIHZlcnNpb25Ub09wZW4pOworCiByZXF1ZXN0Lm9udXBncmFkZW5lZWRlZCA9
IGZ1bmN0aW9uKGUpIHsKLQlpZiAoc2Vzc2lvblN0b3JhZ2UuZmluaXNoZWRGaXJzdE9wZW4pIHsK
LQkJZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAiIjsKLQkJaWYgKHNlc3Npb25TdG9yYWdlW3N0
b3JhZ2VLZXldICE9ICJNYWRlIGl0IikKLQkJCWRvY3VtZW50LmJvZHkuaW5uZXJIVE1MICs9ICJF
eHBlY3RlZCBlcnJvciBpbiB0aGUgZmlyc3QgcGFzcyBvZiB0aGUgdGVzdCB3YXMgTk9UIGxvZ2dl
ZDxicj4iOwotCQlkb2N1bWVudC5ib2R5LmlubmVySFRNTCArPSAiU3VjY2Vzc2Z1bGx5IG9wZW5l
ZCB0aGUgZGF0YWJhc2UgaW4gYSBuZXcgZG9jdW1lbnQiCisJaWYgKHNlc3Npb25TdG9yYWdlLmRv
bmVGaXJzdExvYWQpIHsKKwkJZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSAiU3VjY2Vzc2Z1bGx5
IG9wZW5lZCBkYXRhYmFzZSB3aXRoIHZlcnNpb24gIiArIHZlcnNpb25Ub09wZW4gKyAiLiI7CisJ
CXNob3VsZEJlRXF1YWxUb1N0cmluZygnc2Vzc2lvblN0b3JhZ2Vbc3RvcmFnZUtleV0nLCAnTWFk
ZSBpdCcpOworCiAJCWlmICh3aW5kb3cudGVzdFJ1bm5lcikKIAkJCXRlc3RSdW5uZXIubm90aWZ5
RG9uZSgpOwogCX0KIAkKLQlzZXNzaW9uU3RvcmFnZS5maW5pc2hlZEZpcnN0T3BlbiA9IHRydWU7
Ci0JCi0JaWYgKHdpbmRvdy50ZXN0UnVubmVyKQotCQl0ZXN0UnVubmVyLnRlcm1pbmF0ZVN0b3Jh
Z2VQcm9jZXNzKCk7CisJc2Vzc2lvblN0b3JhZ2UuZG9uZUZpcnN0TG9hZCA9IHRydWU7CiAKIAkv
LyBTZXQgYW4gZXJyb3IgaGFuZGxlciBvbiB0aGUgZGF0YWJhc2UgY29ubmVjdGlvbiBzbyBvbmNl
IHRoZSBzdG9yYWdlIHByb2Nlc3MgdGVybWluYXRlcyB3ZSBrbm93IHRvIGNvbnRpbnVlIHRoZSB0
ZXN0CiAJZS50YXJnZXQucmVzdWx0Lm9uZXJyb3IgPSBmdW5jdGlvbihlKSB7CiAJCXNldFRpbWVv
dXQoY29udGludWVUZXN0LCAwKTsKIAl9CisKKwlpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKwkJ
dGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisJCXRlc3RSdW5uZXIudGVybWluYXRlU3RvcmFn
ZVByb2Nlc3MoKTsKKwl9CiB9CiAKIHJlcXVlc3Qub25lcnJvciA9IGZ1bmN0aW9uKGUpIHsKLQlk
b2N1bWVudC5ib2R5LmlubmVySFRNTCA9ICJVbmV4cGVjdGVkIGVycm9yIGR1cmluZyB0aGUgZmly
c3QgZGF0YWJhc2Ugb3BlbiBvbiBkb2N1bWVudCBsb2FkLiBNZXNzYWdlOiAiICsgZS5tZXNzYWdl
ICsgIi4gREIgb3BlbmluZzogIiArIGRibmFtZSArICIuIFZlcnNpb24gb3BlbmluZzogIiArIHZl
cnNpb25Ub09wZW4gKyAiLiBTZXNzaW9uU3RvcmFnZSB2YWx1ZTogIiArIHNlc3Npb25TdG9yYWdl
W3N0b3JhZ2VLZXldOwotCWlmICh3aW5kb3cudGVzdFJ1bm5lcikKLQkJdGVzdFJ1bm5lci5ub3Rp
ZnlEb25lKCk7CisJaWYgKHZlcnNpb25Ub09wZW4gPT0gMSkKKwkJZG9jdW1lbnQuYm9keS5pbm5l
ckhUTUwgPSAiRXJyb3Igb24gb3BlbmluZyByZXVxZXN0IGZvciBkYXRhYmFzZSB2ZXJzaW9uIDEu
IChGQUlMOiB0ZXN0IHNob3VsZCBzdG9wIGF0IG9wZW5pbmcgdmVyc2lvbiAzLikiOyAKIH0KIAog
cmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbihlKSB7Ci0JZG9jdW1lbnQuYm9keS5pbm5lckhU
TUwgPSAiVW5leHBlY3RlZCBzdWNjZXNzIGR1cmluZyB0aGUgZmlyc3QgZGF0YWJhc2Ugb3BlbiBv
biBkb2N1bWVudCBsb2FkLiBEQiBvcGVuaW5nOiAiICsgZGJuYW1lICsgIi4gVmVyc2lvbiBvcGVu
aW5nOiAiICsgdmVyc2lvblRvT3BlbiArICIuIFNlc3Npb25TdG9yYWdlIHZhbHVlOiAiICsgc2Vz
c2lvblN0b3JhZ2Vbc3RvcmFnZUtleV07Ci0JaWYgKHdpbmRvdy50ZXN0UnVubmVyKQotCQl0ZXN0
UnVubmVyLm5vdGlmeURvbmUoKTsKKwlpZiAodmVyc2lvblRvT3BlbiA9PSAxKQorCQlkb2N1bWVu
dC5ib2R5LmlubmVySFRNTCA9ICJTdWNjZXNzIG9uIG9wZW5pbmcgcmV1cWVzdCBmb3IgZGF0YWJh
c2UgdmVyc2lvbiAxLiAoRkFJTDogdGVzdCBzaG91bGQgc3RvcCBhdCBvcGVuaW5nIHZlcnNpb24g
My4pIjsKIH0KIAogPC9zY3JpcHQ+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>346666</attachid>
            <date>2018-08-06 17:07:47 -0700</date>
            <delta_ts>2018-08-09 11:29:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-187648-20180806170746.patch</filename>
            <type>text/plain</type>
            <size>2576</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NjAzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2QzNzJjNDU3M2Q0YjA5NmRkMGIx
ODJkZTBhOGIyYmFjNjQxMzUzNy4uMjAxNmYyYTU1M2UyZTgyZDQwYmNjMjBhOWRlZDY3MDdlN2Y2
OGI3MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA4LTA2ICBTaWh1aSBMaXUgIDxzaWh1
aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFsgTWFjT1MgaU9TIF0gTGF5b3V0IFRlc3Qgc3Rv
cmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0
bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTE4NzY0OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDI0MDU5MzU+CisKKyAgICAgICAg
QWRkIGFuIGVhcmx5IGV4aXQgc28gdGVzdCBkb2VzIG5vdCBjYWxsIHdhaXRVbnRpbERvbmUgYWZ0
ZXIgdGVzdCBlbmRzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogc3RvcmFn
ZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWw6
CisKIDIwMTgtMDgtMDYgIFRydWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAg
ICAgICBzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vb3BlbmRhdGFiYXNlLWFmdGVyLXN0b3JhZ2Ut
Y3Jhc2guaHRtbCBpcyBjYXVzaW5nIHRlc3RzIGluIGRpcmVjdG9yeSBzdmcvIHRvIHRpbWVvdXQg
YXQgcmFuZG9tCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVj
dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4
IDdkZmFhN2M1MmMzNTM0OTUzMGVjZWJkMDI4NGIwOWM4MGI2NmMxNjYuLjM5ZWJjMmU4MjU0ZTM2
MmM2MzY2YWQ2ZDczYzY4MWE2Nzk2MmZmMTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm
b3JtL3drMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9U
ZXN0RXhwZWN0YXRpb25zCkBAIC03MzIsNyArNzMyLDcgQEAgaHR0cC90ZXN0cy9uYXZpZ2F0aW9u
L3Byb2Nlc3Mtc3dhcC13aW5kb3ctb3Blbi5odG1sIFsgUGFzcyBdCiBodHRwL3dwdC9jcm9zcy1v
cmlnaW4tcmVzb3VyY2UtcG9saWN5LyBbIFBhc3MgXQogCiBodHRwL3Rlc3RzL25hdmlnYXRpb24v
dXNlcmFnZW50LXJlbG9hZC5waHAgWyBQYXNzIF0KLXdlYmtpdC5vcmcvYi8xODc5MzEgc3RvcmFn
ZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwg
WyBTa2lwIF0KK3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3Rv
cmFnZS1jcmFzaC5odG1sIFsgUGFzcyBdCiAKIAogIyMjIEVORCBPRiAoNSkgUHJvZ3Jlc3Npb25z
LCBleHBlY3RlZCBzdWNjZXNzZXMgdGhhdCBhcmUgZXhwZWN0ZWQgZmFpbHVyZXMgaW4gV2ViS2l0
MS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVu
ZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9p
bmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwKaW5k
ZXggNDRkNzNkNDJkMDljZmM3OTA2YjhlMzRhYzk5MTgyMmZmMDdiN2Q4OC4uNzBlZDQ0YjQ4NGM3
NzRkYzM1ZmFkNDk4MjExZDQ5OGFhNDlhYTRkOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3Rv
cmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0
bWwKKysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFz
ZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWwKQEAgLTQ2LDEwICs0NiwxMiBAQCByZXF1ZXN0Lm9u
dXBncmFkZW5lZWRlZCA9IGZ1bmN0aW9uKGUpIHsKIAkJZG9jdW1lbnQuYm9keS5pbm5lckhUTUwg
PSAiU3VjY2Vzc2Z1bGx5IG9wZW5lZCBkYXRhYmFzZSB3aXRoIHZlcnNpb24gIiArIHZlcnNpb25U
b09wZW4gKyAiLiI7CiAJCXNob3VsZEJlRXF1YWxUb1N0cmluZygnc2Vzc2lvblN0b3JhZ2Vbc3Rv
cmFnZUtleV0nLCAnTWFkZSBpdCcpOwogCi0JCWlmICh3aW5kb3cudGVzdFJ1bm5lcikKKwkJaWYg
KHdpbmRvdy50ZXN0UnVubmVyKSB7CiAJCQl0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKwkJCXJl
dHVybjsKKwkJfQogCX0KLQkKKwogCXNlc3Npb25TdG9yYWdlLmRvbmVGaXJzdExvYWQgPSB0cnVl
OwogCiAJLy8gU2V0IGFuIGVycm9yIGhhbmRsZXIgb24gdGhlIGRhdGFiYXNlIGNvbm5lY3Rpb24g
c28gb25jZSB0aGUgc3RvcmFnZSBwcm9jZXNzIHRlcm1pbmF0ZXMgd2Uga25vdyB0byBjb250aW51
ZSB0aGUgdGVzdAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>346852</attachid>
            <date>2018-08-09 11:29:16 -0700</date>
            <delta_ts>2018-08-27 17:35:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-187648-20180809112916.patch</filename>
            <type>text/plain</type>
            <size>2523</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NzI4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGI3M2JlNDcxNGVjMTZiNDdhNzk5
MWQxNzM4ODdiNTdiOTM2ZjllOS4uZTgxMWFmZjY1YjEzNTk2MzMwNzU2MmIyYWI0ZGY2NjFjMTkz
OTM3MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA4LTA5ICBTaWh1aSBMaXUgIDxzaWh1
aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFsgTWFjT1MgaU9TIF0gTGF5b3V0IFRlc3Qgc3Rv
cmFnZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0
bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTE4NzY0OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDI0MDU5MzU+CisKKyAgICAgICAg
QWRkIGFuIGVhcmx5IGV4aXQgc28gdGVzdCBkb2VzIG5vdCBjYWxsIHdhaXRVbnRpbERvbmUgYWZ0
ZXIgdGVzdCBlbmRzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogc3RvcmFn
ZS9pbmRleGVkZGIvbW9kZXJuL29wZW5kYXRhYmFzZS1hZnRlci1zdG9yYWdlLWNyYXNoLmh0bWw6
CisKIDIwMTgtMDgtMDggIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAK
ICAgICAgICAgQXJyYXkucHJvdG90eXBlLnNvcnQgc2hvdWxkIGNhbGwgQHRvTGVuZ3RoIGluc3Rl
YWQgb2YgIj4+PiAwIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RF
eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwpp
bmRleCBjZDA1M2MxOTQ2NjNkMjQ3NjVkZmUwOWYzNzYyMWFkMTE2YzQ4Y2FiLi43YTVlM2M4YWQy
YzA5ZTVkZDFkMTBmMDQyYmIwNWY4NmVmZTNlZGZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w
bGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93
azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNzM1LDcgKzczNSw3IEBAIGh0dHAvdGVzdHMvbmF2aWdh
dGlvbi9wcm9jZXNzLXN3YXAtd2luZG93LW9wZW4uaHRtbCBbIFBhc3MgXQogaHR0cC93cHQvY3Jv
c3Mtb3JpZ2luLXJlc291cmNlLXBvbGljeS8gWyBQYXNzIF0KIAogaHR0cC90ZXN0cy9uYXZpZ2F0
aW9uL3VzZXJhZ2VudC1yZWxvYWQucGhwIFsgUGFzcyBdCi13ZWJraXQub3JnL2IvMTg3OTMxIHN0
b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5o
dG1sIFsgU2tpcCBdCitzdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4vb3BlbmRhdGFiYXNlLWFmdGVy
LXN0b3JhZ2UtY3Jhc2guaHRtbCBbIFBhc3MgXQogCiAKICMjIyBFTkQgT0YgKDUpIFByb2dyZXNz
aW9ucywgZXhwZWN0ZWQgc3VjY2Vzc2VzIHRoYXQgYXJlIGV4cGVjdGVkIGZhaWx1cmVzIGluIFdl
YktpdDEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9tb2Rlcm4v
b3BlbmRhdGFiYXNlLWFmdGVyLXN0b3JhZ2UtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL3N0b3Jh
Z2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1s
CmluZGV4IDQ0ZDczZDQyZDA5Y2ZjNzkwNmI4ZTM0YWM5OTE4MjJmZjA3YjdkODguLjcwZWQ0NGI0
ODRjNzc0ZGMzNWZhZDQ5ODIxMWQ0OThhYTQ5YWE0ZDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFz
aC5odG1sCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi9vcGVuZGF0
YWJhc2UtYWZ0ZXItc3RvcmFnZS1jcmFzaC5odG1sCkBAIC00NiwxMCArNDYsMTIgQEAgcmVxdWVz
dC5vbnVwZ3JhZGVuZWVkZWQgPSBmdW5jdGlvbihlKSB7CiAJCWRvY3VtZW50LmJvZHkuaW5uZXJI
VE1MID0gIlN1Y2Nlc3NmdWxseSBvcGVuZWQgZGF0YWJhc2Ugd2l0aCB2ZXJzaW9uICIgKyB2ZXJz
aW9uVG9PcGVuICsgIi4iOwogCQlzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3Nlc3Npb25TdG9yYWdl
W3N0b3JhZ2VLZXldJywgJ01hZGUgaXQnKTsKIAotCQlpZiAod2luZG93LnRlc3RSdW5uZXIpCisJ
CWlmICh3aW5kb3cudGVzdFJ1bm5lcikgewogCQkJdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisJ
CQlyZXR1cm47CisJCX0KIAl9Ci0JCisKIAlzZXNzaW9uU3RvcmFnZS5kb25lRmlyc3RMb2FkID0g
dHJ1ZTsKIAogCS8vIFNldCBhbiBlcnJvciBoYW5kbGVyIG9uIHRoZSBkYXRhYmFzZSBjb25uZWN0
aW9uIHNvIG9uY2UgdGhlIHN0b3JhZ2UgcHJvY2VzcyB0ZXJtaW5hdGVzIHdlIGtub3cgdG8gY29u
dGludWUgdGhlIHRlc3QK
</data>

          </attachment>
      

    </bug>

</bugzilla>