From jira at ovirt-jira.atlassian.net Thu Dec 21 07:56:25 2017 Content-Type: multipart/mixed; boundary="===============2565979096870586410==" MIME-Version: 1.0 From: eyal edri (oVirt JIRA) To: infra at ovirt.org Subject: [JIRA] (OVIRT-1812) Gerrit bug check is buggy Date: Thu, 21 Dec 2017 07:56:24 +0000 Message-ID: In-Reply-To: JIRA.33357.1513803155000@Atlassian.JIRA --===============2565979096870586410== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable This is a multi-part message in MIME format... ------------=3D_1513842984-29965-112 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 7bit [ https://ovirt-jira.atlassian.net/browse/OVIRT-1812?page=3Dcom.atlass= ian.jira.plugin.system.issuetabpanels:all-tabpanel ] eyal edri updated OVIRT-1812: ----------------------------- Issue Type: Bug (was: By-EMAIL) > Gerrit bug check is buggy > ------------------------- > > Key: OVIRT-1812 > URL: https://ovirt-jira.atlassian.net/browse/OVIRT-1812 > Project: oVirt - virtualization made easy > Issue Type: Bug > Reporter: Nir Soffer > Assignee: Anton Marchukov > > Gerrit bug check code is treating unrelated urls as Bug-Url: > Patch Set 1: Verified-1 > - Check Bug-Url::1520068::WARN, failed to get bug info (private bug or > bug doesn't exist) > - Check Bug-Url::1527827::OK, classification: 'Red Hat', product: 'Red > Hat Enterprise Virtualization Manager' (-1) > - Check Product::WARN, failed to get bug info (private bug or bug > doesn't exist) > - Check TM::WARN, failed to get bug info (private bug or bug doesn't > exist) > - Check Backport::OK, The patch backported to all the relevant stable > branches. > - Set POST::#1520068::WARN, failed to get bug info (private bug or bug > doesn't exist) > - Update Tracker::#1520068::WARN, failed to get bug info (private bug = or > bug doesn't exist) > - Update Tracker::#1527827::OK, tracker status: POST > The commit message is: > commit 1b666da534c50321ada448e4bf397cab0306fcf1 > Author: Nir Soffer > Date: Tue Dec 5 23:47:24 2017 +0200 > fileSD: Use InterruptibleDirectFile backend > FileStorgeDomainManifest uses now InterruptibleDirectFile for the > external leases backend. This ensure that the process does not become > uninterruptible if storage is non-responsive. > This change bypass the python bug[1] causing the entire process to ha= ng > when opening the special xleases volume. Now the operation is done in > the child process outside of Vdsm. > [1] https://bugzilla.redhat.com/1520068 > Change-Id: I8a0eb42baa73b6c0a877ad9acbe53ac51f31bfea > Bug-Url: https://bugzilla.redhat.com/1527827 > Signed-off-by: Nir Soffer > There is exactly one Bur-Url. The other url is a bugzilla url but it shou= ld > be consumed only by humans, not by machines. Machines should use > only the Bug-Url. > Nir -- This message was sent by Atlassian Jira (v1001.0.0-SNAPSHOT#100075) ------------=3D_1513842984-29965-112 Content-Type: text/html; charset=3D"UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit
[ https://ovirt-jira.atlassian.net/browse/OVIRT-1812?page=3Dcom.atlass=
ian.jira.plugin.system.issuetabpanels:all-tabpanel ]

eyal edri updated OVIRT-1812:

Issue Type: Bug  (was: By-EMAIL)

Gerrit bug check is buggy

     Key: OVIRT-1812
     URL: https://ovirt-jira.atlassian.net/browse/OVIRT-1812
 Project: oVirt - virtualization made easy
         Issue Type: Bug
Reporter: Nir Soffer
Assignee: Anton Marchukov

Gerrit bug check code is treating unrelated urls as Bug-Url: Patch Set 1= : Verified-1

- Check Bug-Url::1520068::WARN, failed to get bug info (private bug or
bug doesn't exist)
- Check Bug-Url::1527827::OK, classification: 'Red Hat', product: 'Red
Hat Enterprise Virtualization Manager' (-1)
- Check Product::WARN, failed to get bug info (private bug or bug
doesn't exist)
- Check TM::WARN, failed to get bug info (private bug or bug doesn't
exist)
- Check Backport::OK, The patch backported to all the relevant stable
branches.
- Set POST::#1520068::WARN, failed to get bug info (private bug or bug
doesn't exist)
- Update Tracker::#1520068::WARN, failed to get bug info (private bug or
bug doesn't exist)
- Update Tracker::#1527827::OK, tracker status: POST

The commit message is: commit 1b666da534c50321ada448e4bf397cab0306fcf1 A= uthor: Nir Soffer <nsoffer(a)redhat.com> Date: Tue Dec 5 23:47:24 2= 017 +0200

fileSD: Use InterruptibleDirectFile backend
FileStorgeDomainManifest uses now InterruptibleDirectFile for the
external leases backend.  This ensure that the process does not become
uninterruptible if storage is non-responsive.
This change bypass the python bug[1] causing the entire process to hang
when opening the special xleases volume. Now the operation is done in
the child process outside of Vdsm.
[1] https://bugzilla.redhat.com/1520068
Change-Id: I8a0eb42baa73b6c0a877ad9acbe53ac51f31bfea
Bug-Url: https://bugzilla.redhat.com/1527827
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>

There is exactly one Bur-Url. The other url is a bugzilla url but it sho= uld be consumed only by humans, not by machines. Machines should use only t= he Bug-Url. Nir

— This message was sent by Atlassian Jira (v1001.0.0-SNAPSHOT#1000= 75)

3D"" ------------=3D_1513842984-29965-112-- --===============2565979096870586410== Content-Type: multipart/alternative MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.bin" VGhpcyBpcyBhIG11bHRpLXBhcnQgbWVzc2FnZSBpbiBNSU1FIGZvcm1hdC4uLgoKLS0tLS0tLS0t LS0tPV8xNTEzODQyOTg0LTI5OTY1LTExMgpDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJz ZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogN2JpdAoKCiAgICAgWyBodHRwczov L292aXJ0LWppcmEuYXRsYXNzaWFuLm5ldC9icm93c2UvT1ZJUlQtMTgxMj9wYWdlPWNvbS5hdGxh c3NpYW4uamlyYS5wbHVnaW4uc3lzdGVtLmlzc3VldGFicGFuZWxzOmFsbC10YWJwYW5lbCBdCgpl eWFsIGVkcmkgdXBkYXRlZCBPVklSVC0xODEyOgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogICAgSXNzdWUgVHlwZTogQnVnICAod2FzOiBCeS1FTUFJTCkKCj4gR2Vycml0IGJ1ZyBjaGVj ayBpcyBidWdneQo+IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPgo+ICAgICAgICAgICAgICAg ICBLZXk6IE9WSVJULTE4MTIKPiAgICAgICAgICAgICAgICAgVVJMOiBodHRwczovL292aXJ0LWpp cmEuYXRsYXNzaWFuLm5ldC9icm93c2UvT1ZJUlQtMTgxMgo+ICAgICAgICAgICAgIFByb2plY3Q6 IG9WaXJ0IC0gdmlydHVhbGl6YXRpb24gbWFkZSBlYXN5Cj4gICAgICAgICAgSXNzdWUgVHlwZTog QnVnCj4gICAgICAgICAgICBSZXBvcnRlcjogTmlyIFNvZmZlcgo+ICAgICAgICAgICAgQXNzaWdu ZWU6IEFudG9uIE1hcmNodWtvdgo+Cj4gR2Vycml0IGJ1ZyBjaGVjayBjb2RlIGlzIHRyZWF0aW5n IHVucmVsYXRlZCB1cmxzIGFzIEJ1Zy1Vcmw6Cj4gUGF0Y2ggU2V0IDE6IFZlcmlmaWVkLTEKPiAg ICAtIENoZWNrIEJ1Zy1Vcmw6OjE1MjAwNjg6OldBUk4sIGZhaWxlZCB0byBnZXQgYnVnIGluZm8g KHByaXZhdGUgYnVnIG9yCj4gICAgYnVnIGRvZXNuJ3QgZXhpc3QpCj4gICAgLSBDaGVjayBCdWct VXJsOjoxNTI3ODI3OjpPSywgY2xhc3NpZmljYXRpb246ICdSZWQgSGF0JywgcHJvZHVjdDogJ1Jl ZAo+ICAgIEhhdCBFbnRlcnByaXNlIFZpcnR1YWxpemF0aW9uIE1hbmFnZXInICgtMSkKPiAgICAt IENoZWNrIFByb2R1Y3Q6OldBUk4sIGZhaWxlZCB0byBnZXQgYnVnIGluZm8gKHByaXZhdGUgYnVn IG9yIGJ1Zwo+ICAgIGRvZXNuJ3QgZXhpc3QpCj4gICAgLSBDaGVjayBUTTo6V0FSTiwgZmFpbGVk IHRvIGdldCBidWcgaW5mbyAocHJpdmF0ZSBidWcgb3IgYnVnIGRvZXNuJ3QKPiAgICBleGlzdCkK PiAgICAtIENoZWNrIEJhY2twb3J0OjpPSywgVGhlIHBhdGNoIGJhY2twb3J0ZWQgdG8gYWxsIHRo ZSByZWxldmFudCBzdGFibGUKPiAgICBicmFuY2hlcy4KPiAgICAtIFNldCBQT1NUOjojMTUyMDA2 ODo6V0FSTiwgZmFpbGVkIHRvIGdldCBidWcgaW5mbyAocHJpdmF0ZSBidWcgb3IgYnVnCj4gICAg ZG9lc24ndCBleGlzdCkKPiAgICAtIFVwZGF0ZSBUcmFja2VyOjojMTUyMDA2ODo6V0FSTiwgZmFp bGVkIHRvIGdldCBidWcgaW5mbyAocHJpdmF0ZSBidWcgb3IKPiAgICBidWcgZG9lc24ndCBleGlz dCkKPiAgICAtIFVwZGF0ZSBUcmFja2VyOjojMTUyNzgyNzo6T0ssIHRyYWNrZXIgc3RhdHVzOiBQ T1NUCj4gVGhlIGNvbW1pdCBtZXNzYWdlIGlzOgo+IGNvbW1pdCAxYjY2NmRhNTM0YzUwMzIxYWRh NDQ4ZTRiZjM5N2NhYjAzMDZmY2YxCj4gQXV0aG9yOiBOaXIgU29mZmVyIDxuc29mZmVyQHJlZGhh dC5jb20+Cj4gRGF0ZTogICBUdWUgRGVjIDUgMjM6NDc6MjQgMjAxNyArMDIwMAo+ICAgICBmaWxl U0Q6IFVzZSBJbnRlcnJ1cHRpYmxlRGlyZWN0RmlsZSBiYWNrZW5kCj4gICAgIEZpbGVTdG9yZ2VE b21haW5NYW5pZmVzdCB1c2VzIG5vdyBJbnRlcnJ1cHRpYmxlRGlyZWN0RmlsZSBmb3IgdGhlCj4g ICAgIGV4dGVybmFsIGxlYXNlcyBiYWNrZW5kLiAgVGhpcyBlbnN1cmUgdGhhdCB0aGUgcHJvY2Vz cyBkb2VzIG5vdCBiZWNvbWUKPiAgICAgdW5pbnRlcnJ1cHRpYmxlIGlmIHN0b3JhZ2UgaXMgbm9u LXJlc3BvbnNpdmUuCj4gICAgIFRoaXMgY2hhbmdlIGJ5cGFzcyB0aGUgcHl0aG9uIGJ1Z1sxXSBj YXVzaW5nIHRoZSBlbnRpcmUgcHJvY2VzcyB0byBoYW5nCj4gICAgIHdoZW4gb3BlbmluZyB0aGUg c3BlY2lhbCB4bGVhc2VzIHZvbHVtZS4gTm93IHRoZSBvcGVyYXRpb24gaXMgZG9uZSBpbgo+ICAg ICB0aGUgY2hpbGQgcHJvY2VzcyBvdXRzaWRlIG9mIFZkc20uCj4gICAgIFsxXSBodHRwczovL2J1 Z3ppbGxhLnJlZGhhdC5jb20vMTUyMDA2OAo+ICAgICBDaGFuZ2UtSWQ6IEk4YTBlYjQyYmFhNzNi NmMwYTg3N2FkOWFjYmU1M2FjNTFmMzFiZmVhCj4gICAgIEJ1Zy1Vcmw6IGh0dHBzOi8vYnVnemls bGEucmVkaGF0LmNvbS8xNTI3ODI3Cj4gICAgIFNpZ25lZC1vZmYtYnk6IE5pciBTb2ZmZXIgPG5z b2ZmZXJAcmVkaGF0LmNvbT4KPiBUaGVyZSBpcyBleGFjdGx5IG9uZSBCdXItVXJsLiBUaGUgb3Ro ZXIgdXJsIGlzIGEgYnVnemlsbGEgdXJsIGJ1dCBpdCBzaG91bGQKPiBiZSBjb25zdW1lZCBvbmx5 IGJ5IGh1bWFucywgbm90IGJ5IG1hY2hpbmVzLiBNYWNoaW5lcyBzaG91bGQgdXNlCj4gb25seSB0 aGUgQnVnLVVybC4KPiBOaXIKCgoKLS0KVGhpcyBtZXNzYWdlIHdhcyBzZW50IGJ5IEF0bGFzc2lh biBKaXJhCih2MTAwMS4wLjAtU05BUFNIT1QjMTAwMDc1KQoKLS0tLS0tLS0tLS0tPV8xNTEzODQy OTg0LTI5OTY1LTExMgpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiCkNv bnRlbnQtRGlzcG9zaXRpb246IGlubGluZQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA3Yml0 Cgo8aHRtbD48Ym9keT4KPHByZT5bIGh0dHBzOi8vb3ZpcnQtamlyYS5hdGxhc3NpYW4ubmV0L2Jy b3dzZS9PVklSVC0xODEyP3BhZ2U9Y29tLmF0bGFzc2lhbi5qaXJhLnBsdWdpbi5zeXN0ZW0uaXNz dWV0YWJwYW5lbHM6YWxsLXRhYnBhbmVsIF08L3ByZT4KPGgzPmV5YWwgZWRyaSB1cGRhdGVkIE9W SVJULTE4MTI6PC9oMz4KPHByZT5Jc3N1ZSBUeXBlOiBCdWcgICh3YXM6IEJ5LUVNQUlMKTwvcHJl Pgo8YmxvY2txdW90ZT48aDM+R2Vycml0IGJ1ZyBjaGVjayBpcyBidWdneTwvaDM+CjxwcmU+ICAg ICBLZXk6IE9WSVJULTE4MTIKICAgICBVUkw6IGh0dHBzOi8vb3ZpcnQtamlyYS5hdGxhc3NpYW4u bmV0L2Jyb3dzZS9PVklSVC0xODEyCiBQcm9qZWN0OiBvVmlydCAtIHZpcnR1YWxpemF0aW9uIG1h ZGUgZWFzeQogICAgICAgICBJc3N1ZSBUeXBlOiBCdWcKUmVwb3J0ZXI6IE5pciBTb2ZmZXIKQXNz aWduZWU6IEFudG9uIE1hcmNodWtvdjwvcHJlPgo8cD5HZXJyaXQgYnVnIGNoZWNrIGNvZGUgaXMg dHJlYXRpbmcgdW5yZWxhdGVkIHVybHMgYXMgQnVnLVVybDogUGF0Y2ggU2V0IDE6IFZlcmlmaWVk LTE8L3A+CjxwcmU+LSBDaGVjayBCdWctVXJsOjoxNTIwMDY4OjpXQVJOLCBmYWlsZWQgdG8gZ2V0 IGJ1ZyBpbmZvIChwcml2YXRlIGJ1ZyBvcgpidWcgZG9lc24ndCBleGlzdCkKLSBDaGVjayBCdWct VXJsOjoxNTI3ODI3OjpPSywgY2xhc3NpZmljYXRpb246ICdSZWQgSGF0JywgcHJvZHVjdDogJ1Jl ZApIYXQgRW50ZXJwcmlzZSBWaXJ0dWFsaXphdGlvbiBNYW5hZ2VyJyAoLTEpCi0gQ2hlY2sgUHJv ZHVjdDo6V0FSTiwgZmFpbGVkIHRvIGdldCBidWcgaW5mbyAocHJpdmF0ZSBidWcgb3IgYnVnCmRv ZXNuJ3QgZXhpc3QpCi0gQ2hlY2sgVE06OldBUk4sIGZhaWxlZCB0byBnZXQgYnVnIGluZm8gKHBy aXZhdGUgYnVnIG9yIGJ1ZyBkb2Vzbid0CmV4aXN0KQotIENoZWNrIEJhY2twb3J0OjpPSywgVGhl IHBhdGNoIGJhY2twb3J0ZWQgdG8gYWxsIHRoZSByZWxldmFudCBzdGFibGUKYnJhbmNoZXMuCi0g U2V0IFBPU1Q6OiMxNTIwMDY4OjpXQVJOLCBmYWlsZWQgdG8gZ2V0IGJ1ZyBpbmZvIChwcml2YXRl IGJ1ZyBvciBidWcKZG9lc24ndCBleGlzdCkKLSBVcGRhdGUgVHJhY2tlcjo6IzE1MjAwNjg6OldB Uk4sIGZhaWxlZCB0byBnZXQgYnVnIGluZm8gKHByaXZhdGUgYnVnIG9yCmJ1ZyBkb2Vzbid0IGV4 aXN0KQotIFVwZGF0ZSBUcmFja2VyOjojMTUyNzgyNzo6T0ssIHRyYWNrZXIgc3RhdHVzOiBQT1NU PC9wcmU+CjxwPlRoZSBjb21taXQgbWVzc2FnZSBpczogY29tbWl0IDFiNjY2ZGE1MzRjNTAzMjFh ZGE0NDhlNGJmMzk3Y2FiMDMwNmZjZjEgQXV0aG9yOiBOaXIgU29mZmVyICZsdDtuc29mZmVyQHJl ZGhhdC5jb20mZ3Q7IERhdGU6ICAgVHVlIERlYyA1IDIzOjQ3OjI0IDIwMTcgKzAyMDA8L3A+Cjxw cmU+ZmlsZVNEOiBVc2UgSW50ZXJydXB0aWJsZURpcmVjdEZpbGUgYmFja2VuZApGaWxlU3Rvcmdl RG9tYWluTWFuaWZlc3QgdXNlcyBub3cgSW50ZXJydXB0aWJsZURpcmVjdEZpbGUgZm9yIHRoZQpl eHRlcm5hbCBsZWFzZXMgYmFja2VuZC4gIFRoaXMgZW5zdXJlIHRoYXQgdGhlIHByb2Nlc3MgZG9l cyBub3QgYmVjb21lCnVuaW50ZXJydXB0aWJsZSBpZiBzdG9yYWdlIGlzIG5vbi1yZXNwb25zaXZl LgpUaGlzIGNoYW5nZSBieXBhc3MgdGhlIHB5dGhvbiBidWdbMV0gY2F1c2luZyB0aGUgZW50aXJl IHByb2Nlc3MgdG8gaGFuZwp3aGVuIG9wZW5pbmcgdGhlIHNwZWNpYWwgeGxlYXNlcyB2b2x1bWUu IE5vdyB0aGUgb3BlcmF0aW9uIGlzIGRvbmUgaW4KdGhlIGNoaWxkIHByb2Nlc3Mgb3V0c2lkZSBv ZiBWZHNtLgpbMV0gaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tLzE1MjAwNjgKQ2hhbmdlLUlk OiBJOGEwZWI0MmJhYTczYjZjMGE4NzdhZDlhY2JlNTNhYzUxZjMxYmZlYQpCdWctVXJsOiBodHRw czovL2J1Z3ppbGxhLnJlZGhhdC5jb20vMTUyNzgyNwpTaWduZWQtb2ZmLWJ5OiBOaXIgU29mZmVy ICZsdDtuc29mZmVyQHJlZGhhdC5jb20mZ3Q7PC9wcmU+CjxwPlRoZXJlIGlzIGV4YWN0bHkgb25l IEJ1ci1VcmwuIFRoZSBvdGhlciB1cmwgaXMgYSBidWd6aWxsYSB1cmwgYnV0IGl0IHNob3VsZCBi ZSBjb25zdW1lZCBvbmx5IGJ5IGh1bWFucywgbm90IGJ5IG1hY2hpbmVzLiBNYWNoaW5lcyBzaG91 bGQgdXNlIG9ubHkgdGhlIEJ1Zy1VcmwuIE5pcjwvcD48L2Jsb2NrcXVvdGU+CjxwPiZtZGFzaDsg VGhpcyBtZXNzYWdlIHdhcyBzZW50IGJ5IEF0bGFzc2lhbiBKaXJhICh2MTAwMS4wLjAtU05BUFNI T1QjMTAwMDc1KTwvcD4KCjxpbWcgc3JjPSJodHRwczovL3U0MDQzNDAyLmN0LnNlbmRncmlkLm5l dC93Zi9vcGVuP3Vwbj1pNVRNV0dWOTlhbUpiTnhKcFNwMi0yQkozM0JTTTN0dWlVZlJUazY0Sy0y Qk9qRlRLZDFlUWswamVhSWNCSmxMeVdpTmN2R0lzQ2Z4YVlJYm5TU1o1bjVnLTJGRkF3c2UzNDlt S0t4RlFKOGgtMkZZNmdWLTJCS2hweVVmQU8yeHN6d3o0Q2NJTFhhTlg2WGMtMkZsRGdtZmxVS250 Y3R1bk1Za1BueEt0LTJGaEJKWDNQMHg5WkNVRjBHZU9ORVFJVW4tMkZGMUtCZjFmQVh2b1hwSVgt MkI4UmlTN3hKUTBYbWUyRUxHYTZRRFo1VnlvQnh1ejA5WGVzVTBOV3k2Y0NOUnJtQkw0VC0yRkxx eEFIODRVQUxTUGtaR0w5cG5lTkZTRHcyOFBDZ2VDWlBHWEtvLTJGWGUwSGRUa1lYdDl2a3ZiOGl0 ZUNGUi0yQm9zTEJ5UGktMkZVdXd2LTJCakdKWXpoV21ITm9KeTZNeGd2OUs3ZzFvNzltcUo0MVZy VmVCNDJ3NERmZ0Rib2djckItMkJXcGVjd0NxTGNyMjBBbXlySXAtMkJpUkFlODhjLTJGMkp3YmRS NEc1aHB5aWZRaTgyVXZad1gtMkZqN2JYYXBXOVMzMEphd3pWcjZZWVVEIiBhbHQ9IiIgd2lkdGg9 IjEiIGhlaWdodD0iMSIgYm9yZGVyPSIwIiBzdHlsZT0iaGVpZ2h0OjFweCAhaW1wb3J0YW50O3dp ZHRoOjFweCAhaW1wb3J0YW50O2JvcmRlci13aWR0aDowICFpbXBvcnRhbnQ7bWFyZ2luLXRvcDow ICFpbXBvcnRhbnQ7bWFyZ2luLWJvdHRvbTowICFpbXBvcnRhbnQ7bWFyZ2luLXJpZ2h0OjAgIWlt cG9ydGFudDttYXJnaW4tbGVmdDowICFpbXBvcnRhbnQ7cGFkZGluZy10b3A6MCAhaW1wb3J0YW50 O3BhZGRpbmctYm90dG9tOjAgIWltcG9ydGFudDtwYWRkaW5nLXJpZ2h0OjAgIWltcG9ydGFudDtw YWRkaW5nLWxlZnQ6MCAhaW1wb3J0YW50OyIvPgo8L2JvZHk+PC9odG1sPgoKLS0tLS0tLS0tLS0t PV8xNTEzODQyOTg0LTI5OTY1LTExMi0tCg== --===============2565979096870586410==--