From nscott@redhat.com Thu Nov 1 04:16:28 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,J_CHICKENPOX_35, J_CHICKENPOX_43,J_CHICKENPOX_47,J_CHICKENPOX_63,J_CHICKENPOX_64, J_CHICKENPOX_73 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA19GS97013290 for ; Thu, 1 Nov 2012 04:16:28 -0500 X-ASG-Debug-ID: 1351761495-04bdf06e7a38500001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id vAacHxhS8g7m5x8d for ; Thu, 01 Nov 2012 02:18:15 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA19IEOs021251 for ; Thu, 1 Nov 2012 05:18:14 -0400 Date: Thu, 1 Nov 2012 05:18:14 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1556530893.20166090.1351761494636.JavaMail.root@redhat.com> In-Reply-To: <928371738.20134659.1351749721974.JavaMail.root@redhat.com> Subject: [RFC] PCP daemons running as non-root users MIME-Version: 1.0 X-ASG-Orig-Subj: [RFC] PCP daemons running as non-root users Content-Type: multipart/mixed; boundary="----=_Part_20166088_1806489047.1351761494634" X-Originating-IP: [10.64.49.234] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1351761495 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.112960 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ------=_Part_20166088_1806489047.1351761494634 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hi all, I've been looking into making all of the PCP daemons run as regular, unprivileged users. This covers pmcd, those PMDAs we own that are daemons, pmlogger, pmie & pmproxy. There are difficulties which make the more simple "change the init scripts to sudo to another user" approach not an option (to my mind anyway). Some of the bigger issues are: - peoples existing production setups should not break, or at worst only break in small, well-known, well-documented, easily fixable ways, after their next upgrade. - some agents need to run as specific users, or have chosen to run as unprivileged users already. As the agents are all children of pmcd (well, 99.999% of the time), pmcd needs to be root when it starts them. - the PMDA Install scripts (via pmdaproc.sh which backs em) will issue a SIGHUP to pmcd to get it to re-read pmcd.conf, and start the new PMDA without disrupting existing client connections. If pmcd has dropped privileges, this wont work for starting PMDAs that need to run as root or change user. On the other hand, it is highly desirable to: - keep it simple, the simpler the better (more audit-able) - have everything default to unprivileged, so going forward all new work is done with this assumption/requirement. as a fallback, allow old root-user behaviour (easily, in case of issues). Attached patch is an initial stab at solving the problem. It takes the following tack: - add a new "pcp" user and group (packaging mechanisms will automate this, not tackled yet). I *think* it has to be a fixed ID, as we'll be persisting pmlogger logs, etc with this UID/GID. Not 100% sure on that though, perhaps it'd be ok if dynamically assigned (by useradd). The latter would certainly make life easier. - when running in daemon modes, all of pmcd, pmlogger, pmie & pmproxy run their main loop as user "pcp" (maybe pmproxy is ok to stay as user "nobody"? could go either way I guess) - also via packaging trickery, recursively change ownership of /var/log/pcp/pmlogger/ dirs (else, pmlogger is no longer functional in daemon mode, with this patch) [not yet tackled] - adds __pmSetProcessIdentity() used by everyone (changes the existing perl PMDAs to use it, uses it in pmcd & co too). Add thread safety to the existing (perl wrapper) code while at it. In the end, all callers use the same code to switch user. - adds a "forced_restart" variable to pmdaproc.sh which allows an agent to request pmcd be restarted rather than SIGHUP'd when it is ./Install'd. This is used by agents that have to change user (database PMDAs, third party PMDAs). Thought about making the default the other way around (see pmdaproc.sh in patch) but decided on default to the current behaviour, which means pmcd will only be able to start pmdas that run as "pcp" or "nobody". - adds -U to all daemons so that root could be gone back to temporarily, easily, if theres some problem or maybe if someone wants some other unusual setup. Comments? Thanks! -- Nathan ------=_Part_20166088_1806489047.1351761494634 Content-Type: text/x-patch; name=initial-non-root-daemons.patch Content-Disposition: attachment; filename=initial-non-root-daemons.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5pbiBiL2NvbmZpZ3VyZS5pbgppbmRleCBlZTFmODk0Li44 MDlkMzZjIDEwMDY0NAotLS0gYS9jb25maWd1cmUuaW4KKysrIGIvY29uZmlndXJlLmluCkBAIC04 NjAsMTIgKzg2MCwxMiBAQCBBQ19DSEVDS19GVU5DUyhta3RpbWUgbmFub3NsZWVwIHVuc2V0ZW52 KQogQUNfQ0hFQ0tfRlVOQ1MoZ2V0aG9zdG5hbWUgc2VsZWN0IHNvY2tldCkKIEFDX0NIRUNLX0ZV TkNTKHVuYW1lIHN5c2xvZyBfX2Nsb25lIHBpcGUyIGZjbnRsIGlvY3RsKQogQUNfQ0hFQ0tfRlVO Q1MocHJjdGwgc2V0bGluZWJ1ZiB3YWl0cGlkIGF0ZXhpdCBraWxsKQotQUNfQ0hFQ0tfRlVOQ1Mo Y2hvd24gZ2V0Y3dkIHNjYW5kaXIgbWtzdGVtcCBnZXRwd25hbSkKK0FDX0NIRUNLX0ZVTkNTKGNo b3duIGdldGN3ZCBzY2FuZGlyIG1rc3RlbXApCiBBQ19DSEVDS19GVU5DUyhicmsgc2JyayBtZW1h bGlnbiB2YWxsb2MpCiBBQ19DSEVDS19GVU5DUyhzaWduYWwgc2lnaG9sZCBzaWdyZWxzZSB0Y2dl dGF0dHIpCiBBQ19DSEVDS19GVU5DUyhyZWdleCByZWdjbXAgcmVnZXhlYyByZWdjb21wKQogQUNf Q0hFQ0tfRlVOQ1Moc3RydG9kIHN0cnRvbCBzdHJ0b2xsIHN0cnRvdWxsKQotQUNfQ0hFQ0tfRlVO Q1Moc3lzaW5mbykKK0FDX0NIRUNLX0ZVTkNTKHN5c2luZm8gZ2V0cHduYW0gZ2V0cHduYW1fcikK IEFDX0NIRUNLX0ZVTkNTKGJhY2t0cmFjZSkKIAogZG5sIG9ubHkgZGVmaW5lIHJlYWRkaXI2NCBv biBub24tbGludXggcGxhdGZvcm1zIHRoYXQgc3VwcG9ydCBpdApkaWZmIC0tZ2l0IGEvc3JjL2lu Y2x1ZGUvcGNwL2ltcGwuaCBiL3NyYy9pbmNsdWRlL3BjcC9pbXBsLmgKaW5kZXggNzMyNmFkOC4u YzlhODFjYiAxMDA2NDQKLS0tIGEvc3JjL2luY2x1ZGUvcGNwL2ltcGwuaAorKysgYi9zcmMvaW5j bHVkZS9wY3AvaW1wbC5oCkBAIC0xMTUyLDYgKzExNTIsNyBAQCBleHRlcm4gaW50IF9fcG1Qcm9j ZXNzVGVybWluYXRlKHBpZF90LCBpbnQpOwogZXh0ZXJuIHBpZF90IF9fcG1Qcm9jZXNzQ3JlYXRl KGNoYXIgKiosIGludCAqLCBpbnQgKik7CiBleHRlcm4gaW50IF9fcG1Qcm9jZXNzRGF0YVNpemUo dW5zaWduZWQgbG9uZyAqKTsKIGV4dGVybiBpbnQgX19wbVByb2Nlc3NSdW5UaW1lcyhkb3VibGUg KiwgZG91YmxlICopOworZXh0ZXJuIGludCBfX3BtU2V0UHJvY2Vzc0lkZW50aXR5KGNvbnN0IGNo YXIgKik7CiAKIC8qCiAgKiBwbGF0Zm9ybSBpbmRlcGVuZGVudCBtZW1vcnkgbWFwcGVkIGZpbGUg aGFuZGxpbmcKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3BjcC9wbGF0Zm9ybV9oZWFkZXIuaC5p biBiL3NyYy9pbmNsdWRlL3BjcC9wbGF0Zm9ybV9oZWFkZXIuaC5pbgppbmRleCBiN2I1MmMzLi41 OTFhZDBmIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9wY3AvcGxhdGZvcm1faGVhZGVyLmguaW4K KysrIGIvc3JjL2luY2x1ZGUvcGNwL3BsYXRmb3JtX2hlYWRlci5oLmluCkBAIC0yMTksNiArMjE5 LDcgQEAgZXh0ZXJuICJDIiB7CiAjdW5kZWYgSEFWRV9TQ0FORElSCiAjdW5kZWYgSEFWRV9NS1NU RU1QCiAjdW5kZWYgSEFWRV9HRVRQV05BTQorI3VuZGVmIEhBVkVfR0VUUFdOQU1fUgogCiAjdW5k ZWYgSEFWRV9CUksKICN1bmRlZiBIQVZFX1NCUksKZGlmZiAtLWdpdCBhL3NyYy9saWJwY3Avc3Jj L3V0aWwuYyBiL3NyYy9saWJwY3Avc3JjL3V0aWwuYwppbmRleCBlNGQ2ZGU2Li4zNjVjM2M5IDEw MDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy91dGlsLmMKKysrIGIvc3JjL2xpYnBjcC9zcmMvdXRp bC5jCkBAIC00NSw2ICs0NSw5IEBACiAjaWYgZGVmaW5lZChIQVZFX0lFRUVGUF9IKQogI2luY2x1 ZGUgPGllZWVmcC5oPgogI2VuZGlmCisjaWYgZGVmaW5lZChIQVZFX1BXRF9IKQorI2luY2x1ZGUg PHB3ZC5oPgorI2VuZGlmCiAKIHN0YXRpYyBGSUxFCSoqZmlsZWxvZzsKIHN0YXRpYyBpbnQJbmZp bGVsb2c7CkBAIC0xNTIzLDYgKzE1MjYsNDcgQEAgX19wbVByb2Nlc3NDcmVhdGUoY2hhciAqKmFy Z3YsIGludCAqaW5mZCwgaW50ICpvdXRmZCkKIH0KIAogaW50CitfX3BtU2V0UHJvY2Vzc0lkZW50 aXR5KGNvbnN0IGNoYXIgKnVzZXJuYW1lKQoreworICAgIGdpZF90IGdpZDsKKyAgICB1aWRfdCB1 aWQ7CisgICAgc3RydWN0IHBhc3N3ZCAqcHc7CisKKyNpZiBkZWZpbmVkKEhBVkVfR0VUUFdOQU1f UikJLyogdGhyZWFkLXNhZmUgdmFyaWFudCBmaXJzdCAqLworICAgIHN0cnVjdCBwYXNzd2QgcHdk OworICAgIGNoYXIgYnVmWzE2KjEwMjRdOworICAgIGludCBzdHM7CisKKyAgICBzdHMgPSBnZXRw d25hbV9yKHVzZXJuYW1lLCAmcHdkLCBidWYsIHNpemVvZihidWYpLCAmcHcpOworICAgIGlmIChw dyA9PSBOVUxMKSB7CisJX19wbU5vdGlmeUVycihMT0dfV0FSTklORywKKwkJImNhbm5vdCBmaW5k IHRoZSAlcyB1c2VyIHRvIHN3aXRjaCB0b1xuIiwgdXNlcm5hbWUpOworCXJldHVybiAoc3RzID09 IDApID8gLUVTUkNIIDogLW9zZXJyb3IoKTsKKyAgICB9CisgICAgdWlkID0gcHdkLnB3X3VpZDsK KyAgICBnaWQgPSBwd2QucHdfdWlkOworI2VsaWYgZGVmaW5lZChIQVZFX0dFVFBXTkFNKQorICAg IGlmICgocHcgPSBnZXRwd25hbSh1c2VybmFtZSkpID09IDApIHsKKwlfX3BtTm90aWZ5RXJyKExP R19XQVJOSU5HLAorCQkiY2Fubm90IGZpbmQgdGhlICVzIHVzZXIgdG8gc3dpdGNoIHRvXG4iLCB1 c2VybmFtZSk7CisJcmV0dXJuIC1vc2Vycm9yKCk7CisgICAgfQorICAgIHVpZCA9IHB3LT5wd191 aWQ7CisgICAgZ2lkID0gcHctPnB3X3VpZDsKKyNlbHNlCishYm96byEKKyNlbmRpZgorCisgICAg aWYgKHNldGdpZChnaWQpIDwgMCB8fCBzZXR1aWQodWlkKSA8IDApIHsKKwlfX3BtTm90aWZ5RXJy KExPR19XQVJOSU5HLAorCQkiY2Fubm90IHN3aXRjaCB0byB1aWQvZ2lkIG9mICVzIHVzZXIgKCVk LyVkKVxuIiwgdXNlcm5hbWUsIHVpZCwgZ2lkKTsKKwlyZXR1cm4gLW9zZXJyb3IoKTsKKyAgICB9 CisKKyAgICByZXR1cm4gMDsKK30KKworaW50CiBfX3BtU2V0U2lnbmFsSGFuZGxlcihpbnQgc2ln LCBfX3BtU2lnbmFsSGFuZGxlciBmdW5jKQogewogICAgIHNpZ25hbChzaWcsIGZ1bmMpOwpkaWZm IC0tZ2l0IGEvc3JjL2xpYnBjcC9zcmMvd2luMzIuYyBiL3NyYy9saWJwY3Avc3JjL3dpbjMyLmMK aW5kZXggOTM5MDQzMy4uODBmYmJmNiAxMDA2NDQKLS0tIGEvc3JjL2xpYnBjcC9zcmMvd2luMzIu YworKysgYi9zcmMvbGlicGNwL3NyYy93aW4zMi5jCkBAIC0xMjcsNiArMTI3LDEzIEBAIHNpZ3Rl cm1fY2FsbGJhY2soaW50IHNpZykKIH0KIAogaW50CitfX3BtU2V0UHJvY2Vzc0lkZW50aXR5KGNv bnN0IGNoYXIgKnVzZXJuYW1lKQoreworICAgICh2b2lkKXVzZXJuYW1lOworICAgIHJldHVybiAw OwkvKiBOb3QgWWV0IEltcGxlbWVudGVkICovCit9CisKK2ludAogX19wbVNldFByb2duYW1lKGNv bnN0IGNoYXIgKnByb2dyYW0pCiB7CiAgICAgaW50CXN0czEsIHN0czI7CmRpZmYgLS1naXQgYS9z cmMvcGVybC9QTURBL1BNREEueHMgYi9zcmMvcGVybC9QTURBL1BNREEueHMKaW5kZXggNTFhMTQ0 Mi4uNjZiMzNjNyAxMDA2NDQKLS0tIGEvc3JjL3BlcmwvUE1EQS9QTURBLnhzCisrKyBiL3NyYy9w ZXJsL1BNREEvUE1EQS54cwpAQCAtODE2LDcgKzgxNiw3IEBAIHNldF91c2VyKHNlbGYsdXNlcm5h bWUpCiAJcG1kYUludGVyZmFjZSAqc2VsZgogCWNoYXIgKiB1c2VybmFtZQogICAgIENPREU6Ci0J UkVUVkFMID0gbG9jYWxfdXNlcih1c2VybmFtZSk7CisJUkVUVkFMID0gX19wbVNldFByb2Nlc3NJ ZGVudGl0eSh1c2VybmFtZSk7CiAgICAgT1VUUFVUOgogCVJFVFZBTAogCmRpZmYgLS1naXQgYS9z cmMvcGVybC9QTURBL2xvY2FsLmMgYi9zcmMvcGVybC9QTURBL2xvY2FsLmMKaW5kZXggYTA0NzZl OC4uZWRjNTI3MCAxMDA2NDQKLS0tIGEvc3JjL3BlcmwvUE1EQS9sb2NhbC5jCisrKyBiL3NyYy9w ZXJsL1BNREEvbG9jYWwuYwpAQCAtNTEsMzAgKzUxLDYgQEAgbG9jYWxfc3RyZHVwX3ByZWZpeChj b25zdCBjaGFyICpwcmVmaXgsIGNvbnN0IGNoYXIgKnN0cmluZykKIH0KIAogaW50Ci1sb2NhbF91 c2VyKGNvbnN0IGNoYXIgKnVzZXJuYW1lKQotewotI2lmZGVmIEhBVkVfR0VUUFdOQU0KLSAgICAv KiBsb3NlIHJvb3QgcHJpdmlsZWdlcyBpZiB3ZSBoYXZlIHRoZW0gKi8KLSAgICBzdHJ1Y3QgcGFz c3dkICpwdzsKLQotICAgIGlmICgocHcgPSBnZXRwd25hbSh1c2VybmFtZSkpID09IDApIHsKLQlf X3BtTm90aWZ5RXJyKExPR19XQVJOSU5HLAotCQkJImNhbm5vdCBmaW5kIHRoZSB1c2VyICVzIHRv IHN3aXRjaCB0b1xuIiwgdXNlcm5hbWUpOwotCXJldHVybiAtMTsKLSAgICB9Ci0gICAgaWYgKHNl dGdpZChwdy0+cHdfZ2lkKSA8IDAgfHwgc2V0dWlkKHB3LT5wd191aWQpIDwgMCkgewotCV9fcG1O b3RpZnlFcnIoTE9HX1dBUk5JTkcsCi0JCQkiY2Fubm90IHN3aXRjaCB0byB1aWQvZ2lkIG9mIHVz ZXIgJXNcbiIsIHVzZXJuYW1lKTsKLQlyZXR1cm4gLTE7Ci0gICAgfQotICAgIHJldHVybiAwOwot I2Vsc2UKLSAgICBfX3BtTm90aWZ5RXJyKExPR19XQVJOSU5HLCAiY2Fubm90IHN3aXRjaCB0byB1 c2VyICVzXG4iLCB1c2VybmFtZSk7Ci0gICAgcmV0dXJuIC0xOwotI2VuZGlmCi19Ci0KLWludAog bG9jYWxfdGltZXIoZG91YmxlIHRpbWVvdXQsIHNjYWxhcl90ICpjYWxsYmFjaywgaW50IGNvb2tp ZSkKIHsKICAgICBpbnQgc2l6ZSA9IHNpemVvZigqdGltZXJzKSAqIChudGltZXJzICsgMSk7CmRp ZmYgLS1naXQgYS9zcmMvcG1jZC9wbWNkLm9wdGlvbnMgYi9zcmMvcG1jZC9wbWNkLm9wdGlvbnMK aW5kZXggZWI0MGEyYy4uZjQxNzliOCAxMDA2NDQKLS0tIGEvc3JjL3BtY2QvcG1jZC5vcHRpb25z CisrKyBiL3NyYy9wbWNkL3BtY2Qub3B0aW9ucwpAQCAtMTMsOSArMTMsMTIgQEAKICMgLUQgTgog IyAtZgogCi0jIFJlc3RyaWN0aW5nIGluY29taW5nIFBEVSBzaXplIHRvIHByZXZlbnQgRE9TIGF0 dGFja3MKKyMgbWF4aW11bSBpbmNvbWluZyBQRFUgc2l6ZSAoZGVmYXVsdCA2NEtCKQogIyAtTCAx NjM4NCAKIAorIyBhc3N1bWUgaWRlbnRpdHkgb2Ygc29tZSB1c2VyIG90aGVyIHRoYW4gInBjcCIK KyMgLVUgcm9vdAorCiAjIGVuYWJsZSBldmVudCB0cmFjaW5nIGJpdCBmaWVsZHMKICMgICAxCXRy YWNlIGNvbm5lY3Rpb25zCiAjICAgMgl0cmFjZSBQRFVzCmRpZmYgLS1naXQgYS9zcmMvcG1jZC9w bWRhcHJvYy5zaCBiL3NyYy9wbWNkL3BtZGFwcm9jLnNoCmluZGV4IDM0OWI2NWUuLjgyZjg4YTYg MTAwNjQ0Ci0tLSBhL3NyYy9wbWNkL3BtZGFwcm9jLnNoCisrKyBiL3NyYy9wbWNkL3BtZGFwcm9j LnNoCkBAIC0xNDgsNiArMTQ4LDggQEAgc29ja2V0X29wdD0kZGVmYXVsdF9zb2NrZXRfb3B0CiBz b2NrZXRfaW5ldF9kZWY9JycKICMJSVBDIFByb3RvY29sIGZvciBkYWVtb24gKGJpbmFyeSBvbmx5 IG5vdykKIGlwY19wcm90PWJpbmFyeQorIwlOZWVkIHRvIGZvcmNlIGEgcmVzdGFydCBvZiBwbWNk PworZm9yY2VkX3Jlc3RhcnQ9ZmFsc2UKICMJRGVsYXkgYWZ0ZXIgaW5zdGFsbCBiZWZvcmUgY2hl Y2tpbmcgKHNlYykKIGNoZWNrX2RlbGF5PTMKICMJQWRkaXRpb25hbCBjb21tYW5kIGxpbmUgYXJn cyB0byBnbyBpbiAkUENQX1BNQ0RDT05GX1BBVEgKQEAgLTQyNSw3ICs0MjcsNyBAQCAkMT09Iick bXluYW1lJyIgJiYgJDI9PSInJG15ZG9tYWluJyIJeyBuZXh0IH0KIAogICAgICMgc2lnbmFsIHBt Y2QgaWYgaXQgaXMgcnVubmluZywgZWxzZSBzdGFydCBpdAogICAgICMKLSAgICBpZiBwbWluZm8g LXYgcG1jZC52ZXJzaW9uID4vZGV2L251bGwgMj4mMQorICAgIGlmICEgJGZvcmNlZF9yZXN0YXJ0 ICYmIHBtaW5mbyAtdiBwbWNkLnZlcnNpb24gPi9kZXYvbnVsbCAyPiYxCiAgICAgdGhlbgogCXBt c2lnbmFsIC1hIC1zIEhVUCBwbWNkID4vZGV2L251bGwgMj4mMQogCSMgYWxsb3cgc2lnbmFsIHBy b2Nlc3NpbmcgdG8gYmUgZG9uZSBiZWZvcmUgY2hlY2tpbmcgc3RhdHVzCmRpZmYgLS1naXQgYS9z cmMvcG1jZC9zcmMvcG1jZC5jIGIvc3JjL3BtY2Qvc3JjL3BtY2QuYwppbmRleCAwYzZiNTdjLi42 YmU2MTliIDEwMDY0NAotLS0gYS9zcmMvcG1jZC9zcmMvcG1jZC5jCisrKyBiL3NyYy9wbWNkL3Ny Yy9wbWNkLmMKQEAgLTM1LDE5ICszNSwyMCBAQCBzdGF0aWMgaW50CXJ1bl9kYWVtb24gPSAxOwkJ LyogcnVuIGFzIGEgZGFlbW9uLCBzZWUgLWYgKi8KIGludAkJX2NyZWRzX3RpbWVvdXQgPSAzOwkv KiBUaW1lb3V0IGZvciBhZ2VudHMgY3JlZGVudGlhbCBQRFUgKi8KIHN0YXRpYyBjaGFyCSpmYXRh bGZpbGUgPSAiL2Rldi90dHkiOy8qIGZhdGFsIG1lc3NhZ2VzIGF0IHN0YXJ0dXAgZ28gaGVyZSAq Lwogc3RhdGljIGNoYXIJKnBtbnNmaWxlID0gUE1fTlNfREVGQVVMVDsKLXN0YXRpYyBpbnQJZHVw b2sgPSAwOwkJLyogc2V0IHRvIDEgZm9yIC1OIHBtbnNmaWxlICovCitzdGF0aWMgY2hhcgkqdXNl cm5hbWUgPSAicGNwIjsKK3N0YXRpYyBpbnQJZHVwb2s7CQkJLyogc2V0IHRvIDEgZm9yIC1OIHBt bnNmaWxlICovCiAKIC8qCiAgKiBJbnRlcmZhY2VzIHdlJ3JlIHdpbGxpbmcgdG8gbGlzdGVuIGZv ciBjbGllbnRzIG9uLCBmcm9tIC1pCiAgKi8KLXN0YXRpYyBpbnQJCW5pbnRmID0gMDsKLXN0YXRp YyBjaGFyCQkqKmludGZsaXN0ID0gTlVMTDsKK3N0YXRpYyBpbnQJCW5pbnRmOworc3RhdGljIGNo YXIJCSoqaW50Zmxpc3Q7CiAKIC8qCiAgKiBQb3J0cyB3ZSdyZSB3aWxsaW5nIHRvIGxpc3RlbiBm b3IgY2xpZW50cyBvbiwgZnJvbSAtcCBvciAkUE1DRF9QT1JUCiAgKi8KLXN0YXRpYyBpbnQJCW5w b3J0ID0gMDsKLXN0YXRpYyBpbnQJCSpwb3J0bGlzdCA9IE5VTEw7CitzdGF0aWMgaW50CQlucG9y dDsKK3N0YXRpYyBpbnQJCSpwb3J0bGlzdDsKIAogLyoKICAqIEZvciBtYWludGFpbmluZyBpbmZv IGFib3V0IGEgcmVxdWVzdCBwb3J0IHRoYXQgY2xpZW50cyBtYXkgY29ubmVjdCB0byBwbWNkIG9u CkBAIC02Miw5ICs2Myw5IEBAIHR5cGVkZWYgc3RydWN0IHsKIC8qCiAgKiBBIGxpc3Qgb2YgdGhl IHBvcnRzIHRoYXQgcG1jZCBpcyBsaXN0ZW5pbmcgZm9yIGNsaWVudCBjb25uZWN0aW9ucyBvbgog ICovCi1zdGF0aWMgdW5zaWduZWQJCW5SZXFQb3J0cyA9IDA7CS8qIG51bWJlciBvZiBwb3J0cyAq Lwotc3RhdGljIHVuc2lnbmVkCQlzelJlcVBvcnRzID0gMDsJLyogY2FwYWNpdHkgb2YgcG9ydHMg YXJyYXkgKi8KLXN0YXRpYyBSZXFQb3J0SW5mbwkqcmVxUG9ydHMgPSBOVUxMOwkvKiBwb3J0cyBh cnJheSAqLworc3RhdGljIHVuc2lnbmVkCQluUmVxUG9ydHM7CS8qIG51bWJlciBvZiBwb3J0cyAq Lworc3RhdGljIHVuc2lnbmVkCQlzelJlcVBvcnRzOwkvKiBjYXBhY2l0eSBvZiBwb3J0cyBhcnJh eSAqLworc3RhdGljIFJlcVBvcnRJbmZvCSpyZXFQb3J0czsJLyogcG9ydHMgYXJyYXkgKi8KIGlu dAkJCW1heFJlcVBvcnRGZCA9IC0xOwkvKiBoaWdoZXN0IHJlcXVlc3QgcG9ydCBmaWxlIGRlc2Ny aXB0b3IgKi8KIAogI2lmZGVmIEhBVkVfU0FfU0lHSU5GTwpAQCAtMjAyLDcgKzIwMyw3IEBAIFBh cnNlT3B0aW9ucyhpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIHB1dGVudigiUE9TSVhMWV9D T1JSRUNUPSIpOwogI2VuZGlmCiAKLSAgICB3aGlsZSAoKGMgPSBnZXRvcHQoYXJnYywgYXJndiwg IkQ6Zmk6bDpMOk46bjpwOnE6dDpUOng6PyIpKSAhPSBFT0YpCisgICAgd2hpbGUgKChjID0gZ2V0 b3B0KGFyZ2MsIGFyZ3YsICJEOmZpOmw6TDpOOm46cDpxOnQ6VDpVOng6PyIpKSAhPSBFT0YpCiAJ c3dpdGNoIChjKSB7CiAKIAkgICAgY2FzZSAnRCc6CS8qIGRlYnVnIGZsYWcgKi8KQEAgLTIzNyw3 ICsyMzgsNyBAQCBQYXJzZU9wdGlvbnMoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkgICAgY2Fz ZSAnTCc6IC8qIE1heGltdW0gc2l6ZSBmb3IgUERVcyBmcm9tIGNsaWVudHMgKi8KIAkJdmFsID0g KGludClzdHJ0b2wgKG9wdGFyZywgTlVMTCwgMCk7CiAJCWlmICggdmFsIDw9IDAgKSB7Ci0JCSAg ICBmcHV0cyAoInBtY2Q6IC1MIHJlcXVpcmUgYSBwb3Npdml0ZSB2YWx1ZVxuIiwgc3RkZXJyKTsK KwkJICAgIGZwdXRzICgicG1jZDogLUwgcmVxdWlyZXMgYSBwb3NpdGl2ZSB2YWx1ZVxuIiwgc3Rk ZXJyKTsKIAkJICAgIGVycmZsYWcrKzsKIAkJfSBlbHNlIHsKIAkJICAgIF9fcG1TZXRQRFVDZWls aW5nICh2YWwpOwpAQCAtMzEyLDYgKzMxMywxMCBAQCBQYXJzZU9wdGlvbnMoaW50IGFyZ2MsIGNo YXIgKmFyZ3ZbXSkKIAkJICAgIF9wbWNkX3RyYWNlX21hc2sgPSB2YWw7CiAJCWJyZWFrOwogCisJ ICAgIGNhc2UgJ1UnOgorCQl1c2VybmFtZSA9IG9wdGFyZzsKKwkJYnJlYWs7CisKIAkgICAgY2Fz ZSAneCc6CiAJCWZhdGFsZmlsZSA9IG9wdGFyZzsKIAkJYnJlYWs7CkBAIC0zMzksNiArMzQ0LDcg QEAgUGFyc2VPcHRpb25zKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAiICAtcSB0aW1lb3V0ICAg ICAgUE1EQSBpbml0aWFsIG5lZ290aWF0aW9uIHRpbWVvdXQgKHNlY29uZHMpIFtkZWZhdWx0IDNd XG4iCiAiICAtVCB0cmFjZWZsYWcgICAgRXZlbnQgdHJhY2UgY29udHJvbFxuIgogIiAgLXQgdGlt ZW91dCAgICAgIFBNREEgcmVzcG9uc2UgdGltZW91dCAoc2Vjb25kcykgW2RlZmF1bHQgNV1cbiIK KyIgIC1VIHVzZXJuYW1lICAgICBpbiBkYWVtb24gbW9kZSwgcnVuIGFzIG5hbWVkIHVzZXIgW2Rl ZmF1bHQgcGNwXVxuIgogIiAgLXggZmlsZSAgICAgICAgIGZhdGFsIG1lc3NhZ2VzIGF0IHN0YXJ0 dXAgc2VudCB0byBmaWxlIFtkZWZhdWx0IC9kZXYvdHR5XVxuIiwKIAkJCXBtUHJvZ25hbWUpOwog CWlmICh1c2FnZSkKQEAgLTExMzcsOCArMTE0MywxMiBAQCBtYWluKGludCBhcmdjLCBjaGFyICph cmd2W10pCiAJRG9udFN0YXJ0KCk7CiAgICAgfQogCi0gICAgaWYgKHJ1bl9kYWVtb24gJiYgQ3Jl YXRlUElEZmlsZSgpIDwgMCkKLQlEb250U3RhcnQoKTsKKyAgICBpZiAocnVuX2RhZW1vbikgewor CWlmIChDcmVhdGVQSURmaWxlKCkgPCAwKQorCSAgICBEb250U3RhcnQoKTsKKwlpZiAoX19wbVNl dFByb2Nlc3NJZGVudGl0eSh1c2VybmFtZSkgPCAwKQorCSAgICBEb250U3RhcnQoKTsKKyAgICB9 CiAKICAgICBQcmludEFnZW50SW5mbyhzdGRlcnIpOwogICAgIF9fcG1BY2NEdW1wSG9zdHMoc3Rk ZXJyKTsKZGlmZiAtLWdpdCBhL3NyYy9wbWRhcy9lbGFzdGljc2VhcmNoL0luc3RhbGwgYi9zcmMv cG1kYXMvZWxhc3RpY3NlYXJjaC9JbnN0YWxsCmluZGV4IDQ1YjBlYTIuLjNhOTA2YzMgMTAwNzU1 Ci0tLSBhL3NyYy9wbWRhcy9lbGFzdGljc2VhcmNoL0luc3RhbGwKKysrIGIvc3JjL3BtZGFzL2Vs YXN0aWNzZWFyY2gvSW5zdGFsbApAQCAtMjEsNiArMjEsNyBAQAogaWFtPWVsYXN0aWNzZWFyY2gK IHBlcmxfb3B0PXRydWUKIGRhZW1vbl9vcHQ9ZmFsc2UKK2ZvcmNlZF9yZXN0YXJ0PXRydWUKIAog Zm9yIG1vZHVsZSBpbiBKU09OIExXUDo6VXNlckFnZW50CiBkbwpkaWZmIC0tZ2l0IGEvc3JjL3Bt ZGFzL215c3FsL0luc3RhbGwgYi9zcmMvcG1kYXMvbXlzcWwvSW5zdGFsbAppbmRleCA3MTkzMGI4 Li42MDY3YWY4IDEwMDc1NQotLS0gYS9zcmMvcG1kYXMvbXlzcWwvSW5zdGFsbAorKysgYi9zcmMv cG1kYXMvbXlzcWwvSW5zdGFsbApAQCAtMjUsNiArMjUsNyBAQAogaWFtPW15c3FsCiBwZXJsX29w dD10cnVlCiBkYWVtb25fb3B0PWZhbHNlCitmb3JjZWRfcmVzdGFydD10cnVlCiAKIHBlcmwgLWUg InVzZSBEQkkiIDI+L2Rldi9udWxsCiBpZiB0ZXN0ICQ/IC1uZSAwOyB0aGVuCmRpZmYgLS1naXQg YS9zcmMvcG1kYXMvbXlzcWwvcG1kYW15c3FsLnBsIGIvc3JjL3BtZGFzL215c3FsL3BtZGFteXNx bC5wbAppbmRleCA3MWU3ZGZiLi5mYTllNmRkIDEwMDY0NAotLS0gYS9zcmMvcG1kYXMvbXlzcWwv cG1kYW15c3FsLnBsCisrKyBiL3NyYy9wbWRhcy9teXNxbC9wbWRhbXlzcWwucGwKQEAgLTE3NTUs NiArMTc1NSw3IEBAICRwbWRhLT5hZGRfaW5kb20oJHByb2Nlc3NfaW5kb20sIFxAcHJvY2Vzc19p bnN0YW5jZXMsCiAkcG1kYS0+c2V0X2ZldGNoX2NhbGxiYWNrKFwmbXlzcWxfZmV0Y2hfY2FsbGJh Y2spOwogJHBtZGEtPnNldF9mZXRjaChcJm15c3FsX2Nvbm5lY3Rpb25fc2V0dXApOwogJHBtZGEt PnNldF9yZWZyZXNoKFwmbXlzcWxfcmVmcmVzaCk7CiskcG1kYS0+c2V0X3VzZXIoJ215c3FsJyk7 CiAkcG1kYS0+cnVuOwogCiA9cG9kCmRpZmYgLS1naXQgYS9zcmMvcG1kYXMvb3JhY2xlL0luc3Rh bGwgYi9zcmMvcG1kYXMvb3JhY2xlL0luc3RhbGwKaW5kZXggMzJjNjAzMi4uYTY0YWFjMCAxMDA3 NTUKLS0tIGEvc3JjL3BtZGFzL29yYWNsZS9JbnN0YWxsCisrKyBiL3NyYy9wbWRhcy9vcmFjbGUv SW5zdGFsbApAQCAtMjMsNiArMjMsNyBAQCB1c2VyPSRpYW0KIGRvbWFpbj0zMgogcGVybF9vcHQ9 dHJ1ZQogZGFlbW9uX29wdD1mYWxzZQorZm9yY2VkX3Jlc3RhcnQ9dHJ1ZQogCiBwZXJsIC1lICJ1 c2UgREJJIiAyPi9kZXYvbnVsbAogaWYgdGVzdCAkPyAtbmUgMDsgdGhlbgpkaWZmIC0tZ2l0IGEv c3JjL3BtZGFzL3Bvc3RncmVzcWwvSW5zdGFsbCBiL3NyYy9wbWRhcy9wb3N0Z3Jlc3FsL0luc3Rh bGwKaW5kZXggZTJlNGU3NC4uM2NmMzFiZSAxMDA3NTUKLS0tIGEvc3JjL3BtZGFzL3Bvc3RncmVz cWwvSW5zdGFsbAorKysgYi9zcmMvcG1kYXMvcG9zdGdyZXNxbC9JbnN0YWxsCkBAIC0yMSw2ICsy MSw3IEBACiBpYW09cG9zdGdyZXNxbAogcGVybF9vcHQ9dHJ1ZQogZGFlbW9uX29wdD1mYWxzZQor Zm9yY2VkX3Jlc3RhcnQ9dHJ1ZQogCiBwZXJsIC1lICJ1c2UgREJJIiAyPi9kZXYvbnVsbAogaWYg dGVzdCAkPyAtbmUgMDsgdGhlbgpkaWZmIC0tZ2l0IGEvc3JjL3BtaWUvc3JjL3BtaWUuYyBiL3Ny Yy9wbWllL3NyYy9wbWllLmMKaW5kZXggMmQ0NzkwZi4uNDAwMjU1YSAxMDA2NDQKLS0tIGEvc3Jj L3BtaWUvc3JjL3BtaWUuYworKysgYi9zcmMvcG1pZS9zcmMvcG1pZS5jCkBAIC01OCw2ICs1OCw3 IEBAIGNoYXIJKmNsaWVudGlkOwogc3RhdGljIEZJTEUgKmxvZ2ZwOwogc3RhdGljIGNoYXIgbG9n ZmlsZVtNQVhQQVRITEVOKzFdOwogc3RhdGljIGNoYXIgcGVyZmZpbGVbUE1JRV9QQVRIU0laRV07 CS8qIC92YXIvdG1wLzxwaWQ+IGZpbGUgbmFtZSAqLworc3RhdGljIGNoYXIgKnVzZXJuYW1lID0g InBjcCI7CiAKIHN0YXRpYyBjaGFyIG1lbnVbXSA9CiAicG1pZSBkZWJ1Z2dlciBjb21tYW5kc1xu XG4iCkBAIC05MSw2ICs5Miw3IEBAIHN0YXRpYyBjaGFyIHVzYWdlW10gPQogICAgICIgIC1TIHN0 YXJ0dGltZSBzdGFydCBvZiB0aGUgdGltZSB3aW5kb3dcbiIKICAgICAiICAtVCBlbmR0aW1lICAg ZW5kIG9mIHRoZSB0aW1lIHdpbmRvd1xuIgogICAgICIgIC10IGludGVydmFsICBzYW1wbGUgaW50 ZXJ2YWwgW2RlZmF1bHQgMTAgc2Vjb25kc11cbiIKKyAgICAiICAtVSB1c2VybmFtZSAgaW4gZGFl bW9uIG1vZGUsIHJ1biBhcyBuYW1lZCB1c2VyIFtkZWZhdWx0IHBjcF1cbiIKICAgICAiICAtViAg ICAgICAgICAgdmVyYm9zZSBtb2RlLCBhbm5vdGF0ZWQgZXhwcmVzc2lvbiB2YWx1ZXMgcHJpbnRl ZFxuIgogICAgICIgIC12ICAgICAgICAgICB2ZXJib3NlIG1vZGUsIGV4cHJlc3Npb24gdmFsdWVz IHByaW50ZWRcbiIKICAgICAiICAtVyAgICAgICAgICAgdmVyYm9zZSBtb2RlLCBzYXRpc2Z5aW5n IGV4cHJlc3Npb24gdmFsdWVzIHByaW50ZWRcbiIKQEAgLTQ1Miw2ICs0NTQsMjkgQEAgc2lnYmFk cHJvYyhpbnQgc2lnKQogCiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogbWFuaXB1bGF0ZSB0aGUgZW52 aXJvbm1lbnQgZm9yIHRoaXMgcHJvY2VzcyAtIGRpZmZlcmVudCB1c2VyLCBncm91cAorICoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKi8KKworc3RhdGljIHZvaWQKK2RhZW1vbkluaXQodm9pZCkKK3sKKyAgICAvKiBO b3RlOiB3ZSBjYW4gbm8gbG9uZ2VyIHVuaWxhdGVyYWxseSBjbG9zZSBzdGRpbiBoZXJlLCBhcyBp dAorICAgICAqIGNhbiByZWFsbHkgY29uZnVzZSByZW1hcF9zdGRvdXRfc3RkZXJyKCkgZHVyaW5n IGxvZyByb3RhdGlvbiEKKyAgICAgKi8KKyAgICBpZiAoYWdlbnQpCisJY2xvc2UoZmlsZW5vKHN0 ZGluKSk7CisKKyNpZm5kZWYgSVNfTUlOR1cKKyAgICBpZiAoc2V0c2lkKCkgPT0gLTEpIHsgLyog bm90IHByb2Nlc3MgZ3JvdXAgbGVhZGVyLCBsb3NlIGNvbnRyb2xsaW5nIHR0eSAqLworICAgICAg ICBfX3BtTm90aWZ5RXJyKExPR19XQVJOSU5HLCAiU3RhcnREYWVtb246IHNldHNpZCIpOworICAg IH0KKyNlbmRpZgorCisgICAgX19wbVNldFByb2Nlc3NJZGVudGl0eSh1c2VybmFtZSk7Cit9CisK KworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqCiAgKiBjb21tYW5kIGxpbmUgcHJvY2Vzc2luZyAtIGV4dHJhY3Qg Y29tbWFuZCBsaW5lIGFyZ3VtZW50cyAmIGluaXRpYWxpemUKICAqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIApA QCAtNDc5LDcgKzUwNCw3IEBAIGdldGFyZ3MoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBt ZW1zZXQoJnR2MiwgMCwgc2l6ZW9mKHR2MikpOwogICAgIGRzdHJ1Y3RJbml0KCk7CiAKLSAgICB3 aGlsZSAoKGM9Z2V0b3B0KGFyZ2MsIGFyZ3YsICJhOkE6YmM6Q2REOmVmSGg6ajpsOm46TzpTOnQ6 VDp2VldYeHpaOj8iKSkgIT0gRU9GKSB7CisgICAgd2hpbGUgKChjPWdldG9wdChhcmdjLCBhcmd2 LCAiYTpBOmJjOkNkRDplZkhoOmo6bDpuOk86Uzp0OlQ6VTp2VldYeHpaOj8iKSkgIT0gRU9GKSB7 CiAgICAgICAgIHN3aXRjaCAoYykgewogCiAJY2FzZSAnYSc6CQkJLyogYXJjaGl2ZXMgKi8KQEAg LTYxNSw2ICs2NDAsMTEgQEAgZ2V0YXJncyhpbnQgYXJnYywgY2hhciAqYXJndltdKQogCSAgICBz dG9wRmxhZyA9IG9wdGFyZzsKIAkgICAgYnJlYWs7CiAKKwljYXNlICdVJzogCQkJLyogcnVuIGFz IG5hbWVkIHVzZXIgKi8KKwkgICAgdXNlcm5hbWUgPSBvcHRhcmc7CisJICAgIGlzZGFlbW9uID0g MTsKKwkgICAgYnJlYWs7CisKIAljYXNlICd2JzogCQkJLyogcHJpbnQgdmFsdWVzICovCiAJICAg IHZlcmJvc2UgPSAxOwogCSAgICBicmVhazsKQEAgLTc5MCwxNiArODIwLDggQEAgZ2V0YXJncyhp bnQgYXJnYywgY2hhciAqYXJndltdKQogCQkJCQkgKiBLZXZpbiBXYW5nIDxrandAcmlnaHRzb2Nr LmNvbT4KIAkJCQkJICovCiAKLSAgICBpZiAoaXNkYWVtb24pIHsJCQkvKiBkYWVtb24gbW9kZSAq LwotCS8qIE5vdGU6IHdlIGNhbiBubyBsb25nZXIgdW5pbGF0ZXJhbGx5IGNsb3NlIHN0ZGluIGhl cmUsIGFzIGl0Ci0JICogY2FuIHJlYWxseSBjb25mdXNlIHJlbWFwX3N0ZG91dF9zdGRlcnIoKSBk dXJpbmcgbG9nIHJvdGF0aW9uIQotCSAqLwotCWlmIChhZ2VudCkKLQkgICAgY2xvc2UoZmlsZW5v KHN0ZGluKSk7Ci0jaWZuZGVmIElTX01JTkdXCi0Jc2V0c2lkKCk7CS8qIG5vdCBwcm9jZXNzIGdy b3VwIGxlYWRlciwgbG9zZSBjb250cm9sbGluZyB0dHkgKi8KLSNlbmRpZgotICAgIH0KKyAgICBp ZiAoaXNkYWVtb24pCQkJLyogZGFlbW9uIG1vZGUgKi8KKwlkYWVtb25Jbml0KCk7CiAKICAgICBp ZiAoc3RvbXBpbmcpCiAJc3RvbXBJbml0KCk7CQkJLyogY29ubmVjdCB0byBvdXIgbWVzc2FnZSBz ZXJ2ZXIgKi8KZGlmZiAtLWdpdCBhL3NyYy9wbWxvZ2dlci9wbWxvZ2dlci5jIGIvc3JjL3BtbG9n Z2VyL3BtbG9nZ2VyLmMKaW5kZXggYjVmMmM4Yi4uNmE5MDc0OCAxMDA2NDQKLS0tIGEvc3JjL3Bt bG9nZ2VyL3BtbG9nZ2VyLmMKKysrIGIvc3JjL3BtbG9nZ2VyL3BtbG9nZ2VyLmMKQEAgLTM5LDcg KzM5LDcgQEAgaW50CQlyZmxhZzsJCQkvKiByZXBvcnQgc2l6ZXMgKi8KIHN0cnVjdCB0aW1ldmFs CWRlbHRhID0geyA2MCwgMCB9OwkvKiBkZWZhdWx0IGxvZ2dpbmcgaW50ZXJ2YWwgKi8KIGludAkJ dW5idWZmZXJlZDsJCS8qIGlzIC11IHNwZWNpZmllZD8gKi8KIGludAkJcWFfY2FzZTsJCS8qIFFB IGVycm9yIGluamVjdGlvbiBzdGF0ZSAqLwotY2hhcgkJKm5vdGUgPSBOVUxMOwkJLyogbm90ZSBm b3IgcG9ydCBtYXAgZmlsZSAqLworY2hhcgkJKm5vdGU7CQkJLyogbm90ZSBmb3IgcG9ydCBtYXAg ZmlsZSAqLwogCiBzdGF0aWMgaW50IAkgICAgcG1jZGZkOwkJLyogY29tbXMgdG8gcG1jZCAqLwog c3RhdGljIGZkX3NldAkgICAgZmRzOwkJLyogZmlsZSBkZXNjcmlwdG9ycyBtYXNrIGZvciBzZWxl Y3QgKi8KQEAgLTQ4MSw4ICs0ODEsMTAgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAg ICAgaW50CQkJc3RzOwogICAgIGludAkJCXNlcCA9IF9fcG1QYXRoU2VwYXJhdG9yKCk7CiAgICAg aW50CQkJZXJyZmxhZyA9IDA7CisgICAgaW50CQkJaXNkYWVtb24gPSAwOwogICAgIGNoYXIJCWxv Y2FsW01BWEhPU1ROQU1FTEVOXTsKICAgICBjaGFyCQkqcG1uc2ZpbGUgPSBQTV9OU19ERUZBVUxU OworICAgIGNoYXIJCSp1c2VybmFtZSA9ICJwY3AiOwogICAgIGNoYXIJCSpsb2dmaWxlID0gInBt bG9nZ2VyLmxvZyI7CiAJCQkJICAgIC8qIGRlZmF1bHQgbG9nIChub3QgYXJjaGl2ZSkgZmlsZSBu YW1lICovCiAgICAgY2hhcgkJKmVuZG51bTsKQEAgLTUwMyw3ICs1MDUsNyBAQCBtYWluKGludCBh cmdjLCBjaGFyICoqYXJndikKICAgICAgKgkJY29ycmVzcG9uZGluZyBjaGFuZ2VzIGFyZSBtYWRl IHRvIHBtbmV3bG9nIHdoZW4gcG1sb2dnZXIKICAgICAgKgkJb3B0aW9ucyBhcmUgcGFzc2VkIHRo cm91Z2ggZnJvbSB0aGUgY29udHJvbCBmaWxlCiAgICAgICovCi0gICAgd2hpbGUgKChjID0gZ2V0 b3B0KGFyZ2MsIGFyZ3YsICJjOkQ6aDpsOkxtOm46UHJzOlQ6dDp1djpWOng6PyIpKSAhPSBFT0Yp IHsKKyAgICB3aGlsZSAoKGMgPSBnZXRvcHQoYXJnYywgYXJndiwgImM6RDpoOmw6TG06bjpQcnM6 VDp0OnVVOnY6Vjp4Oj8iKSkgIT0gRU9GKSB7CiAJc3dpdGNoIChjKSB7CiAKIAljYXNlICdjJzoJ CS8qIGNvbmZpZyBmaWxlICovCkBAIC01NTIsNiArNTU0LDcgQEAgbWFpbihpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAKIAljYXNlICdtJzoJCS8qIG5vdGUgZm9yIHBvcnQgbWFwIGZpbGUgKi8KIAkg ICAgbm90ZSA9IG9wdGFyZzsKKwkgICAgaXNkYWVtb24gPSAoc3RyY21wKG5vdGUsICJwbWxvZ2dl cl9jaGVjayIpID09IDApOwogCSAgICBicmVhazsKIAogCWNhc2UgJ24nOgkJLyogYWx0ZXJuYXRp dmUgbmFtZSBzcGFjZSBmaWxlICovCkBAIC01NjAsNiArNTYzLDcgQEAgbWFpbihpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAKIAljYXNlICdQJzoJCS8qIHRoaXMgaXMgdGhlIHByaW1hcnkgcG1sb2dn ZXIgKi8KIAkgICAgcHJpbWFyeSA9IDE7CisJICAgIGlzZGFlbW9uID0gMTsKIAkgICAgYnJlYWs7 CiAKIAljYXNlICdyJzoJCS8qIHJlcG9ydCBzaXplcyBvZiBwbVJlc3VsdCByZWNvcmRzICovCkBA IC01OTEsNiArNTk1LDExIEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCSAgICB9CiAJ ICAgIGJyZWFrOwogCisJY2FzZSAnVSc6CQkvKiBydW4gYXMgbmFtZWQgdXNlciAqLworCSAgICB1 c2VybmFtZSA9IG9wdGFyZzsKKwkgICAgaXNkYWVtb24gPSAxOworCSAgICBicmVhazsKKwogCWNh c2UgJ3UnOgkJLyogZmx1c2ggb3V0cHV0IGJ1ZmZlcnMgYWZ0ZXIgZWFjaCBmZXRjaCAqLwogCSAg ICB1bmJ1ZmZlcmVkID0gMTsKIAkgICAgYnJlYWs7CkBAIC02NTIsNiArNjYxLDcgQEAgT3B0aW9u czpcblwKICAgLXQgaW50ZXJ2YWwgICBkZWZhdWx0IGxvZ2dpbmcgaW50ZXJ2YWwgW2RlZmF1bHQg NjAuMCBzZWNvbmRzXVxuXAogICAtVCBlbmR0aW1lCXRlcm1pbmF0ZSBhdCBnaXZlbiB0aW1lXG5c CiAgIC11CQlvdXRwdXQgaXMgdW5idWZmZXJlZFxuXAorICAtVSB1c2VybmFtZSAgIGluIGRhZW1v biBtb2RlLCBydW4gYXMgbmFtZWQgdXNlciBbZGVmYXVsdCBwY3BdXG5cCiAgIC12IHZvbHNpemUJ c3dpdGNoIGxvZyB2b2x1bWVzIGFmdGVyIHZvbHNpemUgaGFzIGJlZW4gYWNjdW11bGF0ZWRcblwK ICAgLVYgdmVyc2lvbiAgICB2ZXJzaW9uIGZvciBhcmNoaXZlIChkZWZhdWx0IGFuZCBvbmx5IHZl cnNpb24gaXMgMilcblwKICAgLXggZmQJCWNvbnRyb2wgZmlsZSBkZXNjcmlwdG9yIGZvciBhcHBs aWNhdGlvbiBsYXVuY2hpbmcgcG1sb2dnZXJcblwKQEAgLTY3Miw2ICs2ODIsMTAgQEAgT3B0aW9u czpcblwKIAlub3RlID0geG5vdGU7CiAgICAgfQogCisgICAgLyogaWYgd2UgYXJlIHJ1bm5pbmcg YXMgYSBkYWVtb24sIGNoYW5nZSB1c2VyIGVhcmx5ICovCisgICAgaWYgKGlzZGFlbW9uKQorCV9f cG1TZXRQcm9jZXNzSWRlbnRpdHkodXNlcm5hbWUpOworCiAgICAgX19wbU9wZW5Mb2coInBtbG9n Z2VyIiwgbG9nZmlsZSwgc3RkZXJyLCAmc3RzKTsKIAogICAgIC8qIGJhc2UgbmFtZSBmb3IgYXJj aGl2ZSBpcyBoZXJlIC4uLiAqLwpkaWZmIC0tZ2l0IGEvc3JjL3BtcHJveHkvcG1wcm94eS5jIGIv c3JjL3BtcHJveHkvcG1wcm94eS5jCmluZGV4IDVkNzU0NzQuLmFlMzk4MjQgMTAwNjQ0Ci0tLSBh L3NyYy9wbXByb3h5L3BtcHJveHkuYworKysgYi9zcmMvcG1wcm94eS9wbXByb3h5LmMKQEAgLTE5 LDEzICsxOSwxMSBAQAogI2luY2x1ZGUgPHB3ZC5oPgogI2VuZGlmCiAKLWludCAJCXByb3h5X2hp X29wZW5mZHMgPSAtMTsgICAvKiBIaWdoZXN0IGtub3duIGZpbGUgZGVzY3JpcHRvciBmb3IgcG1w cm94eSAqLwotCiBzdGF0aWMgaW50CXRpbWVUb0RpZTsJCS8qIEZvciBTSUdJTlQgaGFuZGxpbmcg Ki8KIHN0YXRpYyBjaGFyCSpsb2dmaWxlID0gInBtcHJveHkubG9nIjsJLyogbG9nIGZpbGUgbmFt ZSAqLwogc3RhdGljIGludAlydW5fZGFlbW9uID0gMTsJCS8qIHJ1biBhcyBhIGRhZW1vbiwgc2Vl IC1mICovCiBzdGF0aWMgY2hhcgkqZmF0YWxmaWxlID0gIi9kZXYvdHR5IjsvKiBmYXRhbCBtZXNz YWdlcyBhdCBzdGFydHVwIGdvIGhlcmUgKi8KLXN0YXRpYyBjaGFyCSp1c2VybmFtZTsKK3N0YXRp YyBjaGFyCSp1c2VybmFtZSA9ICJwY3AiOwogCiAvKgogICogRm9yIG1haW50YWluaW5nIGluZm8g YWJvdXQgYSByZXF1ZXN0IHBvcnQgdGhhdCBjbGllbnRzIG1heSBjb25uZWN0IHRvCkBAIC0xNzIs NyArMTcwLDcgQEAgUGFyc2VPcHRpb25zKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJICAgIGNh c2UgJ0wnOiAvKiBNYXhpbXVtIHNpemUgZm9yIFBEVXMgZnJvbSBjbGllbnRzICovCiAJCXZhbCA9 IChpbnQpc3RydG9sIChvcHRhcmcsIE5VTEwsIDApOwogCQlpZiAoIHZhbCA8PSAwICkgewotCQkg ICAgZnB1dHMgKCJwbXByb3h5OiAtTCByZXF1aXJlIGEgcG9zaXZpdGUgdmFsdWVcbiIsIHN0ZGVy cik7CisJCSAgICBmcHV0cyAoInBtcHJveHk6IC1MIHJlcXVpcmVzIGEgcG9zaXRpdmUgdmFsdWVc biIsIHN0ZGVycik7CiAJCSAgICBlcnJmbGFnKys7CiAJCX0gZWxzZSB7CiAJCSAgICBfX3BtU2V0 UERVQ2VpbGluZyAodmFsKTsKZGlmZiAtLWdpdCBhL3NyYy9wbXByb3h5L3BtcHJveHkub3B0aW9u cyBiL3NyYy9wbXByb3h5L3BtcHJveHkub3B0aW9ucwppbmRleCAyOThjNzY3Li5iZDgzZTBjIDEw MDY0NAotLS0gYS9zcmMvcG1wcm94eS9wbXByb3h5Lm9wdGlvbnMKKysrIGIvc3JjL3BtcHJveHkv cG1wcm94eS5vcHRpb25zCkBAIC0xMSwxMSArMTEsMTEgQEAKICMgbWFrZSBsb2cgZ28gc29tZXBs YWNlIGVsc2UKICMgLWwgL3NvbWUvcGxhY2UvZWxzZQogCi0jIHJlc3RyaWN0aW5nIGluY29tbWlu ZyBQRFUgc2l6ZSB0byBwcmV2ZW50IERPUyBhdHRhY2tzCisjIG1heGltdW0gaW5jb21pbmcgUERV IHNpemUgKGRlZmF1bHQgNjRLQikKICMgLUwgMTYzODQgCiAKLSMgYXNzdW1lIGlkZW50aXR5IG9m IHNvbWUgdXNlciBvdGhlciB0aGFuIHJvb3QKLS1VIG5vYm9keQorIyBhc3N1bWUgaWRlbnRpdHkg b2Ygc29tZSB1c2VyIG90aGVyIHRoYW4gInBjcCIKKyMgLVUgbm9ib2R5CiAKICMgZW1lcmdlbmN5 IG1lc3NhZ2VzIGJlZm9yZSBsb2dmaWxlIGNyZWF0ZWQKICMgLXggL3RtcC9kZXNwZXJhdGUubG9n Cg== ------=_Part_20166088_1806489047.1351761494634-- From chandana@desilva.id.au Thu Nov 1 04:19:07 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA19J6It013535 for ; Thu, 1 Nov 2012 04:19:07 -0500 X-ASG-Debug-ID: 1351761657-04cbb0644935c00001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id l94OYtHWuaobJT5J (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 01 Nov 2012 02:20:57 -0700 (PDT) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TTqxM-000FUm-Is for pcp@oss.sgi.com; Thu, 01 Nov 2012 09:20:57 +0000 Received: from [192.168.1.57] (unknown [192.168.1.57]) by mail.desilva.id.au (Postfix) with ESMTPSA id 58BFE71DB for ; Thu, 1 Nov 2012 20:17:22 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/v1FP7qtreE1OLdipYq/g6MML1fMvf/2g= Message-ID: <50923EF4.80804@desilva.id.au> Date: Thu, 01 Nov 2012 20:20:52 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: PCP 3.6.9 and the mysql pmda Content-Type: text/plain; charset=ISO-8859-1; format=flowed X-ASG-Orig-Subj: PCP 3.6.9 and the mysql pmda Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1351761657 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.112962 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- I have started installing PCP 3.6.9 on a set of CentOS 5.5 x86_64 servers. One issue I have found is that PCP does not get listed in chkconfig. Is this intentional (systemd related ?). If so how can we get that back into the older versions of RHEL/CentOS ? The second issue is that I seem to have made an error in the mysql pmda. PCP now thinks this is a Gigabyte value. pminfo -d -t mysql.slave_status.seconds_behind_master mysql.slave_status.seconds_behind_master [] Data Type: 32-bit unsigned int InDom: PM_INDOM_NULL 0xffffffff Semantics: instant Units: Gbyte This came from: $pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_INSTANT, pmda_units(1,0,0,PM_TIME_SEC,0,0), 'mysql.slave_status.seconds_behind_master', '', ''); I think the above should be: $pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_INSTANT, pmda_units(0, 1, 0, 0, PM_TIME_SEC, 0), 'mysql.slave_status.seconds_behind_master', '', ''); Is this clearly explained somewhere ?. I am not sure if I am reading the correct document at http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=bks&srch=&fname=/SGI_Developer/PCP_PG/sgi_html/ch02.html#id5189820 Chandana From nscott@redhat.com Thu Nov 1 04:31:22 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA19VM7H014387 for ; Thu, 1 Nov 2012 04:31:22 -0500 X-ASG-Debug-ID: 1351762392-04cbb0644736520001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id peHBdOlrGKBkNJHY for ; Thu, 01 Nov 2012 02:33:12 -0700 (PDT) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA19XBcl019948; Thu, 1 Nov 2012 05:33:11 -0400 Date: Thu, 1 Nov 2012 05:33:11 -0400 (EDT) From: Nathan Scott Reply-To: Nathan Scott To: chandana@desilva.id.au Cc: pcp@oss.sgi.com Message-ID: <980055469.20169025.1351762391414.JavaMail.root@redhat.com> In-Reply-To: <50923EF4.80804@desilva.id.au> Subject: Re: [pcp] PCP 3.6.9 and the mysql pmda MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] PCP 3.6.9 and the mysql pmda Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.49.234] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1351762392 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.112962 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header ----- Original Message ----- > I have started installing PCP 3.6.9 on a set of CentOS 5.5 x86_64 > servers. One issue I have found is that PCP does not get listed in > chkconfig. Is this intentional (systemd related ?). If so how can we > get that back into the older versions of RHEL/CentOS ? > This might be that the old "pcp" script has been divided into two: $ sudo /sbin/chkconfig --list | grep pcp $ sudo /sbin/chkconfig --list | grep pmcd pmcd 0:off 1:off 2:on 3:on 4:on 5:on 6:off $ sudo /sbin/chkconfig --list | grep pmlogger pmlogger 0:off 1:off 2:on 3:on 4:on 5:on 6:off Or it might be something else entirely. > The second issue is that I seem to have made an error in the mysql > pmda. > PCP now thinks this is a Gigabyte value. > pminfo -d -t mysql.slave_status.seconds_behind_master > > mysql.slave_status.seconds_behind_master [] > Data Type: 32-bit unsigned int InDom: PM_INDOM_NULL 0xffffffff > Semantics: instant Units: Gbyte > > This came from: > > $pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, > PM_SEM_INSTANT, pmda_units(1,0,0,PM_TIME_SEC,0,0), > 'mysql.slave_status.seconds_behind_master', '', > ''); > > I think the above should be: > > $pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, > PM_SEM_INSTANT, pmda_units(0, 1, 0, 0, > PM_TIME_SEC, 0), > 'mysql.slave_status.seconds_behind_master', '', > ''); > *nod* > Is this clearly explained somewhere ?. I am not sure if I am reading > the > correct document at > http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=bks&srch=&fname=/SGI_Developer/PCP_PG/sgi_html/ch02.html#id5189820 > Yep, thats a good source. Usually I just see what another pmda (linux) does in the same situation, when I have to remind myself on the order of those fields. cheers. -- Nathan From mailman-bounces@oss.sgi.com Thu Nov 1 05:01:37 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ALL_TRUSTED,BAYES_00, J_CHICKENPOX_25 autolearn=no version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA1A0iLD016249 for ; Thu, 1 Nov 2012 05:00:44 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Subject: oss.sgi.com mailing list memberships reminder From: mailman-owner@oss.sgi.com To: pcp@oss.sgi.com X-No-Archive: yes Message-ID: Date: Thu, 01 Nov 2012 05:00:32 -0500 Precedence: bulk X-BeenThere: mailman@oss.sgi.com X-Mailman-Version: 2.1.11 List-Id: Mailman mail X-List-Administrivia: yes Sender: mailman-bounces@oss.sgi.com Errors-To: mailman-bounces@oss.sgi.com This is a reminder, sent out once a month, about your oss.sgi.com mailing list memberships. It includes your subscription info and how to use it to change it or unsubscribe from a list. You can visit the URLs to change your membership status or configuration, including unsubscribing, setting digest-style delivery or disabling delivery altogether (e.g., for a vacation), and so on. In addition to the URL interfaces, you can also use email to make such changes. For more info, send a message to the '-request' address of the list (for example, mailman-request@oss.sgi.com) containing just the word 'help' in the message body, and an email message will be sent to you with instructions. If you have questions, problems, comments, etc, send them to mailman-owner@oss.sgi.com. Thanks! Passwords for pcp@oss.sgi.com: List Password // URL ---- -------- pcp-announce@oss.sgi.com xE+IBctR http://oss.sgi.com/mailman/options/pcp-announce/pcp%40oss.sgi.com From chandana@desilva.id.au Thu Nov 1 05:29:48 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_00,HTML_MESSAGE autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA1ATmgF018307 for ; Thu, 1 Nov 2012 05:29:48 -0500 X-ASG-Debug-ID: 1351765898-04cbb0644739780001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id SauNR6WNNQ9SqWge (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 01 Nov 2012 03:31:39 -0700 (PDT) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TTs3l-000BXH-M8; Thu, 01 Nov 2012 10:31:38 +0000 Received: from [192.168.1.57] (unknown [192.168.1.57]) by mail.desilva.id.au (Postfix) with ESMTPSA id 08E0A71E0; Thu, 1 Nov 2012 21:28:03 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18YLQ2A9SJnzaDFkQW7B6tMqJyLxNgxTcc= Message-ID: <50924F84.9070801@desilva.id.au> Date: Thu, 01 Nov 2012 21:31:32 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: Nathan Scott CC: pcp@oss.sgi.com Subject: Re: [pcp] PCP 3.6.9 and the mysql pmda References: <980055469.20169025.1351762391414.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: [pcp] PCP 3.6.9 and the mysql pmda In-Reply-To: <980055469.20169025.1351762391414.JavaMail.root@redhat.com> Content-Type: multipart/alternative; boundary="------------010202070504000001080600" X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1351765899 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=HTML_MESSAGE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.112966 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 HTML_MESSAGE BODY: HTML included in message This is a multi-part message in MIME format. --------------010202070504000001080600 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 01/11/12 20:33, Nathan Scott wrote: > $ sudo /sbin/chkconfig --list | grep pcp > $ sudo /sbin/chkconfig --list | grep pmcd > pmcd 0:off 1:off 2:on 3:on 4:on 5:on 6:off > $ sudo /sbin/chkconfig --list | grep pmlogger > pmlogger 0:off 1:off 2:on 3:on 4:on 5:on 6:off > > Or it might be something else entirely. sudo /sbin/chkconfig --list| egrep "pcp|pmcd|pmlogger" pmcd 0:off 1:off 2:on 3:on 4:on 5:on 6:off pmlogger 0:off 1:off 2:on 3:on 4:on 5:on 6:off So, (this is a puppet issue) do I stipulate that there is no service named "pcp", and that instead of managing the "pcp" service, puppet should manage the "pmcd" and "pmlogger" services ? > > *nod* > >> >Is this clearly explained somewhere ?. I am not sure if I am reading >> >the >> >correct document at >> >http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=bks&srch=&fname=/SGI_Developer/PCP_PG/sgi_html/ch02.html#id5189820 >> > > Yep, thats a good source. Usually I just see what another pmda > (linux) does in the same situation, when I have to remind myself > on the order of those fields. I will go through the new variables very carefully and send you an update. The change you asked me to test works, but I am not sure of the significance. diff --git a/src/pmdas/mysql/pmdamysql.pl b/src/pmdas/mysql/pmdamysql.pl index 71e7dfb..fa9e6dd 100644 --- a/src/pmdas/mysql/pmdamysql.pl +++ b/src/pmdas/mysql/pmdamysql.pl @@ -1755,6 +1755,7 @@ $pmda->add_indom($process_indom, \@process_instances, $pmda->set_fetch_callback(\&mysql_fetch_callback); $pmda->set_fetch(\&mysql_connection_setup); $pmda->set_refresh(\&mysql_refresh); +$pmda->set_user('mysql'); $pmda->run; I am assuming that the pmda is going to run under the mysql os account. You still need a login/password for the database. I do not think mysql has 'trusted' users in the same way that PostgreSQL has. Also, there is no gurantee that there will always be a mysql os user. Chandana --------------010202070504000001080600 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit
On 01/11/12 20:33, Nathan Scott wrote:
$ sudo /sbin/chkconfig --list  | grep pcp
$ sudo /sbin/chkconfig --list  | grep pmcd
pmcd           	0:off	1:off	2:on	3:on	4:on	5:on	6:off
$ sudo /sbin/chkconfig --list  | grep pmlogger
pmlogger       	0:off	1:off	2:on	3:on	4:on	5:on	6:off

Or it might be something else entirely.
sudo /sbin/chkconfig --list|  egrep "pcp|pmcd|pmlogger"
pmcd            0:off   1:off   2:on    3:on    4:on    5:on    6:off
pmlogger        0:off   1:off   2:on    3:on    4:on    5:on    6:off

So, (this is a puppet issue) do I stipulate that there is no service named "pcp", and that instead of managing the "pcp" service, puppet should manage the "pmcd" and "pmlogger" services ? 
> 

*nod*


> Is this clearly explained somewhere ?. I am not sure if I am reading
> the
> correct document at
> http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=bks&srch=&fname=/SGI_Developer/PCP_PG/sgi_html/ch02.html#id5189820
> 

Yep, thats a good source.  Usually I just see what another pmda
(linux) does in the same situation, when I have to remind myself
on the order of those fields.
I will go through the new variables very carefully and send you an update.

The change you asked me to test works, but I am not sure of the significance.
<nathans> diff --git a/src/pmdas/mysql/pmdamysql.pl b/src/pmdas/mysql/pmdamysql.pl
<nathans> index 71e7dfb..fa9e6dd 100644
<nathans> --- a/src/pmdas/mysql/pmdamysql.pl
<nathans> +++ b/src/pmdas/mysql/pmdamysql.pl
<nathans> @@ -1755,6 +1755,7 @@ $pmda->add_indom($process_indom, \@process_instances,
<nathans>  $pmda->set_fetch_callback(\&mysql_fetch_callback);
<nathans>  $pmda->set_fetch(\&mysql_connection_setup);
<nathans>  $pmda->set_refresh(\&mysql_refresh);
<nathans> +$pmda->set_user('mysql');
<nathans>  $pmda->run;
I am assuming that the pmda is going to run under the mysql os account. You still need a login/password for the database. I do not think mysql has 'trusted' users in the same way that PostgreSQL has. Also, there is no gurantee that there will always be a mysql os user.

Chandana

--------------010202070504000001080600-- From kenj@internode.on.net Thu Nov 1 14:39:32 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA1JdWkG050949 for ; Thu, 1 Nov 2012 14:39:32 -0500 X-ASG-Debug-ID: 1351798882-04cb6c63935a9a0001-S8gJnT Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id 6OXeAuGYMgKztG3L for ; Thu, 01 Nov 2012 12:41:22 -0700 (PDT) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.129 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAAbPklB20Yh6/2dsb2JhbAANN4YXwH8BAQEEIwRSEAsYAgImAgJXiCqpB26TBoEgjXKCEYETA5V4gRuSKw Received: from ppp118-209-136-122.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.136.122]) by ipmail06.adl2.internode.on.net with ESMTP; 02 Nov 2012 06:11:21 +1030 Message-ID: <1351798913.3985.50.camel@bozo.localdomain> Subject: Re: [pcp] PCP 3.6.9 and the mysql pmda From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] PCP 3.6.9 and the mysql pmda To: chandana@desilva.id.au Cc: pcp@oss.sgi.com Date: Fri, 02 Nov 2012 06:41:53 +1100 In-Reply-To: <50923EF4.80804@desilva.id.au> References: <50923EF4.80804@desilva.id.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl2.internode.on.net[150.101.137.129] X-Barracuda-Start-Time: 1351798882 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113002 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header On Thu, 2012-11-01 at 20:20 +1100, Chandana De Silva wrote: > ... > The second issue is that I seem to have made an error in the mysql pmda. > PCP now thinks this is a Gigabyte value. > pminfo -d -t mysql.slave_status.seconds_behind_master > > mysql.slave_status.seconds_behind_master [] > Data Type: 32-bit unsigned int InDom: PM_INDOM_NULL 0xffffffff > Semantics: instant Units: Gbyte > > This came from: > > $pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, > PM_SEM_INSTANT, pmda_units(1,0,0,PM_TIME_SEC,0,0), > 'mysql.slave_status.seconds_behind_master', '', ''); > > I think the above should be: > > $pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, > PM_SEM_INSTANT, pmda_units(0, 1, 0, 0, PM_TIME_SEC, 0), > 'mysql.slave_status.seconds_behind_master', '', ''); > > Is this clearly explained somewhere ?. I am not sure if I am reading the > correct document at > http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=bks&srch=&fname=/SGI_Developer/PCP_PG/sgi_html/ch02.html#id5189820 The tech pubs manual remains remarkably correct after all these years, but the only hint therein that would have helped here is units A description of the value's units based on dimension and scale in the three orthogonal dimensions of space, time, and count (or events) The perl pmda_units() function is defined as pmda_units(dim_space,dim_time,dim_count,scale_space,scale_time,scale_count) and is functionally equivalent to the C initializer macro PMDA_PMUNITS() which has the unhelpful definition of #define PMDA_PMUNITS(a,b,c,d,e,f) In both cases the six-tuplet of parameters sets the fields of a pmUnits structure as described in the pmLookupDesc(3) man page, namely the dimension in time, the dimension in space and the dimension in "count" (messages, ops, events, ...) followed by the scale in time, the scale in space and the scale in "count" ... the scale values only make sense when the dimension in the corresponding domain are non-zero. So, pmda_units(1,0,0,PM_TIME_SEC,0,0) specifies a metric that has a space dimension of 1 and a space scale of 3 (PM_TIME_SEC, which is wrong in this context, but PM_SPACE_GBYTE is also defined as 3) ... hence the units become "Gbyte". The corrected version of pmda_units(0, 1, 0, 0, PM_TIME_SEC, 0) specifies a metric that has a time dimension of 1 and a time scale of 3 ... and the units are "seconds". As Nathan suggests, "copy by example" is a good plan here ... 8^)> From chandana@desilva.id.au Thu Nov 1 18:05:42 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA1N5f9E060286 for ; Thu, 1 Nov 2012 18:05:42 -0500 X-ASG-Debug-ID: 1351811253-04cb6c639266260001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id g9qSbVJyYAyvFG8P (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 01 Nov 2012 16:07:33 -0700 (PDT) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TU3rJ-0003M9-3C; Thu, 01 Nov 2012 23:07:33 +0000 Received: from [192.168.19.77] (ip-34.83.45.175.VOCUS.net.au [175.45.83.34]) by mail.desilva.id.au (Postfix) with ESMTPSA id 4346F69C7; Fri, 2 Nov 2012 10:04:00 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18GNLl7oUqLmHjKwyM3hBPYFKHLtFdA7OM= Message-ID: <509300B0.7010401@desilva.id.au> Date: Fri, 02 Nov 2012 10:07:28 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: Ken McDonell CC: pcp@oss.sgi.com Subject: Re: [pcp] PCP 3.6.9 and the mysql pmda References: <50923EF4.80804@desilva.id.au> <1351798913.3985.50.camel@bozo.localdomain> X-ASG-Orig-Subj: Re: [pcp] PCP 3.6.9 and the mysql pmda In-Reply-To: <1351798913.3985.50.camel@bozo.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1351811253 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113016 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Thanks Ken. I have modified the code and the tests are looking ok. I will send the revised code to Nathan once I have finished testing the i386 build. It should not matter though. Chandana On 02/11/12 06:41, Ken McDonell wrote: > The corrected version of pmda_units(0, 1, 0, 0, PM_TIME_SEC, 0) > specifies a metric that has a time dimension of 1 and a time scale of > 3 ... and the units are "seconds". > > As Nathan suggests, "copy by example" is a good plan here ... 8^)> From chandana@desilva.id.au Fri Nov 2 04:46:14 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA29kELJ106690 for ; Fri, 2 Nov 2012 04:46:14 -0500 X-ASG-Debug-ID: 1351849685-04cbb0644884e30001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id dxzm9FLjoQmBvfbv (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Fri, 02 Nov 2012 02:48:05 -0700 (PDT) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TUDrA-000Mja-KW for pcp@oss.sgi.com; Fri, 02 Nov 2012 09:48:05 +0000 Received: from [192.168.1.57] (unknown [192.168.1.57]) by mail.desilva.id.au (Postfix) with ESMTPSA id 55D0D7241 for ; Fri, 2 Nov 2012 20:44:32 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19KTDYUEx4g8iSCuRgwTzZQEScl9OjgE40= Message-ID: <509396D1.6020905@desilva.id.au> Date: Fri, 02 Nov 2012 20:48:01 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: MySQL PMDA Changes Content-Type: text/plain; charset=ISO-8859-1; format=flowed X-ASG-Orig-Subj: MySQL PMDA Changes Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1351849685 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC1_TG070, INFO_TLD X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113058 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 INFO_TLD URI: Contains an URL in the INFO top-level domain 0.50 BSF_SC1_TG070 Custom Rule TG070 I have corrected and the errors in units. Please see the attached diff, which is against the original 3.6.9 code . I will send the complete file to Nathan. chandana@tardis:~/pmdamysql$ diff -u 3.6.9/pmdamysql.pl 2012-11-02/pmdamysql.pl --- 3.6.9/pmdamysql.pl 2012-11-02 20:43:19.749170048 +1100 +++ 2012-11-02/pmdamysql.pl 2012-11-02 20:31:39.973700045 +1100 @@ -32,8 +32,8 @@ eval `cat $file` unless ! -f $file; } -use vars qw( $pmda %status %variables @processes ); -use vars qw( $dbh $sth_variables $sth_status $sth_processes ); +use vars qw( $pmda %status %variables @processes %slave_status ); +use vars qw( $dbh $sth_variables $sth_status $sth_processes $sth_slave_status ); my $process_indom = 0; my @process_instances; @@ -48,6 +48,7 @@ $sth_variables = $dbh->prepare('show variables'); $sth_status = $dbh->prepare('show status'); $sth_processes = $dbh->prepare('show processlist'); + $sth_slave_status = $dbh->prepare('show slave status'); } } } @@ -101,6 +102,20 @@ $pmda->replace_indom($process_indom, \@process_instances); } +sub mysql_slave_status_refresh +{ + # $pmda->log("mysql_slave_status_refresh\n"); + + %slave_status = (); # clear any previous contents + if (defined($dbh)) { + $sth_slave_status->execute(); + my $result = $sth_slave_status->fetchrow_hashref(); + while ( my ($key, $value) = each(%$result) ) { + $slave_status{lc $key} = $value; + } + } +} + sub mysql_refresh { my ($cluster) = @_; @@ -109,6 +124,7 @@ if ($cluster == 0) { mysql_status_refresh; } elsif ($cluster == 1) { mysql_variables_refresh; } elsif ($cluster == 2) { mysql_process_refresh; } + elsif ($cluster == 3) { mysql_slave_status_refresh; } } sub mysql_fetch_callback @@ -145,9 +161,17 @@ if (!defined($value)) { return (PM_ERR_APPVERSION, 0); } return ($value, 1); } + elsif ($cluster == 3) { + $mysql_name =~ s/^mysql\.slave_status\.//; + $value = $slave_status{$mysql_name}; + if (!defined($value)) { return (PM_ERR_APPVERSION, 0); } + return ($value, 1); + } return (PM_ERR_PMID, 0); } +# pmda_units(dim_space, dim_time, dim_count, scale_space, scale_time, scale_count) + $pmda = PCP::PMDA->new('mysql', 66); $pmda->add_metric(pmda_pmid(0,0), PM_TYPE_U32, PM_INDOM_NULL, @@ -1632,6 +1656,103 @@ PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), 'mysql.processlist.info', '', ''); +$pmda->add_metric(pmda_pmid(3,0), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.slave_io_state', '', ''); +$pmda->add_metric(pmda_pmid(3,1), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.slave_io_running', '', ''); +$pmda->add_metric(pmda_pmid(3,2), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.slave_sql_running', '', ''); +$pmda->add_metric(pmda_pmid(3,3), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,1,0,0,PM_TIME_SEC,0), + 'mysql.slave_status.seconds_behind_master', '', ''); +$pmda->add_metric(pmda_pmid(3,4), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_log_file', '', ''); +$pmda->add_metric(pmda_pmid(3,5), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,1,0,0,PM_COUNT_ONE), + 'mysql.slave_status.read_master_log_pos', '', ''); +$pmda->add_metric(pmda_pmid(3,6), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.relay_master_log_file', '', ''); +$pmda->add_metric(pmda_pmid(3,7), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,1,0,0,PM_COUNT_ONE), + 'mysql.slave_status.exec_master_log_pos', '', ''); +$pmda->add_metric(pmda_pmid(3,8), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.relay_log_file', '', ''); +$pmda->add_metric(pmda_pmid(3,9), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,1,0,0,PM_COUNT_ONE), + 'mysql.slave_status.relay_log_pos', '', ''); +$pmda->add_metric(pmda_pmid(3,10), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.until_log_file', '', ''); +$pmda->add_metric(pmda_pmid(3,11), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,1,0,0,PM_COUNT_ONE), + 'mysql.slave_status.until_log_pos', '', ''); +$pmda->add_metric(pmda_pmid(3,12), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_ssl_cipher', '', ''); +$pmda->add_metric(pmda_pmid(3,13), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_ssl_ca_file', '', ''); +$pmda->add_metric(pmda_pmid(3,14), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,1,0,0,PM_COUNT_ONE), + 'mysql.slave_status.skip_counter', '', ''); +$pmda->add_metric(pmda_pmid(3,15), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(1,0,0,PM_SPACE_BYTE,0,0), + 'mysql.slave_status.relay_log_space', '', ''); +$pmda->add_metric(pmda_pmid(3,16), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.until_condition', '', ''); +$pmda->add_metric(pmda_pmid(3,17), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,1,0,0,PM_TIME_SEC,0), + 'mysql.slave_status.connect_retry', '', ''); +$pmda->add_metric(pmda_pmid(3,18), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_host', '', ''); +$pmda->add_metric(pmda_pmid(3,19), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_INSTANT, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.last_errno', '', ''); +$pmda->add_metric(pmda_pmid(3,20), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_ssl_cert', '', ''); +$pmda->add_metric(pmda_pmid(3,21), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.replicate_do_db', '', ''); +$pmda->add_metric(pmda_pmid(3,22), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.replicate_ignore_db', '', ''); +$pmda->add_metric(pmda_pmid(3,23), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_user', '', ''); +$pmda->add_metric(pmda_pmid(3,24), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.replicate_do_table', '', ''); +$pmda->add_metric(pmda_pmid(3,25), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.replicate_wild_do_table', '', ''); +$pmda->add_metric(pmda_pmid(3,26), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.replicate_wild_ignore_table', '', ''); +$pmda->add_metric(pmda_pmid(3,27), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.replicate_ignore_table', '', ''); +$pmda->add_metric(pmda_pmid(3,28), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_ssl_allowed', '', ''); +$pmda->add_metric(pmda_pmid(3,29), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_ssl_ca_path', '', ''); +$pmda->add_metric(pmda_pmid(3,30), PM_TYPE_U32, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_port', '', ''); +$pmda->add_metric(pmda_pmid(3,31), PM_TYPE_STRING, PM_INDOM_NULL, + PM_SEM_DISCRETE, pmda_units(0,0,0,0,0,0), + 'mysql.slave_status.master_ssl_key', '', ''); + $pmda->add_indom($process_indom, \@process_instances, 'Instance domain exporting each MySQL process', ''); From chandana@desilva.id.au Fri Nov 2 04:57:46 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_00,HTML_MESSAGE autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA29vkAn107405 for ; Fri, 2 Nov 2012 04:57:46 -0500 X-ASG-Debug-ID: 1351850377-04cb6c6392810d0001-S8gJnT Received: from mho-02-ewr.mailhop.org (mho-04-ewr.mailhop.org [204.13.248.74]) by cuda.sgi.com with ESMTP id 6T5lSn9EwMGJtYw0 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Fri, 02 Nov 2012 02:59:38 -0700 (PDT) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.74 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TUE2L-0002nu-58 for pcp@oss.sgi.com; Fri, 02 Nov 2012 09:59:37 +0000 Received: from [192.168.1.57] (unknown [192.168.1.57]) by mail.desilva.id.au (Postfix) with ESMTPSA id 18CB96EDC for ; Fri, 2 Nov 2012 20:56:05 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+aZ/Ew+CnVLZ5CQcgyTAZ5v7LNCNtHpMM= Message-ID: <50939986.4050203@desilva.id.au> Date: Fri, 02 Nov 2012 20:59:34 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: PMIE Help Content-Type: multipart/alternative; boundary="------------000806010403020804090507" X-ASG-Orig-Subj: PMIE Help X-Barracuda-Connect: mho-04-ewr.mailhop.org[204.13.248.74] X-Barracuda-Start-Time: 1351850378 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC1_TG070, HTML_MESSAGE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113060 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 HTML_MESSAGE BODY: HTML included in message 0.50 BSF_SC1_TG070 Custom Rule TG070 This is a multi-part message in MIME format. --------------000806010403020804090507 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit All, I am rying to write a rule to check MySQL Slave lag. I have a simple rule which works, as shown below. What I want to have is a slightly more complex rule which also prints the rate of change, which the number of seconds the slave has caught up or lost in the last minute. I think I can get that with the calculation for lag_rateofchange. I need to have a rule which is something like; $replication_lag >= $lag_critical && $lag_rateofchange >0 -> shell "$send_nagios -S MySQL_Replication -s 1 Slave %v seconds behind master, catching up at seconds per minute\n"; How can I get the value of $ lag_rateofchange in the ouput text ? ( I have tried a second %v as suggested by the pmie man page, but that repeated the first value.) Thanks in advance; Chandana //---------------------------------------------------------------------------------------------- // Global variables //---------------------------------------------------------------------------------------------- // this script sends pmie results to nagios send_nagios = "/usr/local/bin/send_nagios -nv"; delta = 1 min; //---------------------------------------------------------------------------------------------- // Simple Slave Replication lag //---------------------------------------------------------------------------------------------- replication_lag = "mysql.slave_status.seconds_behind_master"; lag_rateofchange = "(( mysql.slave_status.seconds_behind_master @0 - mysql.slave_status.seconds_behind_master @1 ))"; lag_warning=60; lag_critical=3600; $replication_lag >= $lag_critical -> shell "$send_nagios -S MySQL_Replication -s 1 Slave %v seconds behind master\n"; $replication_lag >= $lag_warning && $replication_lag <= $lag_critical -> shell "$send_nagios -S MySQL_Replication -s 2 Slave %v seconds behind master\n"; $replication_lag < $lag_warning -> shell "$send_nagios -S MySQL_Replication -s 0 Slave %v seconds behind master\n"; //---------------------------------------------------------------------------------------------- // vi: set ts=4 et tw=0: --------------000806010403020804090507 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit All,

I am rying to write a rule to check MySQL Slave lag.

I have a simple rule which works, as shown below. What I want to have is a slightly more complex rule which also prints the rate of change, which the number of seconds the slave has caught up or lost in the
last minute. I think I can get that with the calculation for lag_rateofchange.
 I need to have a rule which is something like;

$replication_lag >= $lag_critical && $lag_rateofchange >0
    -> shell "$send_nagios -S MySQL_Replication -s 1 Slave %v seconds behind master, catching up at <X> seconds per minute\n";

How can I get the value of $ lag_rateofchange in the ouput text ? ( I have tried a second %v as suggested by the pmie man page, but that repeated the first value.)

Thanks in advance;
Chandana

//----------------------------------------------------------------------------------------------
// Global variables
//----------------------------------------------------------------------------------------------
// this script sends pmie results to nagios
send_nagios = "/usr/local/bin/send_nagios -nv";

delta = 1 min;
//----------------------------------------------------------------------------------------------
// Simple Slave Replication lag
//----------------------------------------------------------------------------------------------
replication_lag = "mysql.slave_status.seconds_behind_master";
lag_rateofchange = "(( mysql.slave_status.seconds_behind_master @0 - mysql.slave_status.seconds_behind_master @1 ))";
lag_warning=60;
lag_critical=3600;

$replication_lag >= $lag_critical
    -> shell "$send_nagios -S MySQL_Replication -s 1 Slave %v seconds behind master\n";

$replication_lag >= $lag_warning &&
$replication_lag <= $lag_critical
    -> shell "$send_nagios -S MySQL_Replication -s 2 Slave %v seconds behind master\n";

$replication_lag < $lag_warning
    -> shell "$send_nagios -S MySQL_Replication -s 0 Slave %v seconds behind master\n";                                                                                                                                                                  &n bsp;  ;           
                                                                                                                                                                      &nb sp;                                                                                                
//----------------------------------------------------------------------------------------------                                                                                                                                                      &nb sp;                
                                                                                                                                                                      &nb sp;                                                                                                
                                                                                                                                                                      &nb sp;                                                                                                
                                                                                                                                                                      &nb sp;                                                                                                
// vi: set ts=4 et tw=0:                                                        
--------------000806010403020804090507-- From fche@redhat.com Tue Nov 6 08:14:48 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA6EEm2O063372 for ; Tue, 6 Nov 2012 08:14:48 -0600 X-ASG-Debug-ID: 1352211404-04cbb05f55ce5f0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id WHsYBRSAouccbnCm for ; Tue, 06 Nov 2012 06:16:44 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA6EGhGv014488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Nov 2012 09:16:44 -0500 Received: from fche.csb (vpn-9-65.rdu.redhat.com [10.11.9.65]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA6EGgY6002043; Tue, 6 Nov 2012 09:16:43 -0500 Received: by fche.csb (Postfix, from userid 2569) id 53421581B9; Tue, 6 Nov 2012 09:16:42 -0500 (EST) To: Nathan Scott Cc: pcp@oss.sgi.com Subject: Re: [RFC] PCP daemons running as non-root users References: <928371738.20134659.1351749721974.JavaMail.root@redhat.com> <1556530893.20166090.1351761494636.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: [RFC] PCP daemons running as non-root users From: fche@redhat.com (Frank Ch. Eigler) Date: Tue, 06 Nov 2012 09:16:42 -0500 In-Reply-To: <1556530893.20166090.1351761494636.JavaMail.root@redhat.com> (Nathan Scott's message of "Thu, 1 Nov 2012 05:18:14 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1352211404 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Hi, Nato - nathans wrote: > [...] > Attached patch is an initial stab at solving the problem. It > takes the following tack: > - add a new "pcp" user and group [...] Right. > I *think* it has to be a fixed ID, as we'll be persisting pmlogger > logs, etc with this UID/GID. [...] (I don't see why. Files transferred between systems do not need to preserve their numerical uid/gid's.) > - when running in daemon modes, all of pmcd, pmlogger, pmie & > pmproxy run their main loop as user "pcp" (maybe pmproxy is > ok to stay as user "nobody"? could go either way I guess) OK. > - also via packaging trickery, recursively change ownership of > /var/log/pcp/pmlogger/ dirs [...] OK. > - adds __pmSetProcessIdentity() used by everyone (changes the > existing perl PMDAs to use it, uses it in pmcd & co too). Add > thread safety to the existing (perl wrapper) code while at it. > In the end, all callers use the same code to switch user. Can you elaborate upon this part of the model? How do you imagine the pmcd-invoked pmdas to be able to use it? If pmcd is fully unprivileged, then it can't seteuid back & forth between pcp and root / other users. (It should be fully unprivileged if at all possible.) So, we'd probably need a setuid-root helper program that launches pmdas. But then the pmdas themselves don't need to take action (in the form of that api call), since by the time they are invoked, they'd be already running at reduced appropriate privilege. > - adds a "forced_restart" variable to pmdaproc.sh which allows > an agent to request pmcd be restarted rather than SIGHUP'd when > it is ./Install'd. [...] If you have a setuid wrapper program for launching non-pcp pmdas, that wrapper could have a SIGHUP-sending mode. > - adds -U to all daemons so that root could be gone > back to temporarily, easily, if theres some problem or maybe if > someone wants some other unusual setup. How would this be used? root invoking modified initscripts? (An unprivileged user running "new_pmcd -U root" mustn't work :-) - FChE From nscott@redhat.com Tue Nov 6 17:10:46 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA6NAkM4098035 for ; Tue, 6 Nov 2012 17:10:46 -0600 X-ASG-Debug-ID: 1352243561-04cbb077b01ff50001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id vwxvM51dop77xvKK for ; Tue, 06 Nov 2012 15:12:42 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA6NCf1r026712 for ; Tue, 6 Nov 2012 18:12:41 -0500 Date: Tue, 6 Nov 2012 18:12:41 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <588191807.22545788.1352243561388.JavaMail.root@redhat.com> Subject: pcp updates: qa, pmdamysql MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa, pmdamysql Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.27] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352243562 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113484 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/709 | 24 ++++++++++++++++++++---- src/pmdas/mysql/pmdamysql.pl | 22 +++++++++++----------- 2 files changed, 31 insertions(+), 15 deletions(-) commit c22791ce0fb120d5d2e8c4b395853f93bd0a6c71 Author: Nathan Scott Date: Wed Nov 7 09:27:13 2012 +1100 Make qa/709 work for all CPU counts, after recent pmcollectl tweaks commit f9c3b191349ed67f30af6bb2336b21d0bd0626aa Author: Chandana De Silva Date: Sat Nov 3 17:39:13 2012 +1100 Corrections to pmdamysql metrics units From nscott@redhat.com Wed Nov 7 01:27:17 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,J_CHICKENPOX_64, J_CHICKENPOX_66,J_CHICKENPOX_71,J_CHICKENPOX_73,J_CHICKENPOX_74, LOCAL_GNU_PATCH autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA77RH8E130139 for ; Wed, 7 Nov 2012 01:27:17 -0600 X-ASG-Debug-ID: 1352273348-04bdf03f1f3ebe0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id eHB9ZG68OzqKulg0 for ; Tue, 06 Nov 2012 23:29:08 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA77T8AO024033; Wed, 7 Nov 2012 02:29:08 -0500 Date: Wed, 7 Nov 2012 02:29:08 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <1898649091.22795070.1352273348007.JavaMail.root@redhat.com> In-Reply-To: <1105026124.22792921.1352272029019.JavaMail.root@redhat.com> Subject: NSS/NSPR include file avoidance MIME-Version: 1.0 X-ASG-Orig-Subj: NSS/NSPR include file avoidance Content-Type: multipart/mixed; boundary="----=_Part_22795068_1417934599.1352273348001" X-Originating-IP: [10.64.50.40] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352273348 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113518 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ------=_Part_22795068_1417934599.1352273348001 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hi Dave, Following up on something we were discussing earlier, off-list, here's a patch which (I think) resolves the issue around adding explicit -I directives for NSS/NSPR to all PCP sources. This became particularly problematic once it started leaking out to the installed PMDA makefiles, because it means every existing PMDA "out there" would not build with the PCP release where the NSS/NSPR support was added. And probably any custom monitoring tools (hmm, yeah, including the pcp-gui tools). It turned out to be more difficult than I anticipated, as I did not initially pick up on the significance of the problem around the way different platforms install their headers into different places (nss/nss3 and nspr/nspr4). Anyway, happily, it seems resolvable. This patch should apply to git://sourceware.org/git/pcpfans.git brolley/nssmerge branch. It uses the old C trick of forward declaring a struct and then only using pointers to it in publicly visible places, for those types which need to switch depending on whether NSS/NSPR in use *and* which need to know details from the NSS/NSPR header files. The pmcd and pmproxy Client structures were a bit problematic as they try really hard to allocate their per-client structures in a single contiguous allocation (and over-allocate), so having a second-level pointer really didn't fit into that model. Solved with another dodgey C trick, using a zero-length char array for the inaddr struct (at the end of the Client struct). There's also a little tweak around the IPC table (was needed to keep all NSS/NSPR type usage within the ausconnect.c isolation chamber). Compile tested only at this stage ... keen to hear your thoughts on this approach though & any review comments you might have on this patch. Thanks! cheers. -- Nathan configure.in | 116 ++++++------ qa/src/chkacc1.c | 11 - qa/src/chkacc2.c | 10 - qa/src/chkacc3.c | 13 - src/include/builddefs.in | 10 - src/include/pcp/impl.h | 64 ++---- src/include/pcp/platform_header.h.in | 3 src/libpcp/src/GNUmakefile | 9 src/libpcp/src/access.c | 26 +- src/libpcp/src/auxconnect.c | 328 +++++++++++++++++++++-------------- src/libpcp/src/ipc.c | 29 +-- src/libpcp/src/logconnect.c | 28 +- src/libpcp_gui/src/timeclient.c | 15 + src/libpcp_pmcd/src/client.c | 12 - src/libpcp_pmda/src/open.c | 19 +- src/perl/PMDA/local.c | 41 ++-- src/pmcd/src/client.c | 21 +- src/pmcd/src/client.h | 4 src/pmcd/src/config.c | 34 ++- src/pmcd/src/pmcd.c | 21 +- src/pmlogger/ports.c | 56 +++-- src/pmproxy/client.c | 30 ++- src/pmproxy/pmproxy.c | 18 + src/pmproxy/pmproxy.h | 2 24 files changed, 535 insertions(+), 385 deletions(-) ------=_Part_22795068_1417934599.1352273348001 Content-Type: text/x-patch; name=nssmerge2.patch Content-Disposition: attachment; filename=nssmerge2.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5pbiBiL2NvbmZpZ3VyZS5pbgppbmRleCAzMDYxZmNiLi41 ODE2NjUwIDEwMDY0NAotLS0gYS9jb25maWd1cmUuaW4KKysrIGIvY29uZmlndXJlLmluCkBAIC0z NSw2ICszNSwxMyBAQCBBQ19BUkdfV0lUSCgKICAgICBbZG9fdGhyZWFkcz0kd2l0aHZhbF0sCiAg ICAgW2RvX3RocmVhZHM9Y2hlY2tdKQogCitBQ19BUkdfV0lUSCgKKyAgICBbc2VjdXJlLXNvY2tl dHNdLAorICAgIFtBQ19IRUxQX1NUUklORyhbLS13aXRoLXNlY3VyZS1zb2NrZXRzXSwKKwkJICAg IFtlbmFibGUgc3VwcG9ydCBmb3Igc2VjdXJlIHNvY2tldHMgKGRlZmF1bHQgaXMgb24pXSldLAor ICAgIFtkb19zZWN1cmU9JHdpdGh2YWxdLAorICAgIFtkb19zZWN1cmU9Y2hlY2tdKQorCiAjCiAj IE5vdGU6IHRoZSBmb2xsb3dpbmcgZW52aXJvbm1lbnQgdmFyaWFibGVzIG1heSBiZQogIyBzZXQg dG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHRzLgpAQCAtMTgyNSw3MCArMTgzMiw2MyBAQCB0aGVuCiAJ XSwgQUNfREVGSU5FKEhBVkVfRk5ERUxBWSkgQUNfTVNHX1JFU1VMVCh5ZXMpICwgQUNfTVNHX1JF U1VMVChubykpCiBmaQogCi1kbmwgY2hlY2sgZm9yIE5TUy9OU1BSCi1BQ19BUkdfV0lUSChbbnNz XSwKLSAgQVNfSEVMUF9TVFJJTkcoWy0td2l0aG91dC1uc3NdLAotICAgIFtEbyBub3QgdXNlIE5T UyBldmVuIGlmIHByZXNlbnRdKSkKLQotaGF2ZV9uc3M9bm8KLW5zc19pbmNmbGFncz0KLW5zcHJf aW5jZmxhZ3M9Ci1saWJfZm9yX25zcz0KLWxpYl9mb3JfbnNwcj0KLW5zc19pbmNfZGlyPQotbnNw cl9pbmNfZGlyPQotaWYgdGVzdCAieCR3aXRoX25zcyIgIT0gInhubyIKK2RubCBDaGVjayBmb3Ig TmV0d29yayBTZWN1cml0eSBTZXJ2aWNlcworaWYgdGVzdCAiJGRvX3NlY3VyZSIgPSAiY2hlY2si IC1vICIkZG9fc2VjdXJlIiA9ICJ5ZXMiCiB0aGVuCi0gICAgQUNfQ0hFQ0tfRklMRShbL3Vzci9p bmNsdWRlL25zczNdLCBuc3NkaXI9bnNzMywgWwotICAgICAgICBBQ19DSEVDS19GSUxFKFsvdXNy L2luY2x1ZGUvbnNzXSwgbnNzZGlyPW5zcykKKyAgICBlbmFibGVfc2VjdXJlPXRydWUKKworICAg IHNhdmVkX0NGTEFHUz0iJENGTEFHUyIKKyAgICBDRkxBR1M9IiRDRkxBR1MgLUkvdXNyL2luY2x1 ZGUvbnNzIC1JL3Vzci9pbmNsdWRlL25zczMiCisgICAgQ0ZMQUdTPSIkQ0ZMQUdTIC1JL3Vzci9p bmNsdWRlL25zcHIgLUkvdXNyL2luY2x1ZGUvbnNwcjQiCisgICAgQUNfQ0hFQ0tfSEVBREVSUyhb bnNzL25zcy5oXSwgW25zc19pbmNfZGlyPS91c3IvaW5jbHVkZS9uc3NdLCBbCisJQUNfQ0hFQ0tf SEVBREVSUyhbbnNzMy9uc3MuaF0sIFtuc3NfaW5jX2Rpcj0vdXNyL2luY2x1ZGUvbnNzM10sIFsK KwkgICAgZW5hYmxlX3NlY3VyZT1mYWxzZQorCSAgICBpZiB0ZXN0ICIkZG9fc2VjdXJlIiA9ICJ5 ZXMiCisJICAgIHRoZW4KKwkJQUNfTVNHX0VSUk9SKGNhbm5vdCBlbmFibGUgc2VjdXJlIHNvY2tl dHMgbW9kZSAtIG5vIE5TUyBoZWFkZXIpCisJICAgIGZpCisJXSkKICAgICBdKQotICAgIEFDX0NI RUNLX0ZJTEUoWy91c3IvaW5jbHVkZS9uc3ByNF0sIG5zcHJkaXI9bnNwcjQsIFsKLSAgICAgICAg QUNfQ0hFQ0tfRklMRShbL3Vzci9pbmNsdWRlL25zcHJdLCBuc3ByZGlyPW5zcHIpCisgICAgQUNf Q0hFQ0tfSEVBREVSUyhbbnNwci9uc3ByLmhdLCBbbnNwcl9pbmNfZGlyPS91c3IvaW5jbHVkZS9u c3ByXSwgWworCUFDX0NIRUNLX0hFQURFUlMoW25zcHI0L25zcHIuaF0sIFtuc3ByX2luY19kaXI9 L3Vzci9pbmNsdWRlL25zcHI0XSwgWworCSAgICBlbmFibGVfc2VjdXJlPWZhbHNlCisJICAgIGlm IHRlc3QgIiRkb19zZWN1cmUiID0gInllcyIKKwkgICAgdGhlbgorCQlBQ19NU0dfRVJST1IoY2Fu bm90IGVuYWJsZSBzZWN1cmUgc29ja2V0cyBtb2RlIC0gbm8gTlNQUiBoZWFkZXIpCisJICAgIGZp CisJXSkKICAgICBdKQotICAgIGlmIHRlc3QgIngkbnNzZGlyIiAhPSAieCIgLWEgIngkbnNwcmRp ciIgIT0gIngiCi0gICAgdGhlbgotICAgICAgICBuc3NfaW5jX2Rpcj0vdXNyL2luY2x1ZGUvJG5z c2RpcgotCW5zcHJfaW5jX2Rpcj0vdXNyL2luY2x1ZGUvJG5zcHJkaXIKLSAgICAgICAgbnNzX2lu Y2ZsYWdzPSItSSRuc3NfaW5jX2RpciIKLSAgICAgICAgbnNwcl9pbmNmbGFncz0iLUkkbnNwcl9p bmNfZGlyIgotCXNhdmVfQ1BQRkxBR1M9IiRDUFBGTEFHUyIKLSAgICAgICAgQ1BQRkxBR1M9IiRp bmNmbGFncyAkbnNzX2luY2ZsYWdzICRuc3ByX2luY2ZsYWdzIgotICAgICAgICBoYXZlX25zc19p bmNsdWRlcz15ZXMKLSAgICAgICAgQUNfQ0hFQ0tfSEVBREVSUyhbIiRuc3NkaXIvbnNzLmgiICIk bnNwcmRpci9uc3ByLmgiXSwgW10sIGhhdmVfbnNzX2luY2x1ZGVzPW5vKQotICAgICAgICBDUFBG TEFHUz0iJHNhdmVfQ1BQRkxBR1MiCi0gICAgICAgIGhhdmVfbnNzX2xpYnM9bm8KLSAgICAgICAg QUNfQ0hFQ0tfTElCKCRuc3NkaXIsIE5TU19Jbml0LCBbCi0gICAgICAgICAgICBBQ19DSEVDS19M SUIoJG5zcHJkaXIsIFBSX0luaXQsIGhhdmVfbnNzX2xpYnM9eWVzKQotICAgICAgICBdKQotICAg IGZpCi0gICAgaWYgdGVzdCAieCR7aGF2ZV9uc3NfaW5jbHVkZXN9JHtoYXZlX25zc19saWJzfSIg PSAieHllc3llcyIKKyAgICBBQ19TVUJTVChuc3ByX2luY19kaXIpCisgICAgQUNfU1VCU1QobnNz X2luY19kaXIpCisKKyAgICBBQ19DSEVDS19MSUIobnNzLCBOU1NfSW5pdCwgW2xpYl9mb3JfbnNz PSItbG5zcyJdLCBbCisJQUNfQ0hFQ0tfTElCKG5zczMsIE5TU19Jbml0LCBbbGliX2Zvcl9uc3M9 Ii1sbnNzMyJdLCBbCisJICAgIGVuYWJsZV9zZWN1cmU9ZmFsc2UKKwkgICAgaWYgdGVzdCAiJGRv X3NlY3VyZSIgPSAieWVzIgorCSAgICB0aGVuCisJCUFDX01TR19FUlJPUihjYW5ub3QgZW5hYmxl IHNlY3VyZSBzb2NrZXRzIG1vZGUgLSBubyBOU1MgbGlicmFyeSkKKwkgICAgZmkKKwldKQorICAg IF0pCisgICAgQUNfU1VCU1QobGliX2Zvcl9uc3MpCisKKyAgICBBQ19DSEVDS19MSUIobnNwciwg UFJfSW5pdCwgW2xpYl9mb3JfbnNwcj0iLWxuc3ByIl0sIFsKKwlBQ19DSEVDS19MSUIobnNwcjQs IFBSX0luaXQsIFtsaWJfZm9yX25zcHI9Ii1sbnNwcjQiXSwgWworCSAgICBlbmFibGVfc2VjdXJl PWZhbHNlCisJICAgIGlmIHRlc3QgIiRkb19zZWN1cmUiID0gInllcyIKKwkgICAgdGhlbgorCQlB Q19NU0dfRVJST1IoY2Fubm90IGVuYWJsZSBzZWN1cmUgc29ja2V0cyBtb2RlIC0gbm8gTlNQUiBs aWJyYXJ5KQorCSAgICBmaQorCV0pCisgICAgXSkKKyAgICBBQ19TVUJTVChsaWJfZm9yX25zcHIp CisKKyAgICBpZiB0ZXN0ICIkZW5hYmxlX3NlY3VyZSIgPSAidHJ1ZSIKICAgICB0aGVuCi0gICAg ICAgIGhhdmVfbnNzPXllcwotICAgICAgICAgICBlbHNlCi0gICAgICAgIGlmIHRlc3QgIngke2hh dmVfbnNzX2luY2x1ZGVzfSIgIT0gInh5ZXMiCi0JdGhlbgotCSAgICBBQ19NU0dfV0FSTihbTlNT IEhlYWRlcnMgbm90IGZvdW5kXSkKLQlmaQotICAgICAgICBpZiB0ZXN0ICJ4JHtoYXZlX25zc19s aWJzfSIgIT0gInh5ZXMiCi0JdGhlbgotCSAgICBBQ19NU0dfV0FSTihbTlNTIExpYnJhcmllcyBu b3QgZm91bmRdKQotCWZpCisJQUNfREVGSU5FKEhBVkVfU0VDVVJFX1NPQ0tFVFMpCiAgICAgZmkK KyAgICBDRkxBR1M9IiRzYXZlZF9DRkxBR1MiCiBmaQotaWYgdGVzdCAkaGF2ZV9uc3MgPSB5ZXMK LXRoZW4KLSAgICBsaWJfZm9yX25zcz0tbCRuc3NkaXIKLSAgICBsaWJfZm9yX25zcHI9LWwkbnNw cmRpcgotICAgIEFDX0RFRklORShIQVZFX05TUykKLWZpCi1BQ19TVUJTVChuc3NfaW5jZmxhZ3Mp Ci1BQ19TVUJTVChuc3ByX2luY2ZsYWdzKQotQUNfU1VCU1QobGliX2Zvcl9uc3MpCi1BQ19TVUJT VChsaWJfZm9yX25zcHIpCi1wY3BfbnNzX2luY19kaXI9YGV2YWwgZWNobyAkbnNzX2luY19kaXJg Ci1BQ19TVUJTVChwY3BfbnNzX2luY19kaXIpCi1wY3BfbnNwcl9pbmNfZGlyPWBldmFsIGVjaG8g JG5zcHJfaW5jX2RpcmAKLUFDX1NVQlNUKHBjcF9uc3ByX2luY19kaXIpCiAKIGRubCBjaGVjayBm b3IgYXJyYXkgc2Vzc2lvbnMKIGlmIHRlc3QgLWYgL3Vzci9pbmNsdWRlL3NuL2Fyc2Vzcy5oCmRp ZmYgLS1naXQgYS9xYS9zcmMvY2hrYWNjMS5jIGIvcWEvc3JjL2Noa2FjYzEuYwppbmRleCA4NDhj MWRlLi40ZDFkZTJlIDEwMDY0NAotLS0gYS9xYS9zcmMvY2hrYWNjMS5jCisrKyBiL3FhL3NyYy9j aGthY2MxLmMKQEAgLTEyLDcgKzEyLDcgQEAgbWFpbigpCiAgICAgaW50CQkJcywgc3RzLCBvcCwg aG9zdDsKICAgICB1bnNpZ25lZCBpbnQJaTsKICAgICBjaGFyCQluYW1lWzIwXTsKLSAgICBfX3Bt SW5BZGRyCQlpbmFkZHI7CisgICAgc3RydWN0IF9fcG1JbkFkZHIJKmluYWRkcjsKICAgICBfX3Bt SVBBZGRyCQlpcGFkZHI7CiAKICAgICBzdHMgPSAwOwpAQCAtMzIsNyArMzIsNyBAQCBtYWluKCkK ICAgICBmb3IgKGhvc3QgPSAwOyBob3N0IDwgV09SRF9CSVQ7IGhvc3QrKykgewogCXNwcmludGYo bmFtZSwgIjE1NS4lZC4lZC4lZCIsIGhvc3QgKiAzLCAxNytob3N0LCBob3N0KTsKIAlpZiAoKHMg PSBfX3BtQWNjQWRkSG9zdChuYW1lLCAxIDw8IGhvc3QsIDEgPDwgaG9zdCwgMCkpIDwgMCkgewot CSAgICBwcmludGYoImNhbnQndCBhZGQgaG9zdCBmb3Igb3AlZDogJXNcbiIsIGhvc3QsIHN0cmVy cm9yKHMpKTsKKwkgICAgcHJpbnRmKCJjYW5ub3QgYWRkIGhvc3QgZm9yIG9wJWQ6ICVzXG4iLCBo b3N0LCBzdHJlcnJvcihzKSk7CiAJICAgIHN0cyA9IHM7CiAJfQogICAgIH0KQEAgLTQyLDExICs0 MiwxMyBAQCBtYWluKCkKICAgICBwdXRjKCdcbicsIHN0ZGVycik7CiAgICAgX19wbUFjY0R1bXBI b3N0cyhzdGRlcnIpOwogCisgICAgaW5hZGRyID0gX19wbUFsbG9jSW5BZGRyKCk7CiAgICAgZm9y IChob3N0ID0gMDsgaG9zdCA8IFdPUkRfQklUOyBob3N0KyspIHsKIAljaGFyCWJ1ZlsyMF07CisK IAlzcHJpbnRmKGJ1ZiwgIiVkLiVkLiVkLiVkIiwgMTU1LCBob3N0ICogMywgMTcraG9zdCwgaG9z dCk7Ci0JX19wbVN0cmluZ1RvSW5BZGRyKGJ1ZiwgJmluYWRkcik7Ci0JaXBhZGRyID0gX19wbUlu QWRkclRvSVBBZGRyKCZpbmFkZHIpOworCV9fcG1TdHJpbmdUb0luQWRkcihidWYsIGluYWRkcik7 CisJaXBhZGRyID0gX19wbUluQWRkclRvSVBBZGRyKGluYWRkcik7CiAJc3RzID0gX19wbUFjY0Fk ZENsaWVudChpcGFkZHIsICZpKTsKIAlpZiAoc3RzIDwgMCkgewogCSAgICBwcmludGYoImFkZCBj bGllbnQgZnJvbSBob3N0ICVkOiAlc1xuIiwgaG9zdCwgcG1FcnJTdHIoc3RzKSk7CkBAIC01Nyw2 ICs1OSw3IEBAIG1haW4oKQogCQkgICBob3N0LCBpLCAxIDw8IGhvc3QpOwogCSAgICAKICAgICB9 CisgICAgX19wbUZyZWVJbkFkZHIoaW5hZGRyKTsKICAgICAKICAgICBwdXRjKCdcbicsIHN0ZGVy cik7CiAgICAgX19wbUFjY0R1bXBIb3N0cyhzdGRlcnIpOwpkaWZmIC0tZ2l0IGEvcWEvc3JjL2No a2FjYzIuYyBiL3FhL3NyYy9jaGthY2MyLmMKaW5kZXggNzIwMTNkMS4uZDc5YjcyMyAxMDA2NDQK LS0tIGEvcWEvc3JjL2Noa2FjYzIuYworKysgYi9xYS9zcmMvY2hrYWNjMi5jCkBAIC0xNiw3ICsx Niw3IEBAIG1haW4oKQogICAgIGludAkJCXMsIHN0cywgb3AsIGhvc3Q7CiAgICAgdW5zaWduZWQg aW50CWk7CiAgICAgY2hhcgkJbmFtZVsyMF07Ci0gICAgX19wbUluQWRkcgkJaW5hZGRyOworICAg IHN0cnVjdCBfX3BtSW5BZGRyCSppbmFkZHI7CiAgICAgX19wbUlQQWRkcgkJaXBhZGRyOwogCiAg ICAgc3RzID0gMDsKQEAgLTMyLDcgKzMyLDcgQEAgbWFpbigpCiAgICAgZm9yIChob3N0ID0gMDsg aG9zdCA8IFdPUkRfQklUOyBob3N0KyspIHsKIAlzcHJpbnRmKG5hbWUsICIxNTUuJWQuJWQuJWQi LCBob3N0ICogMywgMTcraG9zdCwgaG9zdCk7CiAJaWYgKChzID0gX19wbUFjY0FkZEhvc3QobmFt ZSwgfigxIDw8IGhvc3QpLCB+KDEgPDwgaG9zdCksIGhvc3QpKSA8IDApIHsKLQkgICAgcHJpbnRm KCJjYW50J3QgYWRkIGhvc3QgZm9yIG9wJWQ6ICVzXG4iLCBob3N0LCBzdHJlcnJvcihzKSk7CisJ ICAgIHByaW50ZigiY2Fubm90IGFkZCBob3N0IGZvciBvcCVkOiAlc1xuIiwgaG9zdCwgc3RyZXJy b3IocykpOwogCSAgICBzdHMgPSBzOwogCX0KICAgICB9CkBAIC00MiwxNCArNDIsMTUgQEAgbWFp bigpCiAgICAgcHV0YygnXG4nLCBzdGRlcnIpOwogICAgIF9fcG1BY2NEdW1wSG9zdHMoc3RkZXJy KTsKIAorICAgIGluYWRkciA9IF9fcG1BbGxvY0luQWRkcigpOwogICAgIGZvciAoaG9zdCA9IDA7 IGhvc3QgPCBXT1JEX0JJVDsgaG9zdCsrKSB7CiAJaW50CWo7CiAKIAlmb3IgKGogPSAwOyBqIDw9 IGhvc3Q7IGorKykgewogCSAgICBjaGFyCWJ1ZlsyMF07CiAJICAgIHNwcmludGYoYnVmLCAiJWQu JWQuJWQuJWQiLCAxNTUsIGhvc3QgKiAzLCAxNytob3N0LCBob3N0KTsKLQkgICAgX19wbVN0cmlu Z1RvSW5BZGRyKGJ1ZiwgJmluYWRkcik7Ci0JICAgIGlwYWRkciA9IF9fcG1JbkFkZHJUb0lQQWRk cigmaW5hZGRyKTsKKwkgICAgX19wbVN0cmluZ1RvSW5BZGRyKGJ1ZiwgaW5hZGRyKTsKKwkgICAg aXBhZGRyID0gX19wbUluQWRkclRvSVBBZGRyKGluYWRkcik7CiAJICAgIHN0cyA9IF9fcG1BY2NB ZGRDbGllbnQoaXBhZGRyLCAmaSk7CiAJICAgIGlmIChzdHMgPCAwKSB7CiAJCWlmIChqID09IGhv c3QgJiYgc3RzID09IFBNX0VSUl9DT05OTElNSVQpCkBAIC02Myw2ICs2NCw3IEBAIG1haW4oKQog CQkgICAgICAgaG9zdCwgaSwgfigxIDw8IGhvc3QpKTsKIAl9CiAgICAgfQorICAgIF9fcG1GcmVl SW5BZGRyKGluYWRkcik7CiAKICAgICBwdXRjKCdcbicsIHN0ZGVycik7CiAgICAgX19wbUFjY0R1 bXBIb3N0cyhzdGRlcnIpOwpkaWZmIC0tZ2l0IGEvcWEvc3JjL2Noa2FjYzMuYyBiL3FhL3NyYy9j aGthY2MzLmMKaW5kZXggOGU5YjVjMC4uZGNlNDk3NiAxMDA2NDQKLS0tIGEvcWEvc3JjL2Noa2Fj YzMuYworKysgYi9xYS9zcmMvY2hrYWNjMy5jCkBAIC0yMCw3ICsyMCw3IEBAIG1haW4oKQogICAg IHVuc2lnbmVkIGludAlwZXJtOwogICAgIGNoYXIJCW5hbWVbMjBdOwogICAgIGNoYXIJCSp3bmFt ZXNbNF0gPSB7ICIqIiwgIjM4LioiLCAiMzguMjAyLioiLCAiMzguMjAyLjE2LioiIH07Ci0gICAg X19wbUluQWRkcgkJaW5hZGRyOworICAgIHN0cnVjdCBfX3BtSW5BZGRyCSppbmFkZHI7CiAgICAg X19wbUlQQWRkcgkJaXBhZGRyOwogCiAgICAgLyogdGhlcmUgYXJlIDEwIG9wcyBudW1iZXJlZCBm cm9tIDAgdG8gOSAqLwpAQCAtNzMsNyArNzMsNyBAQCBtYWluKCkKICAgICAgKi8KICAgICBmb3Ig KGkgPSAwOyBpIDwgNDsgaSsrKSB7CiAJaWYgKChzID0gX19wbUFjY0FkZEhvc3Qod25hbWVzW2ld LCAweDMwMCwgKGkgPDwgOCksIDApKSA8IDApIHsKLQkgICAgZnByaW50ZihzdGRlcnIsICJjYW50 J3QgYWRkIGhvc3QgZm9yIG9wJWQ6ICVzXG4iLCBpLCBzdHJlcnJvcihzKSk7CisJICAgIGZwcmlu dGYoc3RkZXJyLCAiY2Fubm90IGFkZCBob3N0IGZvciBvcCVkOiAlc1xuIiwgaSwgc3RyZXJyb3Io cykpOwogCSAgICBzdHMgPSBzOwogCX0KICAgICB9CkBAIC04NCw2ICs4NCw4IEBAIG1haW4oKQog ICAgIF9fcG1BY2NEdW1wSG9zdHMoc3RkZXJyKTsKIAogICAgIHB1dGMoJ1xuJywgc3RkZXJyKTsK KyAgICBpbmFkZHIgPSBfX3BtQWxsb2NJbkFkZHIoKTsKKwogICAgIGZvciAoaSA9IDA7IGkgPCAy OyBpKyspCiAJZm9yIChhaSA9IDA7IGFpIDwgNDsgYWkrKykKIAkgICAgZm9yIChiaSA9IDA7IGJp IDwgNDsgYmkrKykKQEAgLTkyLDEwICs5NCwxMCBAQCBtYWluKCkKIAkJCWNoYXIJYnVmWzIwXTsK IAkJCWNoYXIgICAqaG9zdDsKIAkJCXNwcmludGYoYnVmLCAiJWQuJWQuJWQuJWQiLCBhW2FpXStp LCBiW2JpXStpLCBjW2NpXStpLCBkW2RpXStpKTsKLQkJCV9fcG1TdHJpbmdUb0luQWRkcihidWYs ICZpbmFkZHIpOwotCQkJaXBhZGRyID0gX19wbUluQWRkclRvSVBBZGRyKCZpbmFkZHIpOworCQkJ X19wbVN0cmluZ1RvSW5BZGRyKGJ1ZiwgaW5hZGRyKTsKKwkJCWlwYWRkciA9IF9fcG1JbkFkZHJU b0lQQWRkcihpbmFkZHIpOwogCQkJcyA9IF9fcG1BY2NBZGRDbGllbnQoaXBhZGRyLCAmcGVybSk7 Ci0JCQlob3N0ID0gX19wbUluQWRkclRvU3RyaW5nKCZpbmFkZHIpOworCQkJaG9zdCA9IF9fcG1J bkFkZHJUb1N0cmluZyhpbmFkZHIpOwogCQkJaWYgKHMgPCAwKSB7CiAJCQkgICAgZnByaW50Zihz dGRlcnIsICJmcm9tICVzIGVycm9yOiAlc1xuIiwgaG9zdCwgcG1FcnJTdHIocykpOwogCQkJICAg IGZyZWUoaG9zdCk7CkBAIC0xMDUsNSArMTA3LDYgQEAgbWFpbigpCiAJCQlmcmVlKGhvc3QpOwog CQkgICAgfQogICAgIAorICAgIF9fcG1GcmVlSW5BZGRyKGluYWRkcik7CiAgICAgZXhpdCgwKTsK IH0KZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2J1aWxkZGVmcy5pbiBiL3NyYy9pbmNsdWRlL2J1 aWxkZGVmcy5pbgppbmRleCBhMWFhMmVlLi45MzcwZmRjIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVk ZS9idWlsZGRlZnMuaW4KKysrIGIvc3JjL2luY2x1ZGUvYnVpbGRkZWZzLmluCkBAIC0xMDksMjMg KzEwOSwyMyBAQCBpZmVxICIkKFRBUkdFVF9PUykiICJmcmVlYnNkIgogRFNPU1VGRklYID0gc28K IGVuZGlmCiAKLU5TU19DRkxBR1MgPSBAbnNzX2luY2ZsYWdzQAotTlNQUl9DRkxBR1MgPSBAbnNw cl9pbmNmbGFnc0AKLQogQ0ZMQUdTX0FCSSA9IEBjZmxhZ3NfYWJpQAogQ0ZMQUdTICs9ICQoQ0ZM QUdTX0FCSSkgJChQQ0ZMQUdTKSAkKExDRkxBR1MpICQoV0FSTl9PRkYpIC1PMiAtZyAtRFBDUF9E RUJVRyBcCiAJLURQQ1BfVkVSU0lPTj1cIiQoUENQX1ZFUlNJT04pXCIgXAotCS1JJChUT1BESVIp L3NyYy9pbmNsdWRlIC1JJChUT1BESVIpL3NyYy9pbmNsdWRlL3BjcCAkKE5TU19DRkxBR1MpICQo TlNQUl9DRkxBR1MpCisJLUkkKFRPUERJUikvc3JjL2luY2x1ZGUgLUkkKFRPUERJUikvc3JjL2lu Y2x1ZGUvcGNwCiAKIFBJRUNGTEFHUyA9IEBQSUVDRkxBR1NACiBQSUVMREZMQUdTID0gQFBJRUxE RkxBR1NACiAKK05TU0NGTEFHUyA9IC1JQG5zc19pbmNfZGlyQAorTlNQUkNGTEFHUyA9IC1JQG5z cHJfaW5jX2RpckAKKwogTERGTEFHUyArPSAkKENGTEFHU19BQkkpICQoUExERkxBR1MpICQoV0FS Tl9PRkYpICQoUENQX0xJQlMpICQoTExERkxBR1MpCiAKIFNSQ0ZJTEVTID0gR05VbWFrZWZpbGUg JChIRklMRVMpICQoQ0ZJTEVTKSAkKE1GSUxFUykgXAogCSQoTFNSQ0ZJTEVTKSAkKExGSUxFUykg JChZRklMRVMpICQoUFlGSUxFUykKIAotTERMSUJTID0gJChMTERMSUJTKSAkKFBMRExJQlMpICQo TElCX0ZPUl9OU1MpICQoTElCX0ZPUl9OU1BSKQorTERMSUJTID0gJChMTERMSUJTKSAkKFBMRExJ QlMpCiBNQUtFT1BUUyA9IC0tbm8tcHJpbnQtZGlyZWN0b3J5CiBESVJUID0gJChMRElSVCkgZGVw IGRlcC5iYWsgJChPQkpFQ1RTKSAkKENNRFRBUkdFVCkgXAogCSQoTElCVEFSR0VUKSAkKFNUQVRJ Q0xJQlRBUkdFVCkgXApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvcGNwL2ltcGwuaCBiL3NyYy9p bmNsdWRlL3BjcC9pbXBsLmgKaW5kZXggYzhjMzY1Yi4uYmQwODBhMiAxMDA2NDQKLS0tIGEvc3Jj L2luY2x1ZGUvcGNwL2ltcGwuaAorKysgYi9zcmMvaW5jbHVkZS9wY3AvaW1wbC5oCkBAIC01Mywx NCArNTMsNiBAQAogI2luY2x1ZGUgPHB0aHJlYWQuaD4KICNlbmRpZgogCi0vKgotICogTmV0d29y ayBTZWN1cml0eSBTZXJ2aWNlcyAoTlNTKSBzdXBwb3J0Ci0gKi8KLSNpZiBkZWZpbmVkKEhBVkVf TlNTKQotI2luY2x1ZGUgPG5zcHIuaD4KLSNpbmNsdWRlIDxwcml2YXRlL3BwcmlvLmg+Ci0jZW5k aWYKLQogI2lmZGVmIF9fY3BsdXNwbHVzCiBleHRlcm4gIkMiIHsKICNlbmRpZgpAQCAtNDk3LDcg KzQ4OSw2IEBAIHR5cGVkZWYgc3RydWN0IHsKICAgICBpbnQJCQlwY190aW1lb3V0OwkvKiBzZXQg aWYgY29ubmVjdCB0aW1lcyBvdXQgKi8KICAgICBpbnQJCQlwY190b3V0X3NlYzsJLyogdGltZW91 dCBmb3IgX19wbUdldFBEVSAqLwogICAgIHRpbWVfdAkJcGNfYWdhaW47CS8qIHRpbWUgdG8gdHJ5 IGFnYWluICovCi0gICAgc3RydWN0IHNvY2thZGRyCXBjX2FkZHI7CS8qIHNlcnZlciBhZGRyZXNz ICovCiB9IF9fcG1QTUNEQ3RsOwogCiBleHRlcm4gaW50IF9fcG1Db25uZWN0UE1DRChwbUhvc3RT cGVjICosIGludCk7CkBAIC01MTAsMjYgKzUwMSwyMSBAQCBleHRlcm4gdm9pZCBfX3BtRHJvcEhv c3RQb3J0KHBtSG9zdFNwZWMgKik7CiBleHRlcm4gdm9pZCBfX3BtQ29ubmVjdEdldFBvcnRzKHBt SG9zdFNwZWMgKik7CiAKIC8qIFNTTC9UTFMvSVB2NiBzdXBwb3J0IHZpYSBOU1MvTlNQUi4gKi8K LSNpZmRlZiBIQVZFX05TUwotdHlwZWRlZiBQUk5ldEFkZHIgX19wbVNvY2tBZGRyOwotdHlwZWRl ZiBQUk5ldEFkZHIgX19wbVNvY2tBZGRySW47Ci10eXBlZGVmIFBSTmV0QWRkciBfX3BtSW5BZGRy OworI2lmZGVmIEhBVkVfU0VDVVJFX1NPQ0tFVFMKIHR5cGVkZWYgdW5zaWduZWQgbG9uZyBfX3Bt SVBBZGRyOwotdHlwZWRlZiBQUkhvc3RFbnQgX19wbUhvc3RFbnQ7CiB0eXBlZGVmIHN0cnVjdCB7 CiAgICAgZmRfc2V0CQluYXRpdmVfc2V0OwogICAgIGZkX3NldAkJbnNwcl9zZXQ7CiAgICAgaW50 CQkJbnVtX25hdGl2ZV9mZHM7CiAgICAgaW50CQkJbnVtX25zcHJfZmRzOwogfSBfX3BtRmRTZXQ7 Ci0jZWxzZSAvKiAhIEhBVkVfTlNTICovCi10eXBlZGVmIHN0cnVjdCBzb2NrYWRkciBfX3BtU29j a0FkZHI7Ci10eXBlZGVmIHN0cnVjdCBzb2NrYWRkcl9pbiBfX3BtU29ja0FkZHJJbjsKLXR5cGVk ZWYgc3RydWN0IGluX2FkZHIgX19wbUluQWRkcjsKKyNlbHNlCiB0eXBlZGVmIHVuc2lnbmVkIGlu dCBfX3BtSVBBZGRyOwotdHlwZWRlZiBzdHJ1Y3QgaG9zdGVudCBfX3BtSG9zdEVudDsKIHR5cGVk ZWYgZmRfc2V0IF9fcG1GZFNldDsKICNlbmRpZgorc3RydWN0IF9fcG1JbkFkZHI7CitzdHJ1Y3Qg X19wbUhvc3RFbnQ7CitzdHJ1Y3QgX19wbVNvY2tBZGRySW47CiAKIGV4dGVybiBpbnQgX19wbUNy ZWF0ZVNvY2tldCh2b2lkKTsKIGV4dGVybiBpbnQgX19wbUluaXRTb2NrZXQoaW50KTsKQEAgLTU0 Myw3ICs1MjksNyBAQCBleHRlcm4gaW50IF9fcG1MaXN0ZW4oaW50LCBpbnQpOwogZXh0ZXJuIGlu dCBfX3BtQWNjZXB0KGludCwgdm9pZCAqLCBfX3BtU29ja0xlbiAqKTsKIGV4dGVybiBzc2l6ZV90 IF9fcG1TZW5kKGludCwgY29uc3Qgdm9pZCAqLCBzaXplX3QsIGludCk7CiBleHRlcm4gc3NpemVf dCBfX3BtUmVjdihpbnQsIHZvaWQgKiwgc2l6ZV90LCBpbnQpOwotZXh0ZXJuIGludCBfX3BtQ29u bmVjdFRvKGludCwgY29uc3QgX19wbVNvY2tBZGRySW4gKiwgaW50KTsKK2V4dGVybiBpbnQgX19w bUNvbm5lY3RUbyhpbnQsIGNvbnN0IHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqLCBpbnQpOwogZXh0 ZXJuIGludCBfX3BtQ29ubmVjdENoZWNrRXJyb3IoaW50KTsKIGV4dGVybiBpbnQgX19wbUNvbm5l Y3RSZXN0b3JlRmxhZ3MoaW50LCBpbnQpOwogZXh0ZXJuIGludCBfX3BtQ29ubmVjdEhhbmRzaGFr ZShpbnQpOwpAQCAtNTYxLDI3ICs1NDcsMzMgQEAgZXh0ZXJuIHZvaWQgX19wbUZEX0NPUFkoX19w bUZkU2V0ICosIGNvbnN0IF9fcG1GZFNldCAqKTsKIGV4dGVybiBpbnQgX19wbVNlbGVjdFJlYWQo aW50LCBfX3BtRmRTZXQgKiwgc3RydWN0IHRpbWV2YWwgKik7CiBleHRlcm4gaW50IF9fcG1TZWxl Y3RXcml0ZShpbnQsIF9fcG1GZFNldCAqLCBzdHJ1Y3QgdGltZXZhbCAqKTsKIAotZXh0ZXJuIHZv aWQgX19wbUluaXRTb2NrQWRkcihfX3BtU29ja0FkZHJJbiAqLCBpbnQsIGludCk7Ci1leHRlcm4g dm9pZCBfX3BtU2V0U29ja0FkZHIoX19wbVNvY2tBZGRySW4gKiwgX19wbUhvc3RFbnQgKik7Ci1l eHRlcm4gdm9pZCBfX3BtU2V0UG9ydChfX3BtU29ja0FkZHJJbiAqLCBpbnQpOworZXh0ZXJuIHN0 cnVjdCBfX3BtU29ja0FkZHJJbiAqX19wbUFsbG9jU29ja0FkZHJJbih2b2lkKTsKK2V4dGVybiBz aXplX3QgX19wbVNvY2tBZGRySW5TaXplKHZvaWQpOworZXh0ZXJuIHZvaWQgX19wbUZyZWVTb2Nr QWRkckluKHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqKTsKK2V4dGVybiB2b2lkIF9fcG1Jbml0U29j a0FkZHIoc3RydWN0IF9fcG1Tb2NrQWRkckluICosIGludCwgaW50KTsKK2V4dGVybiB2b2lkIF9f cG1TZXRTb2NrQWRkcihzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKiwgc3RydWN0IF9fcG1Ib3N0RW50 ICopOworZXh0ZXJuIHZvaWQgX19wbVNldFBvcnQoc3RydWN0IF9fcG1Tb2NrQWRkckluICosIGlu dCk7CiBleHRlcm4gdm9pZCBfX3BtU2V0SVBBZGRyIChfX3BtSVBBZGRyICosIHVuc2lnbmVkIGlu dCk7CiBleHRlcm4gX19wbUlQQWRkciAqX19wbU1hc2tJUEFkZHIoX19wbUlQQWRkciAqLCBjb25z dCBfX3BtSVBBZGRyICopOwogZXh0ZXJuIGludCBfX3BtQ29tcGFyZUlQQWRkciAoY29uc3QgX19w bUlQQWRkciAqLCBjb25zdCBfX3BtSVBBZGRyICopOwogZXh0ZXJuIGludCBfX3BtSVBBZGRySXNM b29wQmFjayhjb25zdCBfX3BtSVBBZGRyICopOwogZXh0ZXJuIF9fcG1JUEFkZHIgX19wbUxvb3Bi YWNrQWRkcmVzcyh2b2lkKTsKIAotZXh0ZXJuIF9fcG1JUEFkZHIgX19wbVNvY2tBZGRySW5Ub0lQ QWRkcihjb25zdCBfX3BtU29ja0FkZHJJbiAqKTsKLWV4dGVybiBfX3BtSVBBZGRyIF9fcG1JbkFk ZHJUb0lQQWRkcihjb25zdCBfX3BtSW5BZGRyICopOworZXh0ZXJuIHN0cnVjdCBfX3BtSW5BZGRy ICpfX3BtQWxsb2NJbkFkZHIodm9pZCk7CitleHRlcm4gdm9pZCBfX3BtRnJlZUluQWRkcihzdHJ1 Y3QgX19wbUluQWRkciAqKTsKK2V4dGVybiBfX3BtSVBBZGRyIF9fcG1Tb2NrQWRkckluVG9JUEFk ZHIoY29uc3Qgc3RydWN0IF9fcG1Tb2NrQWRkckluICopOworZXh0ZXJuIF9fcG1JUEFkZHIgX19w bUluQWRkclRvSVBBZGRyKGNvbnN0IHN0cnVjdCBfX3BtSW5BZGRyICopOwogZXh0ZXJuIGludCBf X3BtSVBBZGRyVG9JbnQoY29uc3QgX19wbUlQQWRkciAqKTsKLWV4dGVybiBjaGFyICpfX3BtSW5B ZGRyVG9TdHJpbmcoX19wbUluQWRkciAqKTsKLWV4dGVybiBjaGFyICpfX3BtU29ja0FkZHJJblRv U3RyaW5nKF9fcG1Tb2NrQWRkckluICopOwotZXh0ZXJuIGludCBfX3BtU3RyaW5nVG9JbkFkZHIo Y29uc3QgY2hhciAqLCBfX3BtSW5BZGRyICopOworZXh0ZXJuIGNoYXIgKl9fcG1JbkFkZHJUb1N0 cmluZyhzdHJ1Y3QgX19wbUluQWRkciAqKTsKK2V4dGVybiBjaGFyICpfX3BtU29ja0FkZHJJblRv U3RyaW5nKHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqKTsKK2V4dGVybiBpbnQgX19wbVN0cmluZ1Rv SW5BZGRyKGNvbnN0IGNoYXIgKiwgc3RydWN0IF9fcG1JbkFkZHIgKik7CiAKLWV4dGVybiBjaGFy ICpfX3BtQWxsb2NIb3N0RW50QnVmZmVyICh2b2lkKTsKLWV4dGVybiB2b2lkIF9fcG1GcmVlSG9z dEVudEJ1ZmZlciAoY2hhciAqKTsKLWV4dGVybiBfX3BtSG9zdEVudCAqX19wbUdldEhvc3RCeU5h bWUoY29uc3QgY2hhciAqLCBfX3BtSG9zdEVudCAqLCBjaGFyICopOwotZXh0ZXJuIF9fcG1Ib3N0 RW50ICpfX3BtR2V0SG9zdEJ5QWRkcihfX3BtU29ja0FkZHJJbiAqLCBfX3BtSG9zdEVudCAqLCBj aGFyICopOwotZXh0ZXJuIF9fcG1JUEFkZHIgX19wbUhvc3RFbnRHZXRJUEFkZHIoY29uc3QgX19w bUhvc3RFbnQgKiwgaW50KTsKK2V4dGVybiBzdHJ1Y3QgX19wbUhvc3RFbnQgKl9fcG1BbGxvY0hv c3RFbnQodm9pZCk7CitleHRlcm4gdm9pZCBfX3BtRnJlZUhvc3RFbnQoc3RydWN0IF9fcG1Ib3N0 RW50ICopOworZXh0ZXJuIGNoYXIgKl9fcG1Ib3N0RW50TmFtZShjb25zdCBzdHJ1Y3QgX19wbUhv c3RFbnQgKik7CitleHRlcm4gc3RydWN0IF9fcG1Ib3N0RW50ICpfX3BtR2V0SG9zdEJ5TmFtZShj b25zdCBjaGFyICosIHN0cnVjdCBfX3BtSG9zdEVudCAqKTsKK2V4dGVybiBzdHJ1Y3QgX19wbUhv c3RFbnQgKl9fcG1HZXRIb3N0QnlBZGRyKHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqLCBzdHJ1Y3Qg X19wbUhvc3RFbnQgKik7CitleHRlcm4gX19wbUlQQWRkciBfX3BtSG9zdEVudEdldElQQWRkcihj b25zdCBzdHJ1Y3QgX19wbUhvc3RFbnQgKiwgaW50KTsKIAogLyoKICAqIHBlciBjb250ZXh0IGNv bnRyb2xzIGZvciBhcmNoaXZlcyBhbmQgbG9ncwpAQCAtOTgzLDE2ICs5NzUsMTQgQEAgdHlwZWRl ZiBpbnQgKCpfX3BtQ29ubmVjdEhvc3RUeXBlKShpbnQsIGludCk7CiAKIGV4dGVybiBpbnQgX19w bVNldFNvY2tldElQQyhpbnQpOwogZXh0ZXJuIGludCBfX3BtU2V0VmVyc2lvbklQQyhpbnQsIGlu dCk7CitleHRlcm4gaW50IF9fcG1TZXREYXRhSVBDKGludCwgdm9pZCAqKTsKIGV4dGVybiBpbnQg X19wbUxhc3RWZXJzaW9uSVBDKCk7CiBleHRlcm4gaW50IF9fcG1WZXJzaW9uSVBDKGludCk7CiBl eHRlcm4gaW50IF9fcG1Tb2NrZXRJUEMoaW50KTsKK2V4dGVybiB2b2lkICpfX3BtRGF0YUlQQyhp bnQpOwogZXh0ZXJuIHZvaWQgX19wbU92ZXJyaWRlTGFzdEZkKGludCk7CiBleHRlcm4gdm9pZCBf X3BtUHJpbnRJUEModm9pZCk7CiBleHRlcm4gdm9pZCBfX3BtUmVzZXRJUEMoaW50KTsKLSNpZiBk ZWZpbmVkKEhBVkVfTlNTKQotZXh0ZXJuIGludCBfX3BtU2V0TlNQUkZkSVBDKGludCBmZCwgUFJG aWxlRGVzYyAqKTsKLWV4dGVybiBQUkZpbGVEZXNjICpfX3BtTlNQUkZkSVBDKGludCk7Ci0jZW5k aWYKIAogLyogc2FmZWx5IGluc2VydCBhbiBhdG9tIHZhbHVlIGludG8gYSBwbVZhbHVlICovCiBl eHRlcm4gaW50IF9fcG1TdHVmZlZhbHVlKGNvbnN0IHBtQXRvbVZhbHVlICosIHBtVmFsdWUgKiwg aW50KTsKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3BjcC9wbGF0Zm9ybV9oZWFkZXIuaC5pbiBi L3NyYy9pbmNsdWRlL3BjcC9wbGF0Zm9ybV9oZWFkZXIuaC5pbgppbmRleCAzZjI1YzhjLi5hNzkz NDJkIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9wY3AvcGxhdGZvcm1faGVhZGVyLmguaW4KKysr IGIvc3JjL2luY2x1ZGUvcGNwL3BsYXRmb3JtX2hlYWRlci5oLmluCkBAIC0xMzcsNyArMTM3LDYg QEAgZXh0ZXJuICJDIiB7CiAjdW5kZWYgSEFWRV9TWVNfRU5ESUFOX0gKICN1bmRlZiBIQVZFX1NZ U19NQUNISU5FX0gKICN1bmRlZiBIQVZFX01BQ0hJTkVfRU5ESUFOX0gKLSN1bmRlZiBIQVZFX1JF QURMSU5FCiAKICNpZiBkZWZpbmVkKEhBVkVfTUFMTE9DX0gpCiAjaW5jbHVkZSA8bWFsbG9jLmg+ CkBAIC0xOTAsNyArMTg5LDkgQEAgZXh0ZXJuICJDIiB7CiAjZW5kaWYKIAogLyogZGVmaW5lIHdo aWNoIGxpYnJhcmllcyBhcmUgYXZhaWxhYmxlICovCisjdW5kZWYgSEFWRV9TRUNVUkVfU09DS0VU UwogI3VuZGVmIEhBVkVfTElCUkVHRVgKKyN1bmRlZiBIQVZFX1JFQURMSU5FCiAKIC8qIGRlZmlu ZSB3aGljaCBsaWJjIGZ1bmN0aW9ucyBhcmUgYXZhaWxhYmxlICovCiAjdW5kZWYgSEFWRV9XQUlU MwpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9zcmMvR05VbWFrZWZpbGUgYi9zcmMvbGlicGNwL3Ny Yy9HTlVtYWtlZmlsZQppbmRleCAxOGFkYjg4Li41OTZmNjBkIDEwMDY0NAotLS0gYS9zcmMvbGli cGNwL3NyYy9HTlVtYWtlZmlsZQorKysgYi9zcmMvbGlicGNwL3NyYy9HTlVtYWtlZmlsZQpAQCAt NDksNiArNDksMTUgQEAgTExETElCUwkrPSAkKExJQl9GT1JfTUFUSCkgJChMSUJfRk9SX1BUSFJF QURTKQogTENGTEFHUyArPSAtRExJQlBDUF9JTlRFUk5BTCAnLURFWEVDX1NVRkZJWD0iJChFWEVD U1VGRklYKSInIFwKIAknLUREU09fU1VGRklYPSIkKERTT1NVRkZJWCkiJwogCitpZm5lcSAiJChM SUJfRk9SX05TUykiICIiCitMQ0ZMQUdTICs9ICQoTlNTQ0ZMQUdTKQorTExETElCUyArPSAkKExJ Ql9GT1JfTlNTKQorZW5kaWYKK2lmbmVxICIkKExJQl9GT1JfTlNQUikiICIiCitMQ0ZMQUdTICs9 ICQoTlNQUkNGTEFHUykKK0xMRExJQlMgKz0gJChMSUJfRk9SX05TUFIpCitlbmRpZgorCiBEU09W RVJTSU9OID0gMwogU1RBVElDTElCVEFSR0VUID0gbGlicGNwLmEKIExJQlRBUkdFVCA9IGxpYnBj cC4kKERTT1NVRkZJWCkuJChEU09WRVJTSU9OKQpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9zcmMv YWNjZXNzLmMgYi9zcmMvbGlicGNwL3NyYy9hY2Nlc3MuYwppbmRleCBlOTU0OTFjLi5lNzZjNzQ4 IDEwMDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9hY2Nlc3MuYworKysgYi9zcmMvbGlicGNwL3Ny Yy9hY2Nlc3MuYwpAQCAtODUsMjQgKzg1LDIzIEBAIHN0YXRpYyBjaGFyCQlteWhvc3RuYW1lW01B WEhPU1ROQU1FTEVOKzFdOwogc3RhdGljIGludAogZ2V0bXlob3N0aWQodm9pZCkKIHsKLSAgICBf X3BtSG9zdEVudAloZTsKLSAgICBjaGFyICpoZWJ1ZjsKKyAgICBzdHJ1Y3QgX19wbUhvc3RFbnQJ Kmhvc3Q7CiAKICAgICAodm9pZClnZXRob3N0bmFtZShteWhvc3RuYW1lLCBNQVhIT1NUTkFNRUxF Tik7CiAgICAgbXlob3N0bmFtZVtNQVhIT1NUTkFNRUxFTi0xXSA9ICdcMCc7CiAKKyAgICBob3N0 ID0gX19wbUFsbG9jSG9zdEVudCgpOwogICAgIFBNX0xPQ0soX19wbUxvY2tfbGlicGNwKTsKLSAg ICBoZWJ1ZiA9IF9fcG1BbGxvY0hvc3RFbnRCdWZmZXIoKTsKLSAgICBpZiAoX19wbUdldEhvc3RC eU5hbWUobXlob3N0bmFtZSwgJmhlLCBoZWJ1ZikgPT0gTlVMTCkgeworICAgIGlmIChfX3BtR2V0 SG9zdEJ5TmFtZShteWhvc3RuYW1lLCBob3N0KSA9PSBOVUxMKSB7CiAJX19wbU5vdGlmeUVycihM T0dfRVJSLCAiX19wbUdldEhvc3RCeU5hbWUoJXMpLCAlc1xuIiwKIAkJICAgICBteWhvc3RuYW1l LCBob3N0c3RyZXJyb3IoKSk7Ci0JX19wbUZyZWVIb3N0RW50QnVmZmVyKGhlYnVmKTsKIAlQTV9V TkxPQ0soX19wbUxvY2tfbGlicGNwKTsKKwlfX3BtRnJlZUhvc3RFbnQoaG9zdCk7CiAJcmV0dXJu IC0xOwogICAgIH0KLSAgICBteWhvc3RpZCA9IF9fcG1Ib3N0RW50R2V0SVBBZGRyKCZoZSwgMCk7 Ci0gICAgX19wbUZyZWVIb3N0RW50QnVmZmVyKGhlYnVmKTsKKyAgICBteWhvc3RpZCA9IF9fcG1I b3N0RW50R2V0SVBBZGRyKGhvc3QsIDApOwogICAgIFBNX1VOTE9DSyhfX3BtTG9ja19saWJwY3Ap OworICAgIF9fcG1GcmVlSG9zdEVudChob3N0KTsKICAgICBnb3RteWhvc3RpZCA9IDE7CiAgICAg cmV0dXJuIDA7CiB9CkBAIC0yMjgsOCArMjI3LDcgQEAgX19wbUFjY0FkZEhvc3QoY29uc3QgY2hh ciAqbmFtZSwgdW5zaWduZWQgaW50IHNwZWNPcHMsIHVuc2lnbmVkIGludCBkZW55T3BzLCBpbnQK ICAgICBzaXplX3QJCW5lZWQ7CiAgICAgaW50CQkJaSwgbiwgc3RzOwogICAgIHVuc2lnbmVkIGlu dAlpcCwgbWFzazsKLSAgICBfX3BtSG9zdEVudAkJaGU7Ci0gICAgY2hhciAqCQloZWJ1ZjsKKyAg ICBzdHJ1Y3QgX19wbUhvc3RFbnQJKmhvc3Q7CiAgICAgaW50CQkJbGV2ZWwgPSAwOwkvKiBXaWxk Y2FyZGluZyBsZXZlbCAqLwogICAgIF9fcG1JUEFkZHIJCWhvc3RpZCwgaG9zdG1hc2s7CiAgICAg Y29uc3QgY2hhcgkJKnA7CkBAIC0zMTEsMTkgKzMwOSwxOSBAQCBfX3BtQWNjQWRkSG9zdChjb25z dCBjaGFyICpuYW1lLCB1bnNpZ25lZCBpbnQgc3BlY09wcywgdW5zaWduZWQgaW50IGRlbnlPcHMs IGludAogCX0KIAllbHNlCiAJICAgIHJlYWxuYW1lID0gbmFtZTsKKwlob3N0ID0gX19wbUFsbG9j SG9zdEVudCgpOwogCVBNX0lOSVRfTE9DS1MoKTsKIAlQTV9MT0NLKF9fcG1Mb2NrX2xpYnBjcCk7 Ci0JaGVidWYgPSBfX3BtQWxsb2NIb3N0RW50QnVmZmVyKCk7Ci0JaWYgKF9fcG1HZXRIb3N0QnlO YW1lKHJlYWxuYW1lLCAmaGUsIGhlYnVmKSA9PSBOVUxMKSB7CisJaWYgKF9fcG1HZXRIb3N0QnlO YW1lKHJlYWxuYW1lLCBob3N0KSA9PSBOVUxMKSB7CiAJICAgIF9fcG1Ob3RpZnlFcnIoTE9HX0VS UiwgIl9fcG1HZXRIb3N0QnlOYW1lKCVzKSwgJXNcbiIsCiAJCQkgcmVhbG5hbWUsIGhvc3RzdHJl cnJvcigpKTsKLQkgICAgX19wbUZyZWVIb3N0RW50QnVmZmVyKGhlYnVmKTsKIAkgICAgUE1fVU5M T0NLKF9fcG1Mb2NrX2xpYnBjcCk7CisJICAgIF9fcG1GcmVlSG9zdEVudChob3N0KTsKIAkgICAg cmV0dXJuIC1FSE9TVFVOUkVBQ0g7CS8qIGhvc3QgZXJyb3IgdW5zdWl0YWJsZSB0byByZXR1cm4g Ki8KIAl9Ci0JaG9zdGlkID0gX19wbUhvc3RFbnRHZXRJUEFkZHIoJmhlLCAwKTsKLQlfX3BtRnJl ZUhvc3RFbnRCdWZmZXIoaGVidWYpOworCWhvc3RpZCA9IF9fcG1Ib3N0RW50R2V0SVBBZGRyKGhv c3QsIDApOwogCVBNX1VOTE9DSyhfX3BtTG9ja19saWJwY3ApOworCV9fcG1GcmVlSG9zdEVudCho b3N0KTsKIAlfX3BtU2V0SVBBZGRyKCZob3N0bWFzaywgMHhmZmZmZmZmZik7CiAJbGV2ZWwgPSAw OwogICAgIH0KZGlmZiAtLWdpdCBhL3NyYy9saWJwY3Avc3JjL2F1eGNvbm5lY3QuYyBiL3NyYy9s aWJwY3Avc3JjL2F1eGNvbm5lY3QuYwppbmRleCBiNjliYTU3Li43ODM4YmJjIDEwMDY0NAotLS0g YS9zcmMvbGlicGNwL3NyYy9hdXhjb25uZWN0LmMKKysrIGIvc3JjL2xpYnBjcC9zcmMvYXV4Y29u bmVjdC5jCkBAIC0xNSwxNSArMTUsODIgQEAKIAogI2luY2x1ZGUgInBtYXBpLmgiCiAjaW5jbHVk ZSAiaW1wbC5oIgotI2luY2x1ZGUgPGZjbnRsLmg+Ci0jaW5jbHVkZSA8YXNzZXJ0Lmg+Ci0jaWZk ZWYgSEFWRV9ORVRJTkVUX1RDUF9ICi0jaW5jbHVkZSA8bmV0aW5ldC90Y3AuaD4KKworLyoKKyAq IE5ldHdvcmsgU2VjdXJpdHkgU2VydmljZXMgKE5TUykgc3VwcG9ydAorICovCisjaWZkZWYgSEFW RV9TRUNVUkVfU09DS0VUUworI2luY2x1ZGUgPG5zcy5oPgorI2luY2x1ZGUgPG5zcHIuaD4KKyNp bmNsdWRlIDxwcml2YXRlL3BwcmlvLmg+CisKK3N0cnVjdCBfX3BtU29ja0FkZHJJbiB7CisgICAg UFJOZXRBZGRyCQlzb2NrYWRkcjsKK307CitzdHJ1Y3QgX19wbUluQWRkciB7CisgICAgUFJOZXRB ZGRyCQlpbmFkZHI7Cit9Oworc3RydWN0IF9fcG1Ib3N0RW50IHsKKyAgICBQUkhvc3RFbnQJCWhv c3RlbnQ7CisgICAgY2hhcgkJYnVmZmVyW1BSX05FVERCX0JVRl9TSVpFXTsKK307CisjZWxzZSAv KiAhIEhBVkVfU0VDVVJFX1NPQ0tFVFMgKi8KK3N0cnVjdCBfX3BtU29ja0FkZHJJbiB7CisgICAg c3RydWN0IHNvY2thZGRyX2luCXNvY2thZGRyOworfTsKK3N0cnVjdCBfX3BtSW5BZGRyIHsKKyAg ICBzdHJ1Y3QgaW5fYWRkcglpbmFkZHI7Cit9Oworc3RydWN0IF9fcG1Ib3N0RW50IHsKKyAgICBz dHJ1Y3QgaG9zdGVudAlob3N0ZW50OworfTsKICNlbmRpZgogCiAvKiBkZWZhdWx0IGNvbm5lY3Qg dGltZW91dCBpcyA1IHNlY29uZHMgKi8KIHN0YXRpYyBzdHJ1Y3QgdGltZXZhbAljYW53YWl0ID0g eyA1LCAwMDAwMDAgfTsKIAorc3RydWN0IF9fcG1Ib3N0RW50ICoKK19fcG1BbGxvY0hvc3RFbnQo dm9pZCkKK3sKKyAgICByZXR1cm4gbWFsbG9jKHNpemVvZihzdHJ1Y3QgX19wbUhvc3RFbnQpKTsK K30KKwordm9pZAorX19wbUZyZWVIb3N0RW50KHN0cnVjdCBfX3BtSG9zdEVudCAqaG9zdGVudCkK K3sKKyAgICBmcmVlKGhvc3RlbnQpOworfQorCitzdHJ1Y3QgX19wbUluQWRkciAqCitfX3BtQWxs b2NJbkFkZHIodm9pZCkKK3sKKyAgICByZXR1cm4gbWFsbG9jKHNpemVvZihzdHJ1Y3QgX19wbUlu QWRkcikpOworfQorCit2b2lkCitfX3BtRnJlZUluQWRkcihzdHJ1Y3QgX19wbUluQWRkciAqaW5h ZGRyKQoreworICAgIGZyZWUoaW5hZGRyKTsKK30KKworc3RydWN0IF9fcG1Tb2NrQWRkckluICoK K19fcG1BbGxvY1NvY2tBZGRySW4odm9pZCkKK3sKKyAgICByZXR1cm4gbWFsbG9jKHNpemVvZihz dHJ1Y3QgX19wbVNvY2tBZGRySW4pKTsKK30KKworc2l6ZV90CitfX3BtU29ja0FkZHJJblNpemUo dm9pZCkKK3sKKyAgICByZXR1cm4gc2l6ZW9mKHN0cnVjdCBfX3BtU29ja0FkZHJJbik7Cit9CisK K3ZvaWQKK19fcG1GcmVlU29ja0FkZHJJbihzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKnNvY2thZGRy KQoreworICAgIGZyZWUoc29ja2FkZHIpOworfQorCiBpbnQKIF9fcG1Jbml0U29ja2V0KGludCBm ZCkKIHsKQEAgLTU3LDEwICsxMjQsMTAgQEAgX19wbUluaXRTb2NrZXQoaW50IGZkKQogfQogCiBp bnQKLV9fcG1Db25uZWN0VG8oaW50IGZkLCBjb25zdCBfX3BtU29ja0FkZHJJbiAqYWRkciwgaW50 IHBvcnQpCitfX3BtQ29ubmVjdFRvKGludCBmZCwgY29uc3Qgc3RydWN0IF9fcG1Tb2NrQWRkcklu ICphZGRyLCBpbnQgcG9ydCkKIHsKICAgICBpbnQgc3RzLCBmZEZsYWdzID0gX19wbUdldEZpbGVT dGF0dXNGbGFncyhmZCk7Ci0gICAgX19wbVNvY2tBZGRySW4gbXlBZGRyOworICAgIHN0cnVjdCBf X3BtU29ja0FkZHJJbiBteUFkZHI7CiAKICAgICBteUFkZHIgPSAqYWRkcjsKICAgICBfX3BtU2V0 UG9ydCgmbXlBZGRyLCBwb3J0KTsKQEAgLTIwNiwyNCArMjczLDI1IEBAIF9fcG1BdXhDb25uZWN0 UE1DRChjb25zdCBjaGFyICpob3N0bmFtZSkKIGludAogX19wbUF1eENvbm5lY3RQTUNEUG9ydChj b25zdCBjaGFyICpob3N0bmFtZSwgaW50IHBtY2RfcG9ydCkKIHsKLSAgICBfX3BtU29ja0FkZHJJ bglteUFkZHI7Ci0gICAgX19wbUhvc3RFbnQJCXNlcnZJbmZvOwotICAgIGNoYXIJCSpzaWJ1ZjsK KyAgICBzdHJ1Y3QgX19wbVNvY2tBZGRySW4gbXlBZGRyOworICAgIHN0cnVjdCBfX3BtSG9zdEVu dAkqc2VydkluZm87CiAgICAgaW50CQkJZmQ7CS8qIEZkIGZvciBzb2NrZXQgY29ubmVjdGlvbiB0 byBwbWNkICovCiAgICAgaW50CQkJc3RzOwogICAgIGludAkJCWZkRmxhZ3M7CiAKKyAgICBpZiAo KHNlcnZJbmZvID0gX19wbUFsbG9jSG9zdEVudCgpKSA9PSBOVUxMKQorCXJldHVybiAtRU5PTUVN OworCiAgICAgUE1fSU5JVF9MT0NLUygpOwogICAgIFBNX0xPQ0soX19wbUxvY2tfbGlicGNwKTsK LSAgICBzaWJ1ZiA9IF9fcG1BbGxvY0hvc3RFbnRCdWZmZXIoKTsKLSAgICBpZiAoX19wbUdldEhv c3RCeU5hbWUoaG9zdG5hbWUsICZzZXJ2SW5mbywgc2lidWYpID09IE5VTEwpIHsKKyAgICBpZiAo X19wbUdldEhvc3RCeU5hbWUoaG9zdG5hbWUsIHNlcnZJbmZvKSA9PSBOVUxMKSB7CiAjaWZkZWYg UENQX0RFQlVHCiAJaWYgKHBtRGVidWcgJiBEQkdfVFJBQ0VfQ09OVEVYVCkgewogCSAgICBmcHJp bnRmKHN0ZGVyciwgIl9fcG1BdXhDb25uZWN0UE1DRFBvcnQoJXMsICVkKSA6IGhvc3RlcnJvcj0l ZCwgYGAlcycnXG4iLAogCQkgICAgaG9zdG5hbWUsIHBtY2RfcG9ydCwgaG9zdGVycm9yKCksIGhv c3RzdHJlcnJvcigpKTsKIAl9CiAjZW5kaWYKLQlfX3BtRnJlZUhvc3RFbnRCdWZmZXIoc2lidWYp OworCV9fcG1GcmVlSG9zdEVudChzZXJ2SW5mbyk7CiAJUE1fVU5MT0NLKF9fcG1Mb2NrX2xpYnBj cCk7CiAJcmV0dXJuIC1FSE9TVFVOUkVBQ0g7CiAgICAgfQpAQCAtMjMxLDE0ICsyOTksMTQgQEAg X19wbUF1eENvbm5lY3RQTUNEUG9ydChjb25zdCBjaGFyICpob3N0bmFtZSwgaW50IHBtY2RfcG9y dCkKICAgICBfX3BtQ29ubmVjdFRpbWVvdXQoKTsKIAogICAgIGlmICgoZmQgPSBfX3BtQ3JlYXRl U29ja2V0KCkpIDwgMCkgewotCV9fcG1GcmVlSG9zdEVudEJ1ZmZlcihzaWJ1Zik7CisJX19wbUZy ZWVIb3N0RW50KHNlcnZJbmZvKTsKIAlQTV9VTkxPQ0soX19wbUxvY2tfbGlicGNwKTsKIAlyZXR1 cm4gZmQ7CiAgICAgfQogCiAgICAgX19wbUluaXRTb2NrQWRkcigmbXlBZGRyLCBodG9ubChJTkFE RFJfQU5ZKSwgMCk7Ci0gICAgX19wbVNldFNvY2tBZGRyKCZteUFkZHIsICZzZXJ2SW5mbyk7Ci0g ICAgX19wbUZyZWVIb3N0RW50QnVmZmVyKHNpYnVmKTsKKyAgICBfX3BtU2V0U29ja0FkZHIoJm15 QWRkciwgc2VydkluZm8pOworICAgIF9fcG1GcmVlSG9zdEVudChzZXJ2SW5mbyk7CiAgICAgUE1f VU5MT0NLKF9fcG1Mb2NrX2xpYnBjcCk7CiAKICAgICBpZiAoKGZkRmxhZ3MgPSBfX3BtQ29ubmVj dFRvKGZkLCAmbXlBZGRyLCBwbWNkX3BvcnQpKSA+PSAwKSB7CkBAIC0yNzYsNyArMzQ0LDcgQEAg X19wbUF1eENvbm5lY3RQTUNEUG9ydChjb25zdCBjaGFyICpob3N0bmFtZSwgaW50IHBtY2RfcG9y dCkKICAgICByZXR1cm4gZmRGbGFnczsKIH0KIAotI2lmICFkZWZpbmVkKEhBVkVfTlNTKQorI2lm ICFkZWZpbmVkKEhBVkVfU0VDVVJFX1NPQ0tFVFMpCiAKIGludAogX19wbUNyZWF0ZVNvY2tldCh2 b2lkKQpAQCAtMzE2LDI0ICszODQsMjQgQEAgX19wbUdldFNvY2tPcHQoaW50IHNvY2tldCwgaW50 IGxldmVsLCBpbnQgb3B0aW9uX25hbWUsIHZvaWQgKm9wdGlvbl92YWx1ZSwKIH0KICAKIHZvaWQK LV9fcG1Jbml0U29ja0FkZHIoX19wbVNvY2tBZGRySW4gKmFkZHIsIGludCBhZGRyZXNzLCBpbnQg cG9ydCkKK19fcG1Jbml0U29ja0FkZHIoc3RydWN0IF9fcG1Tb2NrQWRkckluICphZGRyLCBpbnQg YWRkcmVzcywgaW50IHBvcnQpCiB7CiAgICAgbWVtc2V0KGFkZHIsIDAsIHNpemVvZigqYWRkcikp OwotICAgIGFkZHItPnNpbl9mYW1pbHkgPSBBRl9JTkVUOwotICAgIGFkZHItPnNpbl9hZGRyLnNf YWRkciA9IGFkZHJlc3M7Ci0gICAgYWRkci0+c2luX3BvcnQgPSBwb3J0OworICAgIGFkZHItPnNv Y2thZGRyLnNpbl9mYW1pbHkgPSBBRl9JTkVUOworICAgIGFkZHItPnNvY2thZGRyLnNpbl9hZGRy LnNfYWRkciA9IGFkZHJlc3M7CisgICAgYWRkci0+c29ja2FkZHIuc2luX3BvcnQgPSBwb3J0Owog fQogCiB2b2lkCi1fX3BtU2V0U29ja0FkZHIoX19wbVNvY2tBZGRySW4gKmFkZHIsIF9fcG1Ib3N0 RW50ICpoZSkKK19fcG1TZXRTb2NrQWRkcihzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKmFkZHIsIHN0 cnVjdCBfX3BtSG9zdEVudCAqaGUpCiB7Ci0gICAgbWVtY3B5KCZhZGRyLT5zaW5fYWRkciwgaGUt PmhfYWRkciwgaGUtPmhfbGVuZ3RoKTsKKyAgICBtZW1jcHkoJmFkZHItPnNvY2thZGRyLnNpbl9h ZGRyLCBoZS0+aG9zdGVudC5oX2FkZHIsIGhlLT5ob3N0ZW50LmhfbGVuZ3RoKTsKIH0KIAogdm9p ZAotX19wbVNldFBvcnQoX19wbVNvY2tBZGRySW4gKmFkZHIsIGludCBwb3J0KQorX19wbVNldFBv cnQoc3RydWN0IF9fcG1Tb2NrQWRkckluICphZGRyLCBpbnQgcG9ydCkKIHsKLSAgICBhZGRyLT5z aW5fcG9ydCA9IGh0b25zKHBvcnQpOworICAgIGFkZHItPnNvY2thZGRyLnNpbl9wb3J0ID0gaHRv bnMocG9ydCk7CiB9CiAKIGludApAQCAtNDM5LDQyICs1MDcsMzcgQEAgX19wbVNlbGVjdFdyaXRl KGludCBuZmRzLCBfX3BtRmRTZXQgKndyaXRlZmRzLCBzdHJ1Y3QgdGltZXZhbCAqdGltZW91dCkK IH0KIAogY2hhciAqCi1fX3BtQWxsb2NIb3N0RW50QnVmZmVyKHZvaWQpCitfX3BtSG9zdEVudE5h bWUoY29uc3Qgc3RydWN0IF9fcG1Ib3N0RW50ICpob3N0RW50cnkpCiB7Ci0gICAgcmV0dXJuIE5V TEw7CisgICAgcmV0dXJuIGhvc3RFbnRyeS0+aG9zdGVudC5oX25hbWU7CiB9CiAKLXZvaWQKLV9f cG1GcmVlSG9zdEVudEJ1ZmZlcihjaGFyICpidWZmZXIpCitzdHJ1Y3QgX19wbUhvc3RFbnQgKgor X19wbUdldEhvc3RCeU5hbWUoY29uc3QgY2hhciAqaG9zdE5hbWUsIHN0cnVjdCBfX3BtSG9zdEVu dCAqaG9zdEVudHJ5KQogewotICAgIC8qIE5vIGJ1ZmZlciB3YXMgYWN0dWFsbHkgYWxsb2NhdGVk LiAgT3VyIHdvcmsgaGVyZSBpcyBkb25lLiAqLwotfQotCi1fX3BtSG9zdEVudCAqCi1fX3BtR2V0 SG9zdEJ5TmFtZShjb25zdCBjaGFyICpob3N0TmFtZSwgX19wbUhvc3RFbnQgKmhvc3RFbnRyeSwg Y2hhciAqYnVmZmVyKQotewotICAgIF9fcG1Ib3N0RW50ICpoZSA9IGdldGhvc3RieW5hbWUoaG9z dE5hbWUpOworICAgIHN0cnVjdCBob3N0ZW50ICpoZSA9IGdldGhvc3RieW5hbWUoaG9zdE5hbWUp OwogCiAgICAgaWYgKGhlID09IE5VTEwpCiAJcmV0dXJuIE5VTEw7Ci0gICAgKmhvc3RFbnRyeSA9 ICpoZTsKKyAgICBtZW1jcHkoJmhvc3RFbnRyeS0+aG9zdGVudCwgaGUsIHNpemVvZigqaGUpKTsK ICAgICByZXR1cm4gaG9zdEVudHJ5OwogfQogCi1fX3BtSG9zdEVudCAqCi1fX3BtR2V0SG9zdEJ5 QWRkcihfX3BtU29ja0FkZHJJbiAqYWRkcmVzcywgX19wbUhvc3RFbnQgKmhvc3RFbnRyeSwgY2hh ciAqYnVmZmVyKQorc3RydWN0IF9fcG1Ib3N0RW50ICoKK19fcG1HZXRIb3N0QnlBZGRyKHN0cnVj dCBfX3BtU29ja0FkZHJJbiAqYWRkcmVzcywgc3RydWN0IF9fcG1Ib3N0RW50ICpob3N0RW50cnkp CiB7Ci0gICAgX19wbUhvc3RFbnQgKmhlID0gZ2V0aG9zdGJ5YWRkcigodm9pZCAqKSZhZGRyZXNz LT5zaW5fYWRkci5zX2FkZHIsIHNpemVvZihhZGRyZXNzLT5zaW5fYWRkci5zX2FkZHIpLCBBRl9J TkVUKTsKKyAgICBzdHJ1Y3QgaG9zdGVudCAqaGUgPSBnZXRob3N0YnlhZGRyKCh2b2lkICopJmFk ZHJlc3MtPnNvY2thZGRyLnNpbl9hZGRyLnNfYWRkciwKKwkJCQkJc2l6ZW9mKGFkZHJlc3MtPnNv Y2thZGRyLnNpbl9hZGRyLnNfYWRkciksIEFGX0lORVQpOwogICAgIGlmIChoZSA9PSBOVUxMKQog CXJldHVybiBOVUxMOwotICAgICpob3N0RW50cnkgPSAqaGU7CisgICAgbWVtY3B5KCZob3N0RW50 cnktPmhvc3RlbnQsIGhlLCBzaXplb2YoKmhlKSk7CiAgICAgcmV0dXJuIGhvc3RFbnRyeTsKIH0K IAogX19wbUlQQWRkcgotX19wbUhvc3RFbnRHZXRJUEFkZHIoY29uc3QgX19wbUhvc3RFbnQgKmhl LCBpbnQgaXgpCitfX3BtSG9zdEVudEdldElQQWRkcihjb25zdCBzdHJ1Y3QgX19wbUhvc3RFbnQg KmhlLCBpbnQgaXgpCiB7Ci0gICAgcmV0dXJuICgoc3RydWN0IGluX2FkZHIgKiloZS0+aF9hZGRy X2xpc3RbaXhdKS0+c19hZGRyOworICAgIHJldHVybiAoKHN0cnVjdCBpbl9hZGRyICopaGUtPmhv c3RlbnQuaF9hZGRyX2xpc3RbaXhdKS0+c19hZGRyOwogfQogCiB2b2lkCkBAIC01MDksMTUgKzU3 MiwxNSBAQCBfX3BtTG9vcGJhY2tBZGRyZXNzKHZvaWQpCiB9CiAKIF9fcG1JUEFkZHIKLV9fcG1T b2NrQWRkckluVG9JUEFkZHIoY29uc3QgX19wbVNvY2tBZGRySW4gKmluYWRkcikKK19fcG1Tb2Nr QWRkckluVG9JUEFkZHIoY29uc3Qgc3RydWN0IF9fcG1Tb2NrQWRkckluICppbmFkZHIpCiB7Ci0g ICAgcmV0dXJuIF9fcG1JbkFkZHJUb0lQQWRkcigmaW5hZGRyLT5zaW5fYWRkcik7CisgICAgcmV0 dXJuIGluYWRkci0+c29ja2FkZHIuc2luX2FkZHIuc19hZGRyOwogfQogCiBfX3BtSVBBZGRyCi1f X3BtSW5BZGRyVG9JUEFkZHIoY29uc3QgX19wbUluQWRkciAqaW5hZGRyKQorX19wbUluQWRkclRv SVBBZGRyKGNvbnN0IHN0cnVjdCBfX3BtSW5BZGRyICppbmFkZHIpCiB7Ci0gICAgcmV0dXJuIGlu YWRkci0+c19hZGRyOworICAgIHJldHVybiBpbmFkZHItPmluYWRkci5zX2FkZHI7CiB9CiAKIGlu dApAQCAtNTMxLDkgKzU5NCw5IEBAIF9fcG1JUEFkZHJUb0ludChjb25zdCBfX3BtSVBBZGRyICph ZGRyKQogICogVGhlIGNhbGxlciBtdXN0IGZyZWUgdGhlIGJ1ZmZlci4KICAqLwogY2hhciAqCi1f X3BtSW5BZGRyVG9TdHJpbmcoX19wbUluQWRkciAqYWRkcmVzcykKK19fcG1JbkFkZHJUb1N0cmlu ZyhzdHJ1Y3QgX19wbUluQWRkciAqYWRkcmVzcykKIHsKLSAgICBjaGFyICpidWYgPSBpbmV0X250 b2EoKmFkZHJlc3MpOworICAgIGNoYXIgKmJ1ZiA9IGluZXRfbnRvYShhZGRyZXNzLT5pbmFkZHIp OwogCiAgICAgaWYgKGJ1ZiA9PSBOVUxMKQogCXJldHVybiBOVUxMOwpAQCAtNTQxLDcgKzYwNCw3 IEBAIF9fcG1JbkFkZHJUb1N0cmluZyhfX3BtSW5BZGRyICphZGRyZXNzKQogfQogCiBpbnQKLV9f cG1TdHJpbmdUb0luQWRkcihjb25zdCBjaGFyICpjcCwgX19wbUluQWRkciAqaW5wKQorX19wbVN0 cmluZ1RvSW5BZGRyKGNvbnN0IGNoYXIgKmNwLCBzdHJ1Y3QgX19wbUluQWRkciAqaW5wKQogewog I2lmZGVmIElTX01JTkdXCiAgICAgdW5zaWduZWQgbG9uZyBpbjsKQEAgLTU0OSwxNCArNjEyLDE0 IEBAIF9fcG1TdHJpbmdUb0luQWRkcihjb25zdCBjaGFyICpjcCwgX19wbUluQWRkciAqaW5wKQog ICAgIGluYWRkci5zX2FkZHIgPSBpbjsKICAgICByZXR1cm4gaW4gPT0gSU5BRERSX05PTkUgPyAw IDogMTsKICNlbHNlCi0gICAgcmV0dXJuIGluZXRfYXRvbihjcCwgaW5wKTsKKyAgICByZXR1cm4g aW5ldF9hdG9uKGNwLCAmaW5wLT5pbmFkZHIpOwogI2VuZGlmCiB9CiAKIGNoYXIgKgotX19wbVNv Y2tBZGRySW5Ub1N0cmluZyhfX3BtU29ja0FkZHJJbiAqYWRkcmVzcykKK19fcG1Tb2NrQWRkcklu VG9TdHJpbmcoc3RydWN0IF9fcG1Tb2NrQWRkckluICphZGRyZXNzKQogewotICAgIHJldHVybiBf X3BtSW5BZGRyVG9TdHJpbmcoJmFkZHJlc3MtPnNpbl9hZGRyKTsKKyAgICByZXR1cm4gX19wbUlu QWRkclRvU3RyaW5nKChzdHJ1Y3QgX19wbUluQWRkciAqKSZhZGRyZXNzLT5zb2NrYWRkci5zaW5f YWRkcik7CiB9CiAKICNlbHNlCS8qIE5TUyAqLwpAQCAtNjI3LDcgKzY5MCw3IEBAIF9fcG1DcmVh dGVTb2NrZXQodm9pZCkKIAlyZXR1cm4gLW5ldGVycm9yKCk7CiAKICAgICBmZCA9IG5ld05TUFJI YW5kbGUoKTsKLSAgICBfX3BtU2V0TlNQUkZkSVBDKGZkLCBuc3ByRmQpOyAvKiBNdXN0IGJlIGJl Zm9yZSBfX3BtSW5pdFNvY2tldCAqLworICAgIF9fcG1TZXREYXRhSVBDKGZkLCBuc3ByRmQpOyAv KiBNdXN0IGJlIGJlZm9yZSBfX3BtSW5pdFNvY2tldCAqLwogCiAgICAgaWYgKChzdHMgPSBfX3Bt SW5pdFNvY2tldChmZCkpIDwgMCkKICAgICAgICAgcmV0dXJuIHN0czsKQEAgLTYzOCw3ICs3MDEs NyBAQCBfX3BtQ3JlYXRlU29ja2V0KHZvaWQpCiB2b2lkCiBfX3BtQ2xvc2VTb2NrZXQoaW50IGZk KQogewotICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IF9fcG1OU1BSRmRJUEMoZmQpOworICAgIFBS RmlsZURlc2MgKm5zcHJGZCA9IChQUkZpbGVEZXNjICopX19wbURhdGFJUEMoZmQpOwogICAgIF9f cG1SZXNldElQQyhmZCk7CiAKICAgICBpZiAobnNwckZkKSB7CkBAIC02NzUsNyArNzM4LDcgQEAg X19wbVNldFNvY2tPcHQoaW50IHNvY2tldCwgaW50IGxldmVsLCBpbnQgb3B0aW9uX25hbWUsIGNv bnN0IHZvaWQgKm9wdGlvbl92YWx1ZSwKICAgICAvKiBNYXAgdGhlIHJlcXVlc3QgdG8gdGhlIE5T UFIgZXF1aXZhbGVudCwgaWYgcG9zc2libGUuICovCiAgICAgUFJTb2NrZXRPcHRpb25EYXRhIG9k YXRhOwogICAgIFBSU3RhdHVzIHByU3RhdHVzOwotICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IF9f cG1OU1BSRmRJUEMoc29ja2V0KTsKKyAgICBQUkZpbGVEZXNjICpuc3ByRmQgPSAoUFJGaWxlRGVz YyAqKV9fcG1EYXRhSVBDKHNvY2tldCk7CiAKICAgICBpZiAobnNwckZkKSB7CiAJc3dpdGNoKGxl dmVsKSB7CkBAIC03MzYsMTEgKzc5OSwxMSBAQCBpbnQKIF9fcG1HZXRTb2NrT3B0KGludCBzb2Nr ZXQsIGludCBsZXZlbCwgaW50IG9wdGlvbl9uYW1lLCB2b2lkICpvcHRpb25fdmFsdWUsCiAJICAg ICAgIF9fcG1Tb2NrTGVuICpvcHRpb25fbGVuKQogewotICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9 IF9fcG1OU1BSRmRJUEMoc29ja2V0KTsKKyAgICBQUkZpbGVEZXNjICpuc3ByRmQgPSAoUFJGaWxl RGVzYyAqKV9fcG1EYXRhSVBDKHNvY2tldCk7CiAKICAgICAvKiBNYXAgdGhlIHJlcXVlc3QgdG8g dGhlIE5TUFIgZXF1aXZhbGVudCwgaWYgcG9zc2libGUuICovCiAgICAgaWYgKG5zcHJGZCkgewot CXN3aXRjaChsZXZlbCkgeworCXN3aXRjaCAobGV2ZWwpIHsKIAljYXNlIFNPTF9TT0NLRVQ6CiAJ ICBzd2l0Y2gob3B0aW9uX25hbWUpIHsKIAkgIGNhc2UgU09fRVJST1I6IHsKQEAgLTc2Nyw0NCAr ODMwLDQ2IEBAIF9fcG1HZXRTb2NrT3B0KGludCBzb2NrZXQsIGludCBsZXZlbCwgaW50IG9wdGlv bl9uYW1lLCB2b2lkICpvcHRpb25fdmFsdWUsCiB9CiAgCiB2b2lkCi1fX3BtSW5pdFNvY2tBZGRy KF9fcG1Tb2NrQWRkckluICphZGRyLCBpbnQgYWRkcmVzcywgaW50IHBvcnQpCitfX3BtSW5pdFNv Y2tBZGRyKHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqYWRkciwgaW50IGFkZHJlc3MsIGludCBwb3J0 KQogeworICBQUlN0YXR1cyBwclN0YXR1cyA9IFBSX0luaXRpYWxpemVOZXRBZGRyIChQUl9JcEFk ZHJOdWxsLCBudG9ocyhwb3J0KSwgJmFkZHItPnNvY2thZGRyKTsKICAgICAvKiBXZSBleHBlY3Qg dGhlIGFkZHJlc3MgYW5kIHBvcnQgbnVtYmVyIHRvIGJlIG9uIG5ldHdvcmsgYnl0ZSBvcmRlci4K ICAgICAgICBQUl9Jbml0aWFsaXplTmV0QWRkciBleHBlY3RzIHRoZSBwb3J0IGluIGhvc3QgYnl0 ZSBvcmRlci4KICAgICAgICBUaGUgaXAgZmllbGQgb2YgX19wbVNvY2tBZGRySW4gKFBSTmV0QWRk cikgbXVzdCBiZSBpbiBuZXR3b3JrIGJ5dGUgb3JkZXIuICovCi0gIFBSU3RhdHVzIHByU3RhdHVz ID0gUFJfSW5pdGlhbGl6ZU5ldEFkZHIgKFBSX0lwQWRkck51bGwsIG50b2hzKHBvcnQpLCBhZGRy KTsKKwogICBpZiAocHJTdGF0dXMgIT0gUFJfU1VDQ0VTUykKICAgICBfX3BtTm90aWZ5RXJyKExP R19FUlIsICJfX3BtSW5pdFNvY2tBZGRyOiBQUl9Jbml0aWFsaXplTmV0QWRkciBmYWlsdXJlOiAl ZFxuIiwKIAkJICBQUl9HZXRFcnJvcigpKTsKLSAgYWRkci0+aW5ldC5pcCA9IGFkZHJlc3M7Cisg IGFkZHItPnNvY2thZGRyLmluZXQuaXAgPSBhZGRyZXNzOwogfQogCiB2b2lkCi1fX3BtU2V0U29j a0FkZHIoX19wbVNvY2tBZGRySW4gKmFkZHIsIF9fcG1Ib3N0RW50ICpoZSkKK19fcG1TZXRTb2Nr QWRkcihzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKmFkZHIsIHN0cnVjdCBfX3BtSG9zdEVudCAqaGUp CiB7CiAgICAgUFJVaW50MTYgcG9ydCA9IDA7CiAgICAgLyogVGhlIHBvcnQgaW4gdGhlIGFkZHJl c3MgaXMgaW4gbmV0d29yayBieXRlIGZvcmRlciwgYnV0IFBSX0VudW1lcmF0ZUhvc3RFbnQgZXhw ZWN0cyBpdAogICAgICAgIGluIGhvc3QgYnl0ZSBvcmRlci4gKi8KLSAgICBpZiAoYWRkci0+cmF3 LmZhbWlseSA9PSBQUl9BRl9JTkVUKQotICAgICAgICBwb3J0ID0gbnRvaHMoYWRkci0+aW5ldC5w b3J0KTsKLSAgICBlbHNlIGlmIChhZGRyLT5yYXcuZmFtaWx5ID09IFBSX0FGX0lORVQ2KQotICAg ICAgICBwb3J0ID0gbnRvaHMoYWRkci0+aXB2Ni5wb3J0KTsKLSAgICBQUl9FbnVtZXJhdGVIb3N0 RW50KDAsIGhlLCBwb3J0LCBhZGRyKTsKKyAgICBpZiAoYWRkci0+c29ja2FkZHIucmF3LmZhbWls eSA9PSBQUl9BRl9JTkVUKQorICAgICAgICBwb3J0ID0gbnRvaHMoYWRkci0+c29ja2FkZHIuaW5l dC5wb3J0KTsKKyAgICBlbHNlIGlmIChhZGRyLT5zb2NrYWRkci5yYXcuZmFtaWx5ID09IFBSX0FG X0lORVQ2KQorICAgICAgICBwb3J0ID0gbnRvaHMoYWRkci0+c29ja2FkZHIuaXB2Ni5wb3J0KTsK KyAgICBQUl9FbnVtZXJhdGVIb3N0RW50KDAsICZoZS0+aG9zdGVudCwgcG9ydCwgJmFkZHItPnNv Y2thZGRyKTsKIH0KIAogdm9pZAotX19wbVNldFBvcnQoX19wbVNvY2tBZGRySW4gKmFkZHIsIGlu dCBwb3J0KQorX19wbVNldFBvcnQoc3RydWN0IF9fcG1Tb2NrQWRkckluICphZGRyLCBpbnQgcG9y dCkKIHsKLSAgICBpZiAoYWRkci0+cmF3LmZhbWlseSA9PSBQUl9BRl9JTkVUKQotICAgICAgICBh ZGRyLT5pbmV0LnBvcnQgPSBodG9ucyhwb3J0KTsKLSAgICBlbHNlIGlmIChhZGRyLT5yYXcuZmFt aWx5ID09IFBSX0FGX0lORVQ2KQotICAgICAgICBhZGRyLT5pcHY2LnBvcnQgPSBodG9ucyhwb3J0 KTsKKyAgICBpZiAoYWRkci0+c29ja2FkZHIucmF3LmZhbWlseSA9PSBQUl9BRl9JTkVUKQorICAg ICAgICBhZGRyLT5zb2NrYWRkci5pbmV0LnBvcnQgPSBodG9ucyhwb3J0KTsKKyAgICBlbHNlIGlm IChhZGRyLT5zb2NrYWRkci5yYXcuZmFtaWx5ID09IFBSX0FGX0lORVQ2KQorICAgICAgICBhZGRy LT5zb2NrYWRkci5pcHY2LnBvcnQgPSBodG9ucyhwb3J0KTsKIH0KIAogaW50CiBfX3BtTGlzdGVu KGludCBmZCwgaW50IGJhY2tsb2cpCiB7Ci0gICAgUFJGaWxlRGVzYyAqbnNwckZkID0gX19wbU5T UFJGZElQQyhmZCk7CisgICAgUFJGaWxlRGVzYyAqbnNwckZkID0gKFBSRmlsZURlc2MgKilfX3Bt RGF0YUlQQyhmZCk7CisKICAgICBpZiAobnNwckZkKSB7CiAgICAgICAgIFBSU3RhdHVzIHByU3Rh dHVzOwogCXByU3RhdHVzID0gUFJfTGlzdGVuKG5zcHJGZCwgYmFja2xvZyk7CkBAIC04MTgsMTUg Kzg4MywxNSBAQCBfX3BtTGlzdGVuKGludCBmZCwgaW50IGJhY2tsb2cpCiBpbnQKIF9fcG1BY2Nl cHQoaW50IGZkLCB2b2lkICphZGRyLCBfX3BtU29ja0xlbiAqYWRkcmxlbikKIHsKLSAgICBQUkZp bGVEZXNjICpuc3ByRmQgPSBfX3BtTlNQUkZkSVBDKGZkKTsKKyAgICBQUkZpbGVEZXNjICpuc3By RmQgPSAoUFJGaWxlRGVzYyAqKV9fcG1EYXRhSVBDKGZkKTsKICAgICBpZiAobnNwckZkKSB7CiAg ICAgICAgIFBSRmlsZURlc2MgKm5ld1NvY2tldDsKLQluZXdTb2NrZXQgPSBQUl9BY2NlcHQobnNw ckZkLCAoUFJOZXRBZGRyICopYWRkciwgUFJfSU5URVJWQUxfTk9fVElNRU9VVCk7CisJbmV3U29j a2V0ID0gUFJfQWNjZXB0KG5zcHJGZCwgYWRkciwgUFJfSU5URVJWQUxfTk9fVElNRU9VVCk7CiAJ aWYgKG5ld1NvY2tldCA9PSBOVUxMKQogCSAgcmV0dXJuIC0xOwogCS8qIEFkZCB0aGUgYWNjZXB0 ZWQgc29ja2V0IHRvIHRoZSBmZCB0YWJsZS4gKi8KIAlmZCA9IG5ld05TUFJIYW5kbGUoKTsKLQlf X3BtU2V0TlNQUkZkSVBDKGZkLCBuZXdTb2NrZXQpOworCV9fcG1TZXREYXRhSVBDKGZkLCBuZXdT b2NrZXQpOwogCXJldHVybiBmZDsKICAgICB9CiAKQEAgLTgzNyw3ICs5MDIsOCBAQCBfX3BtQWNj ZXB0KGludCBmZCwgdm9pZCAqYWRkciwgX19wbVNvY2tMZW4gKmFkZHJsZW4pCiBpbnQKIF9fcG1C aW5kKGludCBmZCwgdm9pZCAqYWRkciwgX19wbVNvY2tMZW4gYWRkcmxlbikKIHsKLSAgICBQUkZp bGVEZXNjICpuc3ByRmQgPSBfX3BtTlNQUkZkSVBDKGZkKTsKKyAgICBQUkZpbGVEZXNjICpuc3By RmQgPSAoUFJGaWxlRGVzYyAqKV9fcG1EYXRhSVBDKGZkKTsKKwogICAgIGlmIChuc3ByRmQpIHsK ICAgICAgICAgUFJTdGF0dXMgcHJTdGF0dXM7CiAJcHJTdGF0dXMgPSBQUl9CaW5kKG5zcHJGZCwg KFBSTmV0QWRkciAqKWFkZHIpOwpAQCAtODUxLDcgKzkxNyw3IEBAIF9fcG1CaW5kKGludCBmZCwg dm9pZCAqYWRkciwgX19wbVNvY2tMZW4gYWRkcmxlbikKIGludAogX19wbUNvbm5lY3QoaW50IGZk LCB2b2lkICphZGRyLCBfX3BtU29ja0xlbiBhZGRybGVuKQogewotICAgIFBSRmlsZURlc2MgKm5z cHJGZCA9IF9fcG1OU1BSRmRJUEMoZmQpOworICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IChQUkZp bGVEZXNjICopX19wbURhdGFJUEMoZmQpOwogICAgIGlmIChuc3ByRmQpIHsKICAgICAgICAgUFJT dGF0dXMgcHJTdGF0dXM7CiAJcHJTdGF0dXMgPSBQUl9Db25uZWN0KG5zcHJGZCwgKFBSTmV0QWRk ciAqKWFkZHIsIFBSX0lOVEVSVkFMX05PX1RJTUVPVVQpOwpAQCAtODY1LDcgKzkzMSw4IEBAIF9f cG1Db25uZWN0KGludCBmZCwgdm9pZCAqYWRkciwgX19wbVNvY2tMZW4gYWRkcmxlbikKIGludAog X19wbUdldEZpbGVTdGF0dXNGbGFncyhpbnQgZmQpCiB7Ci0gICAgUFJGaWxlRGVzYyAqbnNwckZk ID0gX19wbU5TUFJGZElQQyhmZCk7CisgICAgUFJGaWxlRGVzYyAqbnNwckZkID0gKFBSRmlsZURl c2MgKilfX3BtRGF0YUlQQyhmZCk7CisKICAgICBpZiAobnNwckZkKSB7CiAgICAgICAgIC8qIFRo ZXJlIGlzIG5vIGRpcmVjdCBtYXBwaW5nIG9mIHRoaXMgZnVuY3Rpb24gaW4gTlNQUi4gVGhlIGJl c3Qgd2UgY2FuIGRvIGlzIHRvIHVzZSB0aGUKIAkgICBuYXRpdmUgZmQgYW5kIGNhbGwgZmNudGwg b24gdGhhdCBoYW5kbGUuICovCkBAIC04NzcsNyArOTQ0LDggQEAgX19wbUdldEZpbGVTdGF0dXNG bGFncyhpbnQgZmQpCiBpbnQKIF9fcG1TZXRGaWxlU3RhdHVzRmxhZ3MoaW50IGZkLCBpbnQgZmxh Z3MpCiB7Ci0gICAgUFJGaWxlRGVzYyAqbnNwckZkID0gX19wbU5TUFJGZElQQyhmZCk7CisgICAg UFJGaWxlRGVzYyAqbnNwckZkID0gKFBSRmlsZURlc2MgKilfX3BtRGF0YUlQQyhmZCk7CisKICAg ICBpZiAobnNwckZkKSB7CiAgICAgICAgIC8qIFRoZXJlIGlzIG5vIGRpcmVjdCBtYXBwaW5nIG9m IHRoaXMgZnVuY3Rpb24gaW4gTlNQUi4gVGhlIGJlc3Qgd2UgY2FuIGRvIGlzIHRvIHVzZSB0aGUK IAkgICBuYXRpdmUgZmQgYW5kIGNhbGwgZmNudGwgb24gdGhhdCBoYW5kbGUuICovCkBAIC04ODks NyArOTU3LDcgQEAgX19wbVNldEZpbGVTdGF0dXNGbGFncyhpbnQgZmQsIGludCBmbGFncykKIGlu dAogX19wbUdldEZpbGVEZXNjcmlwdG9yRmxhZ3MoaW50IGZkKQogewotICAgIFBSRmlsZURlc2Mg Km5zcHJGZCA9IF9fcG1OU1BSRmRJUEMoZmQpOworICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IChQ UkZpbGVEZXNjICopX19wbURhdGFJUEMoZmQpOwogICAgIGlmIChuc3ByRmQpIHsKICAgICAgICAg LyogVGhlcmUgaXMgbm8gZGlyZWN0IG1hcHBpbmcgb2YgdGhpcyBmdW5jdGlvbiBpbiBOU1BSLiBU aGUgYmVzdCB3ZSBjYW4gZG8gaXMgdG8gdXNlIHRoZQogCSAgIG5hdGl2ZSBmZCBhbmQgY2FsbCBm Y250bCBvbiB0aGF0IGhhbmRsZS4gKi8KQEAgLTkwMSw3ICs5NjksOCBAQCBfX3BtR2V0RmlsZURl c2NyaXB0b3JGbGFncyhpbnQgZmQpCiBpbnQKIF9fcG1TZXRGaWxlRGVzY3JpcHRvckZsYWdzKGlu dCBmZCwgaW50IGZsYWdzKQogewotICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IF9fcG1OU1BSRmRJ UEMoZmQpOworICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IChQUkZpbGVEZXNjICopX19wbURhdGFJ UEMoZmQpOworCiAgICAgaWYgKG5zcHJGZCkgewogICAgICAgICAvKiBUaGVyZSBpcyBubyBkaXJl Y3QgbWFwcGluZyBvZiB0aGlzIGZ1bmN0aW9uIGluIE5TUFIuIFRoZSBiZXN0IHdlIGNhbiBkbyBp cyB0byB1c2UgdGhlCiAJICAgbmF0aXZlIGZkIGFuZCBjYWxsIGZjbnRsIG9uIHRoYXQgaGFuZGxl LiAqLwpAQCAtOTE0LDcgKzk4Myw4IEBAIHNzaXplX3QKIF9fcG1TZW5kKGludCBzb2NrZXQsIGNv bnN0IHZvaWQgKmJ1ZmZlciwgc2l6ZV90IGxlbmd0aCwgaW50IGZsYWdzKQogewogICAgIC8qIE1h cCB0aGUgcmVxdWVzdCB0byB0aGUgTlNQUiBlcXVpdmFsZW50LCBpZiBwb3NzaWJsZS4gKi8KLSAg ICBQUkZpbGVEZXNjICpuc3ByRmQgPSBfX3BtTlNQUkZkSVBDKHNvY2tldCk7CisgICAgUFJGaWxl RGVzYyAqbnNwckZkID0gKFBSRmlsZURlc2MgKilfX3BtRGF0YUlQQyhzb2NrZXQpOworCiAgICAg aWYgKG5zcHJGZCkgewogCXJldHVybiBQUl9Xcml0ZSAobnNwckZkLCBidWZmZXIsIGxlbmd0aCk7 CiAgICAgfQpAQCAtOTI3LDcgKzk5Nyw4IEBAIHNzaXplX3QKIF9fcG1SZWN2KGludCBzb2NrZXQs IHZvaWQgKmJ1ZmZlciwgc2l6ZV90IGxlbmd0aCwgaW50IGZsYWdzKQogewogICAgIC8qIE1hcCB0 aGUgcmVxdWVzdCB0byB0aGUgTlNQUiBlcXVpdmFsZW50LCBpZiBwb3NzaWJsZS4gKi8KLSAgICBQ UkZpbGVEZXNjICpuc3ByRmQgPSBfX3BtTlNQUkZkSVBDKHNvY2tldCk7CisgICAgUFJGaWxlRGVz YyAqbnNwckZkID0gKFBSRmlsZURlc2MgKilfX3BtRGF0YUlQQyhzb2NrZXQpOworCiAgICAgaWYg KG5zcHJGZCkgewogCXJldHVybiBQUl9SZWFkIChuc3ByRmQsIGJ1ZmZlciwgbGVuZ3RoKTsKICAg ICB9CkBAIC05MzksNyArMTAxMCw4IEBAIF9fcG1SZWN2KGludCBzb2NrZXQsIHZvaWQgKmJ1ZmZl ciwgc2l6ZV90IGxlbmd0aCwgaW50IGZsYWdzKQogdm9pZAogX19wbUZEX0NMUihpbnQgZmQsIF9f cG1GZFNldCAqc2V0KQogewotICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IF9fcG1OU1BSRmRJUEMo ZmQpOworICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IChQUkZpbGVEZXNjICopX19wbURhdGFJUEMo ZmQpOworCiAgICAgaWYgKG5zcHJGZCkgewogICAgICAgICBmZCAtPSBOU1BSX0hBTkRMRV9CQVNF OwogCUZEX0NMUihmZCwgJnNldC0+bnNwcl9zZXQpOwpAQCAtOTY4LDcgKzEwNDAsOCBAQCBfX3Bt RkRfQ0xSKGludCBmZCwgX19wbUZkU2V0ICpzZXQpCiBpbnQKIF9fcG1GRF9JU1NFVChpbnQgZmQs IF9fcG1GZFNldCAqc2V0KQogewotICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IF9fcG1OU1BSRmRJ UEMoZmQpOworICAgIFBSRmlsZURlc2MgKm5zcHJGZCA9IChQUkZpbGVEZXNjICopX19wbURhdGFJ UEMoZmQpOworCiAgICAgaWYgKG5zcHJGZCkgewogICAgICAgICBmZCAtPSBOU1BSX0hBTkRMRV9C QVNFOwogCXJldHVybiBGRF9JU1NFVChmZCwgJnNldC0+bnNwcl9zZXQpOwpAQCAtOTc5LDcgKzEw NTIsOCBAQCBfX3BtRkRfSVNTRVQoaW50IGZkLCBfX3BtRmRTZXQgKnNldCkKIHZvaWQKIF9fcG1G RF9TRVQoaW50IGZkLCBfX3BtRmRTZXQgKnNldCkKIHsKLSAgICBQUkZpbGVEZXNjICpuc3ByRmQg PSBfX3BtTlNQUkZkSVBDKGZkKTsKKyAgICBQUkZpbGVEZXNjICpuc3ByRmQgPSAoUFJGaWxlRGVz YyAqKV9fcG1EYXRhSVBDKGZkKTsKKwogICAgIGlmIChuc3ByRmQpIHsKICAgICAgICAgZmQgLT0g TlNQUl9IQU5ETEVfQkFTRTsKIAlGRF9TRVQoZmQsICZzZXQtPm5zcHJfc2V0KTsKQEAgLTEwMzcs NyArMTExMSw3IEBAIG5zcHJTZWxlY3QoaW50IHJ3ZmxhZywgX19wbUZkU2V0ICpmZHMsIHN0cnVj dCB0aW1ldmFsICp0aW1lb3V0KQogICAgIC8qIE5vdyBhZGQgdGhlIG5hdGl2ZSBmZHMgYXNzb2Np YXRlZCB3aXRoIHRoZSBOU1BSIGZkcyBpbiBuc3ByX3NldCwgaWYgYW55LiAqLwogICAgIGZvciAo ZmQgPSAwOyBmZCA8IGZkcy0+bnVtX25zcHJfZmRzOyArK2ZkKSB7CiAgICAgICAgIGlmIChGRF9J U1NFVChmZCwgJmZkcy0+bnNwcl9zZXQpKSB7Ci0JICBuc3ByRkQgPSBfX3BtTlNQUkZkSVBDKE5T UFJfSEFORExFX0JBU0UgKyBmZCk7CisJICBuc3ByRkQgPSAoUFJGaWxlRGVzYyAqKV9fcG1EYXRh SVBDKE5TUFJfSEFORExFX0JBU0UgKyBmZCk7CiAJICBuYXRpdmVGRCA9IFBSX0ZpbGVEZXNjMk5h dGl2ZUhhbmRsZShuc3ByRkQpOwogCSAgRkRfU0VUKG5hdGl2ZUZELCAmY29tYmluZWQpOwogCSAg aWYgKG5hdGl2ZUZEID49IG51bUNvbWJpbmVkKQpAQCAtMTA2MCw3ICsxMTM0LDcgQEAgbnNwclNl bGVjdChpbnQgcndmbGFnLCBfX3BtRmRTZXQgKmZkcywgc3RydWN0IHRpbWV2YWwgKnRpbWVvdXQp CiAgICAgLyogU2VwYXJhdGUgdGhlIHJlc3VsdHMgaW50byB0aGVpciBjb3JyZXNwb25kaW5nIHNl dHMgYWdhaW4uICovCiAgICAgZm9yIChmZCA9IDA7IGZkIDwgZmRzLT5udW1fbnNwcl9mZHM7ICsr ZmQpIHsKICAgICAgICAgaWYgKEZEX0lTU0VUKGZkLCAmZmRzLT5uc3ByX3NldCkpIHsKLQkgICBu c3ByRkQgPSBfX3BtTlNQUkZkSVBDKE5TUFJfSEFORExFX0JBU0UgKyBmZCk7CisJICAgbnNwckZE ID0gKFBSRmlsZURlc2MgKilfX3BtRGF0YUlQQyhOU1BSX0hBTkRMRV9CQVNFICsgZmQpOwogCSAg IG5hdGl2ZUZEID0gUFJfRmlsZURlc2MyTmF0aXZlSGFuZGxlKG5zcHJGRCk7CiAKIAkgICAvKiBB cyB3ZSBjb3B5IHRoZSByZXN1bHQgdG8gdGhlIG5zcHIgc2V0LCBtYWtlIHN1cmUgdGhlIGJpdCBp cyBjbGVhcmVkIGluIHRoZQpAQCAtMTA5Nyw0NCArMTE3MSwzNSBAQCBfX3BtU2VsZWN0V3JpdGUo aW50IG5mZHMsIF9fcG1GZFNldCAqd3JpdGVmZHMsIHN0cnVjdCB0aW1ldmFsICp0aW1lb3V0KQog fQogCiBjaGFyICoKLV9fcG1BbGxvY0hvc3RFbnRCdWZmZXIodm9pZCkKK19fcG1Ib3N0RW50TmFt ZShjb25zdCBzdHJ1Y3QgX19wbUhvc3RFbnQgKmhlKQogewotICAgIGNoYXIgKmJ1ZmZlciA9IG1h bGxvYyhQUl9ORVREQl9CVUZfU0laRSk7Ci0gICAgaWYgKGJ1ZmZlciA9PSBOVUxMKQotICAgICAg ICBfX3BtTm9NZW0oIl9fcG1BbGxvY0hvc3RFbnRCdWZmZXIiLCBQUl9ORVREQl9CVUZfU0laRSwg UE1fRkFUQUxfRVJSKTsKLSAgICByZXR1cm4gYnVmZmVyOworICAgIHJldHVybiBoZS0+aG9zdGVu dC5oX25hbWU7CiB9CiAKLXZvaWQKLV9fcG1GcmVlSG9zdEVudEJ1ZmZlcihjaGFyICpidWZmZXIp CitzdHJ1Y3QgX19wbUhvc3RFbnQgKgorX19wbUdldEhvc3RCeU5hbWUoY29uc3QgY2hhciAqaG9z dE5hbWUsIHN0cnVjdCBfX3BtSG9zdEVudCAqaGUpCiB7Ci0gICAgZnJlZShidWZmZXIpOworICAg IFBSU3RhdHVzIHByU3RhdHVzID0gUFJfR2V0SG9zdEJ5TmFtZShob3N0TmFtZSwgJmhlLT5idWZm ZXJbMF0sIFBSX05FVERCX0JVRl9TSVpFLCAmaGUtPmhvc3RlbnQpOworICAgIHJldHVybiBwclN0 YXR1cyA9PSBQUl9TVUNDRVNTID8gaGUgOiBOVUxMOwogfQogCi1fX3BtSG9zdEVudCAqCi1fX3Bt R2V0SG9zdEJ5TmFtZShjb25zdCBjaGFyICpob3N0TmFtZSwgX19wbUhvc3RFbnQgKmhvc3RFbnRy eSwgY2hhciAqYnVmZmVyKQorc3RydWN0IF9fcG1Ib3N0RW50ICoKK19fcG1HZXRIb3N0QnlBZGRy KHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqYWRkcmVzcywgc3RydWN0IF9fcG1Ib3N0RW50ICpoZSkK IHsKLSAgICBQUlN0YXR1cyBwclN0YXR1cyA9IFBSX0dldEhvc3RCeU5hbWUoaG9zdE5hbWUsIGJ1 ZmZlciwgUFJfTkVUREJfQlVGX1NJWkUsIGhvc3RFbnRyeSk7Ci0gICAgcmV0dXJuIHByU3RhdHVz ID09IFBSX1NVQ0NFU1MgPyBob3N0RW50cnkgOiBOVUxMOwotfQotCi1fX3BtSG9zdEVudCAqCi1f X3BtR2V0SG9zdEJ5QWRkcihfX3BtU29ja0FkZHJJbiAqYWRkcmVzcywgX19wbUhvc3RFbnQgKmhv c3RFbnRyeSwgY2hhciAqYnVmZmVyKQotewotICAgIFBSU3RhdHVzIHByU3RhdHVzID0gUFJfR2V0 SG9zdEJ5QWRkcihhZGRyZXNzLCBidWZmZXIsIFBSX05FVERCX0JVRl9TSVpFLCBob3N0RW50cnkp OwotICAgIHJldHVybiBwclN0YXR1cyA9PSBQUl9TVUNDRVNTID8gaG9zdEVudHJ5IDogTlVMTDsK KyAgICBQUlN0YXR1cyBwclN0YXR1cyA9IFBSX0dldEhvc3RCeUFkZHIoJmFkZHJlc3MtPnNvY2th ZGRyLCAmaGUtPmJ1ZmZlclswXSwgUFJfTkVUREJfQlVGX1NJWkUsICZoZS0+aG9zdGVudCk7Cisg ICAgcmV0dXJuIHByU3RhdHVzID09IFBSX1NVQ0NFU1MgPyBoZSA6IE5VTEw7CiB9CiAKIF9fcG1J UEFkZHIKLV9fcG1Ib3N0RW50R2V0SVBBZGRyKGNvbnN0IF9fcG1Ib3N0RW50ICpoZSwgaW50IGl4 KQorX19wbUhvc3RFbnRHZXRJUEFkZHIoY29uc3Qgc3RydWN0IF9fcG1Ib3N0RW50ICpoZSwgaW50 IGl4KQogewogICAgIFBSTmV0QWRkciBhZGRyZXNzOwotICAgIFBSSW50biByYyA9IFBSX0VudW1l cmF0ZUhvc3RFbnQoMCwgaGUsIDAsICZhZGRyZXNzKTsKKyAgICBQUkludG4gcmMgPSBQUl9FbnVt ZXJhdGVIb3N0RW50KDAsICZoZS0+aG9zdGVudCwgMCwgJmFkZHJlc3MpOwogICAgIGlmIChyYyA8 IDApIHsKICAgICAgICAgX19wbU5vdGlmeUVycihMT0dfRVJSLCAiX19wbUhvc3RFbnRHZXRJUEFk ZHI6IHVuYWJsZSB0byBvYnRhaW4gaG9zdCBhZGRyZXNzXG4iKTsKIAlyZXR1cm4gMDsKICAgICB9 Ci0gICAgcmV0dXJuIF9fcG1JbkFkZHJUb0lQQWRkcigmYWRkcmVzcyk7CisgICAgcmV0dXJuIGFk ZHJlc3MuaW5ldC5pcDsKIH0KIAogdm9pZApAQCAtMTE2OSwxNSArMTIzNCwxNSBAQCBfX3BtTG9v cGJhY2tBZGRyZXNzKHZvaWQpCiB9CiAKIF9fcG1JUEFkZHIKLV9fcG1Tb2NrQWRkckluVG9JUEFk ZHIoY29uc3QgX19wbVNvY2tBZGRySW4gKmluYWRkcikKK19fcG1Tb2NrQWRkckluVG9JUEFkZHIo Y29uc3Qgc3RydWN0IF9fcG1Tb2NrQWRkckluICppbmFkZHIpCiB7Ci0gICAgcmV0dXJuIF9fcG1J bkFkZHJUb0lQQWRkcihpbmFkZHIpOworICAgIHJldHVybiBpbmFkZHItPnNvY2thZGRyLmluZXQu aXA7CiB9CiAKIF9fcG1JUEFkZHIKLV9fcG1JbkFkZHJUb0lQQWRkcihjb25zdCBfX3BtSW5BZGRy ICppbmFkZHIpCitfX3BtSW5BZGRyVG9JUEFkZHIoY29uc3Qgc3RydWN0IF9fcG1JbkFkZHIgKmlu YWRkcikKIHsKLSAgICByZXR1cm4gaW5hZGRyLT5pbmV0LmlwOworICAgIHJldHVybiBpbmFkZHIt PmluYWRkci5pbmV0LmlwOwogfQogCiBpbnQKQEAgLTExOTMsMzEgKzEyNTgsMzIgQEAgX19wbUlQ QWRkclRvSW50KGNvbnN0IF9fcG1JUEFkZHIgKmFkZHIpCiAjZGVmaW5lIFBNX05FVF9BRERSX1NU UklOR19TSVpFIDQ2IC8qIGZyb20gdGhlIE5TUFIgQVBJIHJlZmVyZW5jZSAqLwogCiBjaGFyICoK LV9fcG1JbkFkZHJUb1N0cmluZyhfX3BtSW5BZGRyICphZGRyZXNzKQorX19wbUluQWRkclRvU3Ry aW5nKHN0cnVjdCBfX3BtSW5BZGRyICphZGRyZXNzKQogewotICBQUlN0YXR1cyBwclN0YXR1czsK LSAgY2hhciAgICAgKmJ1ZiA9IG1hbGxvYyhQTV9ORVRfQUREUl9TVFJJTkdfU0laRSk7Ci0gIGlm IChidWYgPT0gTlVMTCkKLSAgICAgIHJldHVybiBzdHJkdXAoInVua25vd24iKTsKLSAgcHJTdGF0 dXMgPSBQUl9OZXRBZGRyVG9TdHJpbmcoYWRkcmVzcywgYnVmLCBQTV9ORVRfQUREUl9TVFJJTkdf U0laRSk7Ci0gIGlmIChwclN0YXR1cyAhPSBQUl9TVUNDRVNTKSB7Ci0gICAgICBmcmVlKGJ1Zik7 Ci0gICAgICByZXR1cm4gTlVMTDsKLSAgfQotICByZXR1cm4gYnVmOworICAgIFBSU3RhdHVzCXBy U3RhdHVzOworICAgIGNoYXIJKmJ1ZiA9IG1hbGxvYyhQTV9ORVRfQUREUl9TVFJJTkdfU0laRSk7 CisKKyAgICBpZiAoYnVmID09IE5VTEwpCisJcmV0dXJuIHN0cmR1cCgidW5rbm93biIpOworICAg IHByU3RhdHVzID0gUFJfTmV0QWRkclRvU3RyaW5nKCZhZGRyZXNzLT5pbmFkZHIsIGJ1ZiwgUE1f TkVUX0FERFJfU1RSSU5HX1NJWkUpOworICAgIGlmIChwclN0YXR1cyAhPSBQUl9TVUNDRVNTKSB7 CisJZnJlZShidWYpOworCXJldHVybiBOVUxMOworICAgIH0KKyAgICByZXR1cm4gYnVmOwogfQog CiBpbnQKLV9fcG1TdHJpbmdUb0luQWRkcihjb25zdCBjaGFyICpjcCwgX19wbUluQWRkciAqaW5w KQorX19wbVN0cmluZ1RvSW5BZGRyKGNvbnN0IGNoYXIgKmNwLCBzdHJ1Y3QgX19wbUluQWRkciAq aW5wKQogewotICBQUlN0YXR1cyBwclN0YXR1cyA9IFBSX1N0cmluZ1RvTmV0QWRkcihjcCwgaW5w KTsKLSAgcmV0dXJuIHByU3RhdHVzID09IFBSX1NVQ0NFU1MgPyAxIDogMDsKKyAgICBQUlN0YXR1 cyBwclN0YXR1cyA9IFBSX1N0cmluZ1RvTmV0QWRkcihjcCwgJmlucC0+aW5hZGRyKTsKKyAgICBy ZXR1cm4gcHJTdGF0dXMgPT0gUFJfU1VDQ0VTUyA/IDEgOiAwOwogfQogCiBjaGFyICoKLV9fcG1T b2NrQWRkckluVG9TdHJpbmcoX19wbVNvY2tBZGRySW4gKmFkZHJlc3MpCitfX3BtU29ja0FkZHJJ blRvU3RyaW5nKHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqYWRkcmVzcykKIHsKLSAgcmV0dXJuIF9f cG1JbkFkZHJUb1N0cmluZyhhZGRyZXNzKTsKKyAgICByZXR1cm4gX19wbUluQWRkclRvU3RyaW5n KChzdHJ1Y3QgX19wbUluQWRkciAqKWFkZHJlc3MpOwogfQogCi0jZW5kaWYJLyogTlNTICovCisj ZW5kaWYJLyogSEFWRV9TRUNVUkVfU09DS0VUUyAqLwpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9z cmMvaXBjLmMgYi9zcmMvbGlicGNwL3NyYy9pcGMuYwppbmRleCA3OTdmZmFjLi4yNWRiMTdlIDEw MDY0NAotLS0gYS9zcmMvbGlicGNwL3NyYy9pcGMuYworKysgYi9zcmMvbGlicGNwL3NyYy9pcGMu YwpAQCAtMzMsMTQgKzMzLDEzIEBACiAgKgogICogSWYgTlNTL05TUFIgaXMgYXZhaWxhYmxlLCB0 aGVuIHdlIGFsc28ga2VlcCBOU1BSIGZpbGUgZGVzY3JpcHRvciBpbmZvcm1hdGlvbgogICogaGVy ZS4gVGhpcyBhbGxvd3MgdXMgdG8gaGFuZGxlIE5TUFIgc29ja2V0cyB3aGljaCBpbiB0dXJuIGFs bG93cyB1cyB0byBzdXBwb3J0Ci0gKiBTU0wvVExTLgorICogU1NML1RMUy4gIFRoaXMgaXMgaGFu ZGxlZCB0aHJvdWdoIGFuIG9wYXF1ZSBwb2ludGVyLCB0byByZXN0cmljdCB0aGUgZm9vdHByaW50 CisgKiBvZiBpbmNsdWRpbmcgTlNTL05TUFIgdHlwZXMgKGluY2x1ZGUgZmlsZXMpLgogICovCiB0 eXBlZGVmIHN0cnVjdCB7CiAgICAgaW50CQl2ZXJzaW9uOwkvKiBvbmUgb3IgdHdvICovCiAgICAg aW50CQlzb2NrZXQ7CQkvKiB0cnVlIG9yIGZhbHNlICovCi0jaWYgZGVmaW5lZChIQVZFX05TUykK LSAgICBQUkZpbGVEZXNjICpuc3ByRkQ7Ci0jZW5kaWYKKyAgICB2b2lkCSpkYXRhOwkJLyogYW4g b3BhcXVlIHBvaW50ZXIgKi8KIH0gX19wbUlQQzsKIAogc3RhdGljIGludAlfX3BtTGFzdFVzZWRG ZCA9IC1JTlRfTUFYOwpAQCAtMTc0LDE0ICsxNzMsMTMgQEAgX19wbVNvY2tldElQQyhpbnQgZmQp CiAgICAgcmV0dXJuIHN0czsKIH0KIAotI2lmIGRlZmluZWQoSEFWRV9OU1MpCiBpbnQKLV9fcG1T ZXROU1BSRmRJUEMoaW50IGZkLCBQUkZpbGVEZXNjICpuc3ByRkQpCitfX3BtU2V0RGF0YUlQQyhp bnQgZmQsIHZvaWQgKmRhdGEpCiB7Ci0gICAgaW50IHN0czsKKyAgICBpbnQJCXN0czsKIAogICAg IGlmIChwbURlYnVnICYgREJHX1RSQUNFX0NPTlRFWFQpCi0JZnByaW50ZihzdGRlcnIsICJfX3Bt U2V0U29ja2V0SVBDOiBmZD0lZFxuIiwgZmQpOworCWZwcmludGYoc3RkZXJyLCAiX19wbVNldERh dGFJUEM6IGZkPSVkIGRhdGE9JXBcbiIsIGZkLCBkYXRhKTsKIAogICAgIFBNX0lOSVRfTE9DS1Mo KTsKICAgICBQTV9MT0NLKF9fcG1Mb2NrX2xpYnBjcCk7CkBAIC0xOTAsNyArMTg4LDcgQEAgX19w bVNldE5TUFJGZElQQyhpbnQgZmQsIFBSRmlsZURlc2MgKm5zcHJGRCkKIAlyZXR1cm4gc3RzOwog ICAgIH0KIAotICAgIF9fcG1JUENUYWJsZVB0cltmZF0ubnNwckZEID0gbnNwckZEOworICAgIF9f cG1JUENUYWJsZVB0cltmZF0uZGF0YSA9IGRhdGE7CiAgICAgX19wbUxhc3RVc2VkRmQgPSBmZDsK IAogICAgIGlmIChwbURlYnVnICYgREJHX1RSQUNFX0NPTlRFWFQpCkBAIC0yMDAsMjMgKzE5OCwy MiBAQCBfX3BtU2V0TlNQUkZkSVBDKGludCBmZCwgUFJGaWxlRGVzYyAqbnNwckZEKQogICAgIHJl dHVybiBzdHM7CiB9CiAKLVBSRmlsZURlc2MgKgotX19wbU5TUFJGZElQQyhpbnQgZmQpCit2b2lk ICoKK19fcG1EYXRhSVBDKGludCBmZCkKIHsKLSAgICBQUkZpbGVEZXNjICpzdHM7CisgICAgdm9p ZAkqZGF0YTsKIAogICAgIFBNX0lOSVRfTE9DS1MoKTsKICAgICBQTV9MT0NLKF9fcG1Mb2NrX2xp YnBjcCk7CiAgICAgaWYgKF9fcG1JUENUYWJsZVB0ciA9PSBOVUxMIHx8IGZkIDwgMCB8fCBmZCA+ PSBpcGN0YWJsZXNpemUpIHsKIAlQTV9VTkxPQ0soX19wbUxvY2tfbGlicGNwKTsKLQlyZXR1cm4g MDsKKwlyZXR1cm4gTlVMTDsKICAgICB9Ci0gICAgc3RzID0gX19wbUlQQ1RhYmxlUHRyW2ZkXS5u c3ByRkQ7CisgICAgZGF0YSA9IF9fcG1JUENUYWJsZVB0cltmZF0uZGF0YTsKIAogICAgIFBNX1VO TE9DSyhfX3BtTG9ja19saWJwY3ApOwotICAgIHJldHVybiBzdHM7CisgICAgcmV0dXJuIGRhdGE7 CiB9Ci0jZW5kaWYgLyogZGVmaW5lZChIQVZFX05TUykgKi8KIAogLyoKICAqIENhbGxlZCBieSBs b2cgcmVhZGVycyB3aG8gbmVlZCB2ZXJzaW9uIGluZm8gZm9yIHJlc3VsdCBkZWNvZGUsCmRpZmYg LS1naXQgYS9zcmMvbGlicGNwL3NyYy9sb2djb25uZWN0LmMgYi9zcmMvbGlicGNwL3NyYy9sb2dj b25uZWN0LmMKaW5kZXggMjgzNzUwZS4uZGUwOGQzNCAxMDA2NDQKLS0tIGEvc3JjL2xpYnBjcC9z cmMvbG9nY29ubmVjdC5jCisrKyBiL3NyYy9saWJwY3Avc3JjL2xvZ2Nvbm5lY3QuYwpAQCAtNzQs OSArNzQsOCBAQCBfX3BtQ29ubmVjdExvZ2dlcihjb25zdCBjaGFyICpob3N0bmFtZSwgaW50ICpw aWQsIGludCAqcG9ydCkKIHsKICAgICBpbnQJCQluLCBzdHM7CiAgICAgX19wbUxvZ1BvcnQJCSps cHA7Ci0gICAgX19wbVNvY2tBZGRySW4JbXlBZGRyOwotICAgIF9fcG1Ib3N0RW50CQlzZXJ2aW5m bzsKLSAgICBjaGFyICAgICAgICpzZXJ2YnVmOworICAgIHN0cnVjdCBfX3BtU29ja0FkZHJJbiAq bXlBZGRyOworICAgIHN0cnVjdCBfX3BtSG9zdEVudAkqc2VydkluZm87CiAgICAgaW50CQkJZmQ7 CS8qIEZkIGZvciBzb2NrZXQgY29ubmVjdGlvbiB0byBwbWNkICovCiAgICAgX19wbVBEVQkJKnBi OwogICAgIF9fcG1QRFVIZHIJCSpwaHA7CkBAIC0xMzMsMzMgKzEzMiw0MCBAQCBfX3BtQ29ubmVj dExvZ2dlcihjb25zdCBjaGFyICpob3N0bmFtZSwgaW50ICpwaWQsIGludCAqcG9ydCkKICNlbmRp ZgogICAgIH0KIAotICAgIHNlcnZidWYgPSBfX3BtQWxsb2NIb3N0RW50QnVmZmVyKCk7CisgICAg c2VydkluZm8gPSBfX3BtQWxsb2NIb3N0RW50KCk7CisgICAgbXlBZGRyID0gX19wbUFsbG9jU29j a0FkZHJJbigpOworCiAgICAgUE1fSU5JVF9MT0NLUygpOwogICAgIFBNX0xPQ0soX19wbUxvY2tf bGlicGNwKTsKLSAgICBpZiAoX19wbUdldEhvc3RCeU5hbWUoaG9zdG5hbWUsICZzZXJ2aW5mbywg c2VydmJ1ZikgPT0gTlVMTCkgeworICAgIGlmIChfX3BtR2V0SG9zdEJ5TmFtZShob3N0bmFtZSwg c2VydkluZm8pID09IE5VTEwpIHsKICNpZmRlZiBQQ1BfREVCVUcKIAlpZiAocG1EZWJ1ZyAmIERC R19UUkFDRV9DT05URVhUKQogCSAgICBmcHJpbnRmKHN0ZGVyciwgIl9fcG1Db25uZWN0TG9nZ2Vy OiBnZXRob3N0YnluYW1lOiAlc1xuIiwKIAkJICAgIGhvc3RzdHJlcnJvcigpKTsKICNlbmRpZgog CVBNX1VOTE9DSyhfX3BtTG9ja19saWJwY3ApOwotCV9fcG1GcmVlSG9zdEVudEJ1ZmZlcihzZXJ2 YnVmKTsKKwlfX3BtRnJlZVNvY2tBZGRySW4obXlBZGRyKTsKKwlfX3BtRnJlZUhvc3RFbnQoc2Vy dkluZm8pOwogCXJldHVybiAtRUNPTk5SRUZVU0VEOwogICAgIH0KIAogICAgIC8qIENyZWF0ZSBz b2NrZXQgYW5kIGF0dGVtcHQgdG8gY29ubmVjdCB0byB0aGUgcG1sb2dnZXIgY29udHJvbCBwb3J0 ICovCiAgICAgaWYgKChmZCA9IF9fcG1DcmVhdGVTb2NrZXQoKSkgPCAwKSB7CiAJUE1fVU5MT0NL KF9fcG1Mb2NrX2xpYnBjcCk7Ci0JX19wbUZyZWVIb3N0RW50QnVmZmVyKHNlcnZidWYpOworCV9f cG1GcmVlU29ja0FkZHJJbihteUFkZHIpOworCV9fcG1GcmVlSG9zdEVudChzZXJ2SW5mbyk7CiAJ cmV0dXJuIGZkOwogICAgIH0KIAotICAgIF9fcG1Jbml0U29ja0FkZHIoJm15QWRkciwgMCwgaHRv bnMoKnBvcnQpKTsKLSAgICBfX3BtU2V0U29ja0FkZHIoJm15QWRkciwgJnNlcnZpbmZvKTsKKyAg ICBfX3BtSW5pdFNvY2tBZGRyKG15QWRkciwgMCwgaHRvbnMoKnBvcnQpKTsKKyAgICBfX3BtU2V0 U29ja0FkZHIobXlBZGRyLCBzZXJ2SW5mbyk7CiAgICAgUE1fVU5MT0NLKF9fcG1Mb2NrX2xpYnBj cCk7Ci0gICAgX19wbUZyZWVIb3N0RW50QnVmZmVyKHNlcnZidWYpOwogCi0gICAgc3RzID0gX19w bUNvbm5lY3QoZmQsIChfX3BtU29ja0FkZHIgKikmbXlBZGRyLCBzaXplb2YobXlBZGRyKSk7Cisg ICAgc3RzID0gX19wbUNvbm5lY3QoZmQsIG15QWRkciwgX19wbVNvY2tBZGRySW5TaXplKCkpOwor CisgICAgX19wbUZyZWVTb2NrQWRkckluKG15QWRkcik7CisgICAgX19wbUZyZWVIb3N0RW50KHNl cnZJbmZvKTsKKwogICAgIGlmIChzdHMgPCAwKSB7CiAJc3RzID0gLW5ldGVycm9yKCk7CiAJX19w bUNsb3NlU29ja2V0KGZkKTsKZGlmZiAtLWdpdCBhL3NyYy9saWJwY3BfZ3VpL3NyYy90aW1lY2xp ZW50LmMgYi9zcmMvbGlicGNwX2d1aS9zcmMvdGltZWNsaWVudC5jCmluZGV4IGNjNGMwNzkuLmU2 MGViYjkgMTAwNjQ0Ci0tLSBhL3NyYy9saWJwY3BfZ3VpL3NyYy90aW1lY2xpZW50LmMKKysrIGIv c3JjL2xpYnBjcF9ndWkvc3JjL3RpbWVjbGllbnQuYwpAQCAtNDgsNyArNDgsNyBAQCBwbVNlcnZl ckV4ZWMoaW50IGZkLCBpbnQgbGl2ZW1vZGUpCiBzdGF0aWMgaW50CiBwbUNvbm5lY3RIYW5kc2hh a2UoaW50IGZkLCBpbnQgcG9ydCwgcG1UaW1lICpwa3QpCiB7Ci0gICAgX19wbVNvY2tBZGRySW4g bXlhZGRyOworICAgIHN0cnVjdCBfX3BtU29ja0FkZHJJbiAqbXlhZGRyOwogICAgIGNoYXIgYnVm ZmVyWzQwOTZdOwogICAgIHBtVGltZSAqYWNrOwogICAgIGludCBzdHM7CkBAIC01NywxMSArNTcs MTggQEAgcG1Db25uZWN0SGFuZHNoYWtlKGludCBmZCwgaW50IHBvcnQsIHBtVGltZSAqcGt0KQog ICAgICAqIENvbm5lY3QgdG8gcG10aW1lIC0gcG10aW1lIGd1YXJhbnRlZWQgc3RhcnRlZCBieSBu b3csIGR1ZSB0byB0aGUKICAgICAgKiBwb3J0IG51bWJlciByZWFkKDIpIGVhcmxpZXIsIG9yIC1w IG9wdGlvbiAoc28gbm8gcmFjZSB0aGVyZSkuCiAgICAgICovCi0gICAgX19wbUluaXRTb2NrQWRk cigmbXlhZGRyLCBodG9ubChJTkFERFJfTE9PUEJBQ0spLCBodG9ucyhwb3J0KSk7Ci0gICAgaWYg KChzdHMgPSBfX3BtQ29ubmVjdChmZCwgKF9fcG1Tb2NrQWRkciAqKSZteWFkZHIsIHNpemVvZiht eWFkZHIpKSkgPCAwKSB7CisgICAgaWYgKChteWFkZHIgPSBfX3BtQWxsb2NTb2NrQWRkckluKCkp ID09IE5VTEwpIHsKKwlzZXRvc2Vycm9yKEVOT01FTSk7CisJZ290byBlcnJvcjsKKyAgICB9CisK KyAgICBfX3BtSW5pdFNvY2tBZGRyKG15YWRkciwgaHRvbmwoSU5BRERSX0xPT1BCQUNLKSwgaHRv bnMocG9ydCkpOworICAgIGlmICgoc3RzID0gX19wbUNvbm5lY3QoZmQsICh2b2lkICopbXlhZGRy LCBfX3BtU29ja0FkZHJJblNpemUoKSkpIDwgMCkgewogCXNldG9zZXJyb3IobmV0ZXJyb3IoKSk7 CiAJZ290byBlcnJvcjsKICAgICB9CisgICAgX19wbUZyZWVTb2NrQWRkckluKG15YWRkcik7Cisg ICAgbXlhZGRyID0gTlVMTDsKIAogICAgIC8qCiAgICAgICogV3JpdGUgdGhlIHBhY2tldCwgdGhl biB3YWl0IGZvciBhbiBBQ0suCkBAIC05Miw2ICs5OSw4IEBAIHBtQ29ubmVjdEhhbmRzaGFrZShp bnQgZmQsIGludCBwb3J0LCBwbVRpbWUgKnBrdCkKICAgICByZXR1cm4gMDsKIAogZXJyb3I6Cisg ICAgaWYgKG15YWRkcikKKwlfX3BtRnJlZVNvY2tBZGRySW4obXlhZGRyKTsKICAgICBfX3BtQ2xv c2VTb2NrZXQoZmQpOwogICAgIHJldHVybiAtMTsKIH0KZGlmZiAtLWdpdCBhL3NyYy9saWJwY3Bf cG1jZC9zcmMvY2xpZW50LmMgYi9zcmMvbGlicGNwX3BtY2Qvc3JjL2NsaWVudC5jCmluZGV4IGYx ODQwODYuLmE3YzM0M2UgMTAwNjQ0Ci0tLSBhL3NyYy9saWJwY3BfcG1jZC9zcmMvY2xpZW50LmMK KysrIGIvc3JjL2xpYnBjcF9wbWNkL3NyYy9jbGllbnQuYwpAQCAtMjksMjQgKzI5LDI0IEBAIHZv aWQKIFNob3dDbGllbnRzKEZJTEUgKmYpCiB7CiAgICAgaW50CQkJaTsKLSAgICBfX3BtSG9zdEVu dAkJaDsKLSAgICBjaGFyCQkqaGJ1ZiwgKnNidWY7CisgICAgc3RydWN0IF9fcG1Ib3N0RW50CSpo b3N0OworICAgIGNoYXIJCSpzYnVmOwogCiAgICAgZnByaW50ZihmLCAiICAgICBmZCAgY2xpZW50 IGNvbm5lY3Rpb24gZnJvbSAgICAgICAgICAgICAgICAgICAgaXBjIHZlciAgb3BlcmF0aW9ucyBk ZW5pZWRcbiIpOwogICAgIGZwcmludGYoZiwgIiAgICAgPT0gID09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0gID09PT09PT0gID09PT09PT09PT09PT09PT09XG4iKTsKLSAg ICBoYnVmID0gX19wbUFsbG9jSG9zdEVudEJ1ZmZlcigpOworICAgIGhvc3QgPSBfX3BtQWxsb2NI b3N0RW50KCk7CiAgICAgZm9yIChpID0gMDsgaSA8IG5DbGllbnRzOyBpKyspIHsKIAlpZiAoY2xp ZW50W2ldLnN0YXR1cy5jb25uZWN0ZWQgPT0gMCkKIAkgICAgY29udGludWU7CiAKIAlmcHJpbnRm KGYsICIgICAgJTNkICAiLCBjbGllbnRbaV0uZmQpOwogCi0JaWYgKF9fcG1HZXRIb3N0QnlBZGRy KCZjbGllbnRbaV0uYWRkciwgJmgsIGhidWYpID09IE5VTEwpIHsKKwlpZiAoX19wbUdldEhvc3RC eUFkZHIoJmNsaWVudFtpXS5hZGRyLCBob3N0KSA9PSBOVUxMKSB7CiAJICAgIHNidWYgPSBfX3Bt U29ja0FkZHJJblRvU3RyaW5nKCZjbGllbnRbaV0uYWRkcik7CiAJICAgIGZwcmludGYoZiwgIiVz Iiwgc2J1Zik7CiAJICAgIGZyZWUoc2J1Zik7CiAJfSBlbHNlIHsKLQkgICAgZnByaW50ZihmLCAi JS00MC40MHMiLCBoLmhfbmFtZSk7CisJICAgIGZwcmludGYoZiwgIiUtNDAuNDBzIiwgX19wbUhv c3RFbnROYW1lKGhvc3QpKTsKIAl9CiAJZnByaW50ZihmLCAiICAlN2QiLCBfX3BtVmVyc2lvbklQ QyhjbGllbnRbaV0uZmQpKTsKIApAQCAtNjAsNiArNjAsNiBAQCBTaG93Q2xpZW50cyhGSUxFICpm KQogCiAJZnB1dGMoJ1xuJywgZik7CiAgICAgfQotICAgIF9fcG1GcmVlSG9zdEVudEJ1ZmZlciho YnVmKTsKKyAgICBfX3BtRnJlZUhvc3RFbnQoaG9zdCk7CiAgICAgZnB1dGMoJ1xuJywgZik7CiB9 CmRpZmYgLS1naXQgYS9zcmMvbGlicGNwX3BtZGEvc3JjL29wZW4uYyBiL3NyYy9saWJwY3BfcG1k YS9zcmMvb3Blbi5jCmluZGV4IDU1ODYxMWMuLjQ3YWUyYjggMTAwNjQ0Ci0tLSBhL3NyYy9saWJw Y3BfcG1kYS9zcmMvb3Blbi5jCisrKyBiL3NyYy9saWJwY3BfcG1kYS9zcmMvb3Blbi5jCkBAIC0z NSw4ICszNSw4IEBAIF9fcG1kYU9wZW5JbmV0KGNoYXIgKnNvY2tuYW1lLCBpbnQgbXlwb3J0LCBp bnQgKmluZmQsIGludCAqb3V0ZmQpCiB7CiAgICAgaW50CQkJc3RzOwogICAgIGludAkJCXNmZDsK LSAgICBfX3BtU29ja0FkZHJJbglteWFkZHI7Ci0gICAgX19wbVNvY2tBZGRySW4JZnJvbTsKKyAg ICBzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKm15YWRkcjsKKyAgICBzdHJ1Y3QgX19wbVNvY2tBZGRy SW4gKmZyb207CiAgICAgc3RydWN0IHNlcnZlbnQJKnNlcnZpY2U7CiAgICAgX19wbVNvY2tMZW4J CWFkZHJsZW47CiAgICAgaW50CQkJb25lID0gMTsKQEAgLTc4LDggKzc4LDEyIEBAIF9fcG1kYU9w ZW5JbmV0KGNoYXIgKnNvY2tuYW1lLCBpbnQgbXlwb3J0LCBpbnQgKmluZmQsIGludCAqb3V0ZmQp CiAgICAgfQogI2VuZGlmCiAKLSAgICBfX3BtSW5pdFNvY2tBZGRyKCZteWFkZHIsIGh0b25sKElO QUREUl9BTlkpLCBodG9ucyhteXBvcnQpKTsKLSAgICBzdHMgPSBfX3BtQmluZChzZmQsIChfX3Bt U29ja0FkZHIqKSAmbXlhZGRyLCBzaXplb2YobXlhZGRyKSk7CisgICAgaWYgKChteWFkZHIgPV9f cG1BbGxvY1NvY2tBZGRySW4oKSkgPT0gTlVMTCkgeworCV9fcG1Ob3RpZnlFcnIoTE9HX0NSSVQs ICJfX3BtZGFPcGVuSW5ldDogc29jayBhZGRyIGFsbG9jIGZhaWxlZFxuIik7CisJZXhpdCgxKTsK KyAgICB9CisgICAgX19wbUluaXRTb2NrQWRkcihteWFkZHIsIGh0b25sKElOQUREUl9BTlkpLCBo dG9ucyhteXBvcnQpKTsKKyAgICBzdHMgPSBfX3BtQmluZChzZmQsICh2b2lkICopbXlhZGRyLCBf X3BtU29ja0FkZHJJblNpemUoKSk7CiAgICAgaWYgKHN0cyA8IDApIHsKIAlfX3BtTm90aWZ5RXJy KExPR19DUklULCAiX19wbWRhT3BlbkluZXQ6IGluZXQgYmluZDogJXNcbiIsCiAJCQluZXRzdHJl cnJvcigpKTsKQEAgLTkyLDE1ICs5NiwxOCBAQCBfX3BtZGFPcGVuSW5ldChjaGFyICpzb2NrbmFt ZSwgaW50IG15cG9ydCwgaW50ICppbmZkLCBpbnQgKm91dGZkKQogCQkJbmV0c3RyZXJyb3IoKSk7 CiAJZXhpdCgxKTsKICAgICB9Ci0gICAgYWRkcmxlbiA9IHNpemVvZihmcm9tKTsKKyAgICBmcm9t ID0gbXlhZGRyOworICAgIGFkZHJsZW4gPSBfX3BtU29ja0FkZHJJblNpemUoKTsKICAgICAvKiBi bG9jayBoZXJlLCB3YWl0aW5nIGZvciBhIGNvbm5lY3Rpb24gKi8KLSAgICBpZiAoKCppbmZkID0g X19wbUFjY2VwdChzZmQsIChfX3BtU29ja0FkZHIgKikmZnJvbSwgJmFkZHJsZW4pKSA8IDApIHsK KyAgICBpZiAoKCppbmZkID0gX19wbUFjY2VwdChzZmQsICh2b2lkICopZnJvbSwgJmFkZHJsZW4p KSA8IDApIHsKIAlfX3BtTm90aWZ5RXJyKExPR19DUklULCAiX19wbWRhT3BlbkluZXQ6IGluZXQg YWNjZXB0OiAlc1xuIiwKIAkJCW5ldHN0cmVycm9yKCkpOwogCWV4aXQoMSk7CiAgICAgfQogICAg IF9fcG1DbG9zZVNvY2tldChzZmQpOwogICAgIF9fcG1TZXRTb2NrZXRJUEMoKmluZmQpOworICAg IF9fcG1GcmVlU29ja0FkZHJJbihteWFkZHIpOworCiAgICAgKm91dGZkID0gKmluZmQ7CiB9CiAK ZGlmZiAtLWdpdCBhL3NyYy9wZXJsL1BNREEvbG9jYWwuYyBiL3NyYy9wZXJsL1BNREEvbG9jYWwu YwppbmRleCBhMDQ3NmU4Li4yZmFjZGEwIDEwMDY0NAotLS0gYS9zcmMvcGVybC9QTURBL2xvY2Fs LmMKKysrIGIvc3JjL3BlcmwvUE1EQS9sb2NhbC5jCkBAIC0xODgsNyArMTg4LDcgQEAgbG9jYWxf c29jayhjaGFyICpob3N0LCBpbnQgcG9ydCwgc2NhbGFyX3QgKmNhbGxiYWNrLCBpbnQgY29va2ll KQogICAgIG15YWRkci5zaW5fZmFtaWx5ID0gQUZfSU5FVDsKICAgICBtZW1jcHkoJm15YWRkci5z aW5fYWRkciwgc2VydmluZm8tPmhfYWRkciwgc2VydmluZm8tPmhfbGVuZ3RoKTsKICAgICBteWFk ZHIuc2luX3BvcnQgPSBodG9ucyhwb3J0KTsKLSAgICBpZiAoX19wbUNvbm5lY3QoZmQsIChfX3Bt U29ja0FkZHIgKikmbXlhZGRyLCBzaXplb2YobXlhZGRyKSkgPCAwKSB7CisgICAgaWYgKF9fcG1D b25uZWN0KGZkLCAodm9pZCAqKSZteWFkZHIsIHNpemVvZihteWFkZHIpKSA8IDApIHsKIAlfX3Bt Tm90aWZ5RXJyKExPR19FUlIsICJfX3BtQ29ubmVjdCAoJXMpOiAlcyIsIGhvc3QsIG5ldHN0cmVy cm9yKCkpOwogCWV4aXQoMSk7CiAgICAgfQpAQCAtMjgxLDMwICsyODEsMzMgQEAgbG9jYWxfbG9n X3JvdGF0ZWQoZmlsZXNfdCAqZmlsZSkKIHN0YXRpYyB2b2lkCiBsb2NhbF9yZWNvbm5lY3Rvcihm aWxlc190ICpmaWxlKQogewotICAgIF9fcG1Tb2NrQWRkckluIG15YWRkcjsKLSAgICBfX3BtSG9z dEVudCBzZXJ2aW5mbzsKLSAgICBjaGFyICAgICAgICpzZXJ2YnVmOworICAgIHN0cnVjdCBfX3Bt U29ja0FkZHJJbiAqbXlhZGRyID0gTlVMTDsKKyAgICBzdHJ1Y3QgX19wbUhvc3RFbnQgKnNlcnZp bmZvID0gTlVMTDsKICAgICBpbnQgZmQ7CiAKICAgICBpZiAoZmlsZS0+ZmQgPj0gMCkJCS8qIHJl Y29ubmVjdC1uZWVkZWQgZmxhZyAqLwotCXJldHVybjsKLSAgICBzZXJ2YnVmID0gX19wbUFsbG9j SG9zdEVudEJ1ZmZlcigpOwotICAgIGlmIChfX3BtR2V0SG9zdEJ5TmFtZShmaWxlLT5tZS5zb2Nr Lmhvc3QsICZzZXJ2aW5mbywgc2VydmJ1ZikgPT0gTlVMTCkgewotCV9fcG1GcmVlSG9zdEVudEJ1 ZmZlcihzZXJ2YnVmKTsKLQlyZXR1cm47Ci0gICAgfQotICAgIGlmICgoZmQgPSBfX3BtQ3JlYXRl U29ja2V0KCkpIDwgMCkgewotCV9fcG1GcmVlSG9zdEVudEJ1ZmZlcihzZXJ2YnVmKTsKLQlyZXR1 cm47Ci0gICAgfQotICAgIF9fcG1Jbml0U29ja0FkZHIoJm15YWRkciwgMCwgaHRvbnMoZmlsZXMt Pm1lLnNvY2sucG9ydCkpOwotICAgIF9fcG1TZXRTb2NrQWRkcigmbXlhZGRyLCAmc2VydmluZm8p OwotICAgIF9fcG1GcmVlSG9zdEVudEJ1ZmZlcihzZXJ2YnVmKTsKLSAgICBpZiAoX19wbUNvbm5l Y3QoZmQsIChfX3BtU29ja0FkZHIgKikmbXlhZGRyLCBzaXplb2YobXlhZGRyKSkgPCAwKSB7CisJ Z290byBkb25lOworICAgIGlmICgobXlhZGRyID0gX19wbUFsbG9jU29ja0FkZHJJbigpKSA9PSBO VUxMKQorCWdvdG8gZG9uZTsKKyAgICBpZiAoKHNlcnZpbmZvID0gX19wbUFsbG9jSG9zdEVudCgp KSA9PSBOVUxMKQorCWdvdG8gZG9uZTsKKyAgICBpZiAoX19wbUdldEhvc3RCeU5hbWUoZmlsZS0+ bWUuc29jay5ob3N0LCBzZXJ2aW5mbykgPT0gTlVMTCkKKwlnb3RvIGRvbmU7CisgICAgaWYgKChm ZCA9IF9fcG1DcmVhdGVTb2NrZXQoKSkgPCAwKQorCWdvdG8gZG9uZTsKKyAgICBfX3BtSW5pdFNv Y2tBZGRyKG15YWRkciwgMCwgaHRvbnMoZmlsZXMtPm1lLnNvY2sucG9ydCkpOworICAgIF9fcG1T ZXRTb2NrQWRkcihteWFkZHIsIHNlcnZpbmZvKTsKKyAgICBpZiAoX19wbUNvbm5lY3QoZmQsICh2 b2lkICopbXlhZGRyLCBfX3BtU29ja0FkZHJJblNpemUoKSkgPCAwKSB7CiAJX19wbUNsb3NlU29j a2V0KGZkKTsKLQlyZXR1cm47CisJZ290byBkb25lOwogICAgIH0KICAgICBmaWxlcy0+ZmQgPSBm ZDsKKworZG9uZToKKyAgICBpZiAobXlhZGRyKQorCV9fcG1GcmVlU29ja0FkZHJJbihteWFkZHIp OworICAgIGlmIChzZXJ2aW5mbykKKwlfX3BtRnJlZUhvc3RFbnQoc2VydmluZm8pOwogfQogCiBz dGF0aWMgdm9pZApkaWZmIC0tZ2l0IGEvc3JjL3BtY2Qvc3JjL2NsaWVudC5jIGIvc3JjL3BtY2Qv c3JjL2NsaWVudC5jCmluZGV4IDNiZDBjZDIuLjQ5YzRhOGMgMTAwNjQ0Ci0tLSBhL3NyYy9wbWNk L3NyYy9jbGllbnQuYworKysgYi9zcmMvcG1jZC9zcmMvY2xpZW50LmMKQEAgLTg3LDggKzg3LDgg QEAgQWNjZXB0TmV3Q2xpZW50KGludCByZXFmZCkKICAgICBzdHJ1Y3QgdGltZXZhbAlub3c7CiAK ICAgICBpID0gTmV3Q2xpZW50KCk7Ci0gICAgYWRkcmxlbiA9IHNpemVvZihjbGllbnRbaV0uYWRk cik7Ci0gICAgZmQgPSBfX3BtQWNjZXB0KHJlcWZkLCAoX19wbVNvY2tBZGRyICopJmNsaWVudFtp XS5hZGRyLCAmYWRkcmxlbik7CisgICAgYWRkcmxlbiA9IF9fcG1Tb2NrQWRkckluU2l6ZSgpOwor ICAgIGZkID0gX19wbUFjY2VwdChyZXFmZCwgKHZvaWQgKiljbGllbnRbaV0uYWRkciwgJmFkZHJs ZW4pOwogICAgIGlmIChmZCA9PSAtMSkgewogICAgIAlpZiAobmV0ZXJyb3IoKSA9PSBFUEVSTSkg ewogCSAgICBfX3BtTm90aWZ5RXJyKExPR19OT1RJQ0UsICJBY2NlcHROZXdDbGllbnQoJWQpOiAi CkBAIC0xMjgsMTEgKzEyOCwyMyBAQCBBY2NlcHROZXdDbGllbnQoaW50IHJlcWZkKQogICAgIGlm IChwbURlYnVnICYgREJHX1RSQUNFX0FQUEwwKQogCWZwcmludGYoc3RkZXJyLCAiQWNjZXB0TmV3 Q2xpZW50KCVkKTogY2xpZW50WyVkXSAoZmQgJWQpXG4iLCByZXFmZCwgaSwgZmQpOwogI2VuZGlm Ci0gICAgcG1jZF90cmFjZShUUl9BRERfQ0xJRU5ULCBfX3BtU29ja0FkZHJJblRvSVBBZGRyKCZj bGllbnRbaV0uYWRkciksIGZkLCBjbGllbnRbaV0uc2VxKTsKKyAgICBwbWNkX3RyYWNlKFRSX0FE RF9DTElFTlQsIENsaWVudElQQWRkcigmY2xpZW50W2ldKSwgZmQsIGNsaWVudFtpXS5zZXEpOwog CiAgICAgcmV0dXJuICZjbGllbnRbaV07CiB9CiAKK3N0cnVjdCBfX3BtU29ja0FkZHJJbiAqCitD bGllbnRBZGRyKENsaWVudEluZm8gKmNwKQoreworICAgIHJldHVybiAoc3RydWN0IF9fcG1Tb2Nr QWRkckluICopICZjcC0+YWRkclswXTsKK30KKworX19wbUlQQWRkcgorQ2xpZW50SVBBZGRyKENs aWVudEluZm8gKmNwKQoreworICAgIHJldHVybiBfX3BtU29ja0FkZHJJblRvSVBBZGRyKENsaWVu dEFkZHIoY3ApKTsKK30KKwogaW50CiBOZXdDbGllbnQodm9pZCkKIHsKQEAgLTE0NCw5ICsxNTYs MTAgQEAgTmV3Q2xpZW50KHZvaWQpCiAKICAgICBpZiAoaSA9PSBjbGllbnRTaXplKSB7CiAJaW50 CWo7CisKIAljbGllbnRTaXplID0gY2xpZW50U2l6ZSA/IGNsaWVudFNpemUgKiAyIDogTUlOX0NM SUVOVFNfQUxMT0M7CiAJY2xpZW50ID0gKENsaWVudEluZm8qKQotCSAgICByZWFsbG9jKGNsaWVu dCwgc2l6ZW9mKENsaWVudEluZm8pICogY2xpZW50U2l6ZSk7CisJICAgIHJlYWxsb2MoY2xpZW50 LCAoc2l6ZW9mKENsaWVudEluZm8pK19fcG1Tb2NrQWRkckluU2l6ZSgpKSAqIGNsaWVudFNpemUp OwogCWlmIChjbGllbnQgPT0gTlVMTCkgewogCSAgICBfX3BtTm9NZW0oIk5ld0NsaWVudCIsIHNp emVvZihDbGllbnRJbmZvKSAqIGNsaWVudFNpemUsIFBNX1JFQ09WX0VSUik7CiAJICAgIFNodXRk b3duKCk7CmRpZmYgLS1naXQgYS9zcmMvcG1jZC9zcmMvY2xpZW50LmggYi9zcmMvcG1jZC9zcmMv Y2xpZW50LmgKaW5kZXggZjdhZTYxNC4uYzE4NTQ2MiAxMDA2NDQKLS0tIGEvc3JjL3BtY2Qvc3Jj L2NsaWVudC5oCisrKyBiL3NyYy9wbWNkL3NyYy9jbGllbnQuaApAQCAtMjMsNyArMjMsNiBAQAog LyogVGhlIHRhYmxlIG9mIGNsaWVudHMsIHVzZWQgYnkgcG1jZCAqLwogdHlwZWRlZiBzdHJ1Y3Qg ewogICAgIGludAkJCWZkOwkJLyogU29ja2V0IGRlc2NyaXB0b3IgKi8KLSAgICBfX3BtU29ja0Fk ZHJJbglhZGRyOwkJLyogQWRkcmVzcyBvZiBjbGllbnQgKi8KICAgICBzdHJ1Y3QgewkJCQkvKiBT dGF0dXMgb2YgY29ubmVjdGlvbiB0byBjbGllbnQgKi8KIAl1bnNpZ25lZCBpbnQJY29ubmVjdGVk IDogMTsJLyogQ2xpZW50IGNvbm5lY3RlZCAqLwogCXVuc2lnbmVkIGludAljaGFuZ2VzIDogMzsJ LyogUE1DRF8qIGJpdHMgZm9yIGNoYW5nZXMgc2luY2UgbGFzdCBmZXRjaCAqLwpAQCAtMzgsNiAr MzcsNyBAQCB0eXBlZGVmIHN0cnVjdCB7CiAgICAgX19wbVBEVUluZm8JCXBkdUluZm87CiAgICAg dW5zaWduZWQgaW50CXNlcTsJCS8qIGNsaWVudCBzZXF1ZW5jZSBudW1iZXIgKi8KICAgICB0aW1l X3QJCXN0YXJ0OwkJLyogdGltZSBjbGllbnQgY29ubmVjdGVkICovCisgICAgY2hhcgkJYWRkclsw XTsJLyogQWRkcmVzcyBvZiBjbGllbnQgW3NpemUoX19wbVNvY2tBZGRySW4pXSAqLwogfSBDbGll bnRJbmZvOwogCiBQTUNEX0VYVEVSTiBDbGllbnRJbmZvCSpjbGllbnQ7CQkvKiBBcnJheSBvZiBj bGllbnRzICovCkBAIC01MCw2ICs1MCw4IEBAIFBNQ0RfRVhURVJOIGludAkJdGhpc19jbGllbnRf aWQ7CQkvKiBjbGllbnQgZm9yIGN1cnJlbnQgcmVxdWVzdCAqLwogZXh0ZXJuIENsaWVudEluZm8g KkFjY2VwdE5ld0NsaWVudChpbnQpOwogZXh0ZXJuIGludCBOZXdDbGllbnQodm9pZCk7CiBleHRl cm4gdm9pZCBEZWxldGVDbGllbnQoQ2xpZW50SW5mbyAqKTsKK2V4dGVybiBzdHJ1Y3QgX19wbVNv Y2tBZGRySW4gKkNsaWVudEFkZHIoQ2xpZW50SW5mbyAqKTsKK2V4dGVybiBfX3BtSVBBZGRyIENs aWVudElQQWRkcihDbGllbnRJbmZvICopOwogUE1DRF9FWFRFUk4gdm9pZCBTaG93Q2xpZW50cyhG SUxFICptKTsKIAogI2lmZGVmIFBDUF9ERUJVRwpkaWZmIC0tZ2l0IGEvc3JjL3BtY2Qvc3JjL2Nv bmZpZy5jIGIvc3JjL3BtY2Qvc3JjL2NvbmZpZy5jCmluZGV4IDBhNWJiM2YuLmY3Nzc3ZTYgMTAw NjQ0Ci0tLSBhL3NyYy9wbWNkL3NyYy9jb25maWcuYworKysgYi9zcmMvcG1jZC9zcmMvY29uZmln LmMKQEAgLTEzMjEsMjcgKzEzMjEsMzkgQEAgQ29ubmVjdFNvY2tldEFnZW50KEFnZW50SW5mbyAq YVB0cikKICAgICBpbnQJCWZkOwogCiAgICAgaWYgKGFQdHItPmlwYy5zb2NrZXQuYWRkckRvbWFp biA9PSBBRl9JTkVUKSB7Ci0JX19wbVNvY2tBZGRySW4gYWRkcjsKLQlfX3BtSG9zdEVudCBob3N0 SW5mbzsKLQljaGFyICpoaWJ1ZjsKKwlzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKmFkZHI7CisJc3Ry dWN0IF9fcG1Ib3N0RW50ICpob3N0OworCisJaWYgKChob3N0ID0gX19wbUFsbG9jSG9zdEVudCgp KSA9PSBOVUxMKSB7CisJICAgIGZwdXRzKCJwbWNkOiBFcnJvciBhbGxvY2luZyBob3N0IGVudHJ5 XG4iLCBzdGRlcnIpOworCSAgICByZXR1cm4gLTE7CisJfQorCWlmICgoYWRkciA9IF9fcG1BbGxv Y1NvY2tBZGRySW4oKSkgPT0gTlVMTCkgeworCSAgICBmcHV0cygicG1jZDogRXJyb3IgYWxsb2Np bmcgc29jayBhZGRyXG4iLCBzdGRlcnIpOworCSAgICBfX3BtRnJlZUhvc3RFbnQoaG9zdCk7CisJ ICAgIHJldHVybiAtMTsKKwl9CiAKIAlmZCA9IF9fcG1DcmVhdGVTb2NrZXQoKTsKIAlpZiAoZmQg PCAwKSB7CiAJICAgIGZwcmludGYoc3RkZXJyLAogCQkgICAgICJwbWNkOiBFcnJvciBjcmVhdGlu ZyBzb2NrZXQgZm9yIFwiJXNcIiBhZ2VudCA6ICVzXG4iLAogCQkgICAgIGFQdHItPnBtRG9tYWlu TGFiZWwsIG5ldHN0cmVycm9yKCkpOworCSAgICBfX3BtRnJlZVNvY2tBZGRySW4oYWRkcik7CisJ ICAgIF9fcG1GcmVlSG9zdEVudChob3N0KTsKIAkgICAgcmV0dXJuIC0xOwogCX0KLQloaWJ1ZiA9 IF9fcG1BbGxvY0hvc3RFbnRCdWZmZXIoKTsKLQlpZiAoX19wbUdldEhvc3RCeU5hbWUoImxvY2Fs aG9zdCIsICZob3N0SW5mbywgaGlidWYpID09IE5VTEwpIHsKKwlpZiAoX19wbUdldEhvc3RCeU5h bWUoImxvY2FsaG9zdCIsIGhvc3QpID09IE5VTEwpIHsKIAkgICAgZnB1dHMoInBtY2Q6IEVycm9y IGdldHRpbmcgaW5ldCBhZGRyZXNzIGZvciBsb2NhbGhvc3RcbiIsIHN0ZGVycik7Ci0JICAgIF9f cG1GcmVlSG9zdEVudEJ1ZmZlcihoaWJ1Zik7CisJICAgIF9fcG1GcmVlU29ja0FkZHJJbihhZGRy KTsKKwkgICAgX19wbUZyZWVIb3N0RW50KGhvc3QpOwogCSAgICBnb3RvIGVycm9yOwogCX0KLQlf X3BtSW5pdFNvY2tBZGRyKCZhZGRyLCAwLCBodG9ucyhhUHRyLT5pcGMuc29ja2V0LnBvcnQpKTsK LQlfX3BtU2V0U29ja0FkZHIoJmFkZHIsICZob3N0SW5mbyk7Ci0JX19wbUZyZWVIb3N0RW50QnVm ZmVyKGhpYnVmKTsKLQlzdHMgPSBfX3BtQ29ubmVjdChmZCwgKF9fcG1Tb2NrQWRkciAqKSAmYWRk ciwgc2l6ZW9mKGFkZHIpKTsKKwlfX3BtSW5pdFNvY2tBZGRyKGFkZHIsIDAsIGh0b25zKGFQdHIt PmlwYy5zb2NrZXQucG9ydCkpOworCV9fcG1TZXRTb2NrQWRkcihhZGRyLCBob3N0KTsKKwlzdHMg PSBfX3BtQ29ubmVjdChmZCwgKHZvaWQgKilhZGRyLCBfX3BtU29ja0FkZHJJblNpemUoKSk7CisJ X19wbUZyZWVTb2NrQWRkckluKGFkZHIpOworCV9fcG1GcmVlSG9zdEVudChob3N0KTsKICAgICB9 CiAgICAgZWxzZSB7CiAjaWYgZGVmaW5lZChIQVZFX1NZU19VTl9IKQpAQCAtMjI3MCw3ICsyMjgy LDcgQEAgUGFyc2VSZXN0YXJ0QWdlbnRzKGNoYXIgKmZpbGVOYW1lKQogCUNsaWVudEluZm8JKmNw ID0gJmNsaWVudFtpXTsKIAlpbnQJCXM7CiAKLQlpZiAoKHMgPSBfX3BtQWNjQWRkQ2xpZW50KF9f cG1Tb2NrQWRkckluVG9JUEFkZHIoJmNwLT5hZGRyKSwgJmNwLT5kZW55T3BzKSkgPCAwKSB7CisJ aWYgKChzID0gX19wbUFjY0FkZENsaWVudChDbGllbnRJUEFkZHIoY3ApLCAmY3AtPmRlbnlPcHMp KSA8IDApIHsKIAkgICAgLyogaWdub3JlIGVycm9ycywgdGhlIGNsaWVudCBpcyBiZWluZyB0ZXJt aW5hdGVkIGluIGFueSBjYXNlICovCiAJICAgIGlmIChfcG1jZF90cmFjZV9tYXNrKQogCQlwbWNk X3RyYWNlKFRSX1hNSVRfUERVLCBjcC0+ZmQsIFBEVV9FUlJPUiwgcyk7CmRpZmYgLS1naXQgYS9z cmMvcG1jZC9zcmMvcG1jZC5jIGIvc3JjL3BtY2Qvc3JjL3BtY2QuYwppbmRleCAwYzZiNTdjLi44 MTAwNjQ0IDEwMDY0NAotLS0gYS9zcmMvcG1jZC9zcmMvcG1jZC5jCisrKyBiL3NyYy9wbWNkL3Ny Yy9wbWNkLmMKQEAgLTM1OSw3ICszNTksNyBAQCBPcGVuUmVxdWVzdFNvY2tldChpbnQgcG9ydCwg aW50IGlwQWRkcikKIHsKICAgICBpbnQJCQlmZDsKICAgICBpbnQJCQlvbmUsIHN0czsKLSAgICBf X3BtU29ja0FkZHJJbglteUFkZHI7CisgICAgc3RydWN0IF9fcG1Tb2NrQWRkckluICpteUFkZHI7 CiAKICAgICBmZCA9IF9fcG1DcmVhdGVTb2NrZXQoKTsKICAgICBpZiAoZmQgPCAwKSB7CkBAIC00 MDAsOSArNDAwLDEwIEBAIE9wZW5SZXF1ZXN0U29ja2V0KGludCBwb3J0LCBpbnQgaXBBZGRyKQog CWdvdG8gZmFpbDsKICAgICB9CiAKLSAgICBfX3BtSW5pdFNvY2tBZGRyKCZteUFkZHIsIGlwQWRk ciwgaHRvbnMocG9ydCkpOwotCi0gICAgc3RzID0gX19wbUJpbmQoZmQsIChfX3BtU29ja0FkZHIq KSZteUFkZHIsIHNpemVvZihteUFkZHIpKTsKKyAgICBteUFkZHIgPSBfX3BtQWxsb2NTb2NrQWRk ckluKCk7CisgICAgX19wbUluaXRTb2NrQWRkcihteUFkZHIsIGlwQWRkciwgaHRvbnMocG9ydCkp OworICAgIHN0cyA9IF9fcG1CaW5kKGZkLCAodm9pZCAqKW15QWRkciwgX19wbVNvY2tBZGRySW5T aXplKCkpOworICAgIF9fcG1GcmVlU29ja0FkZHJJbihteUFkZHIpOwogICAgIGlmIChzdHMgPCAw KSB7CiAJc3RzID0gbmV0ZXJyb3IoKTsKIAlfX3BtTm90aWZ5RXJyKExPR19FUlIsICJPcGVuUmVx dWVzdFNvY2tldCglZCwgMHgleCkgX19wbUJpbmQ6ICVzXG4iLApAQCAtODI1LDcgKzgyNiw3IEBA IENsaWVudExvb3Aodm9pZCkKIAkJICAgIGlmIChjcCA9PSBOVUxMKQogCQkgICAgCWNvbnRpbnVl OwogCi0JCSAgICBzdHMgPSBfX3BtQWNjQWRkQ2xpZW50KF9fcG1Tb2NrQWRkckluVG9JUEFkZHIo JmNwLT5hZGRyKSwgJmNwLT5kZW55T3BzKTsKKwkJICAgIHN0cyA9IF9fcG1BY2NBZGRDbGllbnQo Q2xpZW50SVBBZGRyKGNwKSwgJmNwLT5kZW55T3BzKTsKIAkJICAgIGlmIChzdHMgPj0gMCkgewog CQkJY3AtPnBkdUluZm8uemVybyA9IDA7CiAJCQljcC0+cGR1SW5mby52ZXJzaW9uID0gUERVX1ZF UlNJT047CkBAIC0xMTc3LDcgKzExNzgsNyBAQCBzdGF0aWMgaW50CQkgc3pCYWRIb3N0cyA9IDA7 CiBzdGF0aWMgX19wbUlQQWRkcgkqYmFkSG9zdCA9IE5VTEw7CiAKIHN0YXRpYyBpbnQKLUFkZEJh ZEhvc3QoX19wbVNvY2tBZGRySW4gKmhvc3RJZCkKK0FkZEJhZEhvc3Qoc3RydWN0IF9fcG1Tb2Nr QWRkckluICpob3N0SWQpCiB7CiAgICAgaW50CQlpLCBuZWVkOwogCkBAIC0xMjI1LDEwICsxMjI2 LDEwIEBAIENsZWFudXBDbGllbnQoQ2xpZW50SW5mbyAqY3AsIGludCBzdHMpCiAJICogYmVlbiBk aW5nZWQgZm9yIGFuIGFjY2VzcyB2aW9sYXRpb24gc2luY2Ugc3RhcnR1cCBvciByZWNvbmZpZ3Vy YXRpb24KIAkgKi8KIAlpZiAoc3RzID09IFBNX0VSUl9QRVJNSVNTSU9OIHx8IHN0cyA9PSBQTV9F UlJfQ09OTkxJTUlUKSB7Ci0JICAgIGlmICggKG1zZyA9IEFkZEJhZEhvc3QoJmNwLT5hZGRyKSkg KSB7Ci0JCWNhZGRyID0gX19wbVNvY2tBZGRySW5Ub1N0cmluZygmY3AtPmFkZHIpOworCSAgICBp ZiAoIChtc2cgPSBBZGRCYWRIb3N0KENsaWVudEFkZHIoY3ApKSkgKSB7CisJCWNhZGRyID0gX19w bVNvY2tBZGRySW5Ub1N0cmluZyhDbGllbnRBZGRyKGNwKSk7CiAJCWZwcmludGYoc3RkZXJyLCAi YWNjZXNzIHZpb2xhdGlvbiBmcm9tIGhvc3QgJXM6XG4iLCBjYWRkcik7Ci0JCWZyZWUoY2xpZW50 KTsKKwkJZnJlZShjYWRkcik7CiAJICAgIH0KIAl9CiAJZWxzZQpAQCAtMTI0OSw3ICsxMjUwLDcg QEAgQ2xlYW51cENsaWVudChDbGllbnRJbmZvICpjcCwgaW50IHN0cykKICAgICAgKiBjb3VudAog ICAgICAqLwogICAgIGlmIChzdHMgIT0gUE1fRVJSX1BFUk1JU1NJT04gJiYgc3RzICE9IFBNX0VS Ul9DT05OTElNSVQpCi0gICAgICAgIF9fcG1BY2NEZWxDbGllbnQoX19wbVNvY2tBZGRySW5Ub0lQ QWRkcigmY3AtPmFkZHIpKTsKKyAgICAgICAgX19wbUFjY0RlbENsaWVudChDbGllbnRJUEFkZHIo Y3ApKTsKIAogICAgIHBtY2RfdHJhY2UoVFJfREVMX0NMSUVOVCwgY3AtPmZkLCBzdHMsIDApOwog ICAgIERlbGV0ZUNsaWVudChjcCk7CmRpZmYgLS1naXQgYS9zcmMvcG1sb2dnZXIvcG9ydHMuYyBi L3NyYy9wbWxvZ2dlci9wb3J0cy5jCmluZGV4IGIzOGE5ODguLmMwMzM0MTMgMTAwNjQ0Ci0tLSBh L3NyYy9wbWxvZ2dlci9wb3J0cy5jCisrKyBiL3NyYy9wbWxvZ2dlci9wb3J0cy5jCkBAIC0xODIs MTAgKzE4Miw5IEBAIEdldFBvcnQoY2hhciAqZmlsZSkKICAgICBpbnQJCQltYXBmZDsKICAgICBG SUxFCQkqbWFwc3RyZWFtOwogICAgIGludAkJCXN0czsKLSAgICBfX3BtU29ja0FkZHJJbglteUFk ZHI7CiAgICAgc3RhdGljIGludAkJcG9ydF9iYXNlID0gLTE7Ci0gICAgX19wbUhvc3RFbnQJCWhl OwotICAgIGNoYXIJCSpoZWJ1ZjsKKyAgICBzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKm15QWRkcjsK KyAgICBzdHJ1Y3QgX19wbUhvc3RFbnQJKmhvc3Q7CiAKICAgICBmZCA9IF9fcG1DcmVhdGVTb2Nr ZXQoKTsKICAgICBpZiAoZmQgPCAwKSB7CkBAIC0yMTcsOSArMjE2LDEwIEBAIEdldFBvcnQoY2hh ciAqZmlsZSkKICAgICAgKiB0cnkgdG8gYWxsb2NhdGUgcG9ydHMgZnJvbSBwb3J0X2Jhc2UuICBJ ZiBwb3J0IGFscmVhZHkgaW4gdXNlLCBhZGQgb25lCiAgICAgICogYW5kIHRyeSBhZ2Fpbi4KICAg ICAgKi8KKyAgICBteUFkZHIgPSBfX3BtQWxsb2NTb2NrQWRkckluKCk7CiAgICAgZm9yIChjdGxw b3J0ID0gcG9ydF9iYXNlOyA7IGN0bHBvcnQrKykgewotICAgICAgICBfX3BtSW5pdFNvY2tBZGRy KCZteUFkZHIsIGh0b25sKElOQUREUl9BTlkpLCBodG9ucyhjdGxwb3J0KSk7Ci0Jc3RzID0gX19w bUJpbmQoZmQsIChfX3BtU29ja0FkZHIqKSZteUFkZHIsIHNpemVvZihteUFkZHIpKTsKKyAgICAg ICAgX19wbUluaXRTb2NrQWRkcihteUFkZHIsIGh0b25sKElOQUREUl9BTlkpLCBodG9ucyhjdGxw b3J0KSk7CisJc3RzID0gX19wbUJpbmQoZmQsICh2b2lkICopbXlBZGRyLCBfX3BtU29ja0FkZHJJ blNpemUoKSk7CiAJaWYgKHN0cyA8IDApIHsKIAkgICAgaWYgKG5ldGVycm9yKCkgIT0gRUFERFJJ TlVTRSkgewogCQlmcHJpbnRmKHN0ZGVyciwgImJpbmQoJWQpOiAlc1xuIiwgY3RscG9ydCwgbmV0 c3RyZXJyb3IoKSk7CkBAIC0yMjksNiArMjI5LDcgQEAgR2V0UG9ydChjaGFyICpmaWxlKQogCWVs c2UKIAkgICAgYnJlYWs7CiAgICAgfQorICAgIF9fcG1GcmVlU29ja0FkZHJJbihteUFkZHIpOwog ICAgIHN0cyA9IF9fcG1MaXN0ZW4oZmQsIDUpOwkvKiBNYXguIG9mIDUgcGVuZGluZyBjb25uZWN0 aW9uIHJlcXVlc3RzICovCiAgICAgaWYgKHN0cyA9PSAtMSkgewogCWZwcmludGYoc3RkZXJyLCAi X19wbUxpc3RlbjogJXNcbiIsIG5ldHN0cmVycm9yKCkpOwpAQCAtMjUzLDExICsyNTQsMTEgQEAg R2V0UG9ydChjaGFyICpmaWxlKQogICAgIGZwcmludGYobWFwc3RyZWFtLCAiJWRcbiIsIGN0bHBv cnQpOwogCiAgICAgLyogdGhlbiB0aGUgUE1DRCBob3N0ICovCi0gICAgaGVidWYgPSBfX3BtQWxs b2NIb3N0RW50QnVmZmVyKCk7Ci0gICAgaWYgKF9fcG1HZXRIb3N0QnlOYW1lKHBtY2RfaG9zdCwg JmhlLCBoZWJ1ZikgIT0gTlVMTCkKLSAgICAgICAgZnByaW50ZihtYXBzdHJlYW0sICIlcyIsIGhl LmhfbmFtZSk7CisgICAgaG9zdCA9IF9fcG1BbGxvY0hvc3RFbnQoKTsKKyAgICBpZiAoX19wbUdl dEhvc3RCeU5hbWUocG1jZF9ob3N0LCBob3N0KSAhPSBOVUxMKQorICAgICAgICBmcHJpbnRmKG1h cHN0cmVhbSwgIiVzIiwgX19wbUhvc3RFbnROYW1lKGhvc3QpKTsKICAgICBmcHJpbnRmKG1hcHN0 cmVhbSwgIlxuIik7Ci0gICAgX19wbUZyZWVIb3N0RW50QnVmZmVyKGhlYnVmKTsKKyAgICBfX3Bt RnJlZUhvc3RFbnQoaG9zdCk7CiAKICAgICAvKiB0aGVuIHRoZSBmdWxsIHBhdGhuYW1lIHRvIHRo ZSBhcmNoaXZlIGJhc2UgKi8KICAgICBfX3BtTmF0aXZlUGF0aChhcmNoQmFzZSk7CkBAIC00MDUs MTUgKzQwNiwyMCBAQCBpbnQKIGNvbnRyb2xfcmVxKHZvaWQpCiB7CiAgICAgaW50CQkJZmQsIHN0 czsKLSAgICBfX3BtU29ja0FkZHJJbglhZGRyOwotICAgIF9fcG1Ib3N0RW50CQloOwotICAgIGNo YXIJCSpoYnVmLCAqYWJ1ZjsKKyAgICBzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKmFkZHI7CisgICAg c3RydWN0IF9fcG1Ib3N0RW50CSpob3N0OworICAgIGNoYXIJCSphYnVmOwogICAgIF9fcG1Tb2Nr TGVuCQlhZGRybGVuOwogCi0gICAgYWRkcmxlbiA9IHNpemVvZihhZGRyKTsKLSAgICBmZCA9IF9f cG1BY2NlcHQoY3RsZmQsIChfX3BtU29ja0FkZHIgKikmYWRkciwgJmFkZHJsZW4pOworICAgIGlm ICgoYWRkciA9IF9fcG1BbGxvY1NvY2tBZGRySW4oKSkgPT0gTlVMTCkgeworCWZwdXRzKCJlcnJv ciBhbGxvY2F0aW5nIHNwYWNlIGZvciBjbGllbnRcbiIsIHN0ZGVycik7CisJcmV0dXJuIDA7Cisg ICAgfQorICAgIGFkZHJsZW4gPSBfX3BtU29ja0FkZHJJblNpemUoKTsKKyAgICBmZCA9IF9fcG1B Y2NlcHQoY3RsZmQsICh2b2lkICopYWRkciwgJmFkZHJsZW4pOwogICAgIGlmIChmZCA9PSAtMSkg ewogCWZwcmludGYoc3RkZXJyLCAiZXJyb3IgYWNjZXB0aW5nIGNsaWVudDogJXNcbiIsIG5ldHN0 cmVycm9yKCkpOworCV9fcG1GcmVlU29ja0FkZHJJbihhZGRyKTsKIAlyZXR1cm4gMDsKICAgICB9 CiAgICAgX19wbVNldFNvY2tldElQQyhmZCk7CkBAIC00MjYsNiArNDMyLDcgQEAgY29udHJvbF9y ZXEodm9pZCkKIAlpZiAoc3RzIDwgMCkKIAkgICAgZnByaW50ZihzdGRlcnIsICJlcnJvciBzZW5k aW5nIGNvbm5lY3Rpb24gTkFDSyB0byBjbGllbnQ6ICVzXG4iLAogCQkJIHBtRXJyU3RyKHN0cykp OworCV9fcG1GcmVlU29ja0FkZHJJbihhZGRyKTsKIAlfX3BtQ2xvc2VTb2NrZXQoZmQpOwogCXJl dHVybiAwOwogICAgIH0KQEAgLTQzNCwyNSArNDQxLDMwIEBAIGNvbnRyb2xfcmVxKHZvaWQpCiAg ICAgaWYgKHN0cyA8IDApIHsKIAlfX3BtU2VuZEVycm9yKGZkLCBGUk9NX0FOT04sIHN0cyk7CiAJ ZnByaW50ZihzdGRlcnIsICJlcnJvciBjb25uZWN0aW5nIHRvIGNsaWVudDogJXNcbiIsIHBtRXJy U3RyKHN0cykpOworCV9fcG1GcmVlU29ja0FkZHJJbihhZGRyKTsKIAlfX3BtQ2xvc2VTb2NrZXQo ZmQpOwogCXJldHVybiAwOwogICAgIH0KIAotICAgIGhidWYgPSBfX3BtQWxsb2NIb3N0RW50QnVm ZmVyKCk7Ci0gICAgaWYgKF9fcG1HZXRIb3N0QnlBZGRyKCYgYWRkciwgJmgsIGhidWYpID09IE5V TEwgfHwgc3RybGVuKGguaF9uYW1lKSA+IE1BWEhPU1ROQU1FTEVOLTEpIHsKLQlhYnVmID0gX19w bVNvY2tBZGRySW5Ub1N0cmluZygmYWRkcik7CisgICAgaG9zdCA9IF9fcG1BbGxvY0hvc3RFbnQo KTsKKyAgICBpZiAoX19wbUdldEhvc3RCeUFkZHIoYWRkciwgaG9zdCkgPT0gTlVMTCB8fCBzdHJs ZW4oX19wbUhvc3RFbnROYW1lKGhvc3QpKSA+IE1BWEhPU1ROQU1FTEVOLTEpIHsKKwlhYnVmID0g X19wbVNvY2tBZGRySW5Ub1N0cmluZyhhZGRyKTsKICAgICAgICAgc3ByaW50ZihwbWxjX2hvc3Qs ICIlcyIsIGFidWYpOwogCWZyZWUoYWJ1Zik7CiAgICAgfQotICAgIGVsc2UKKyAgICBlbHNlIHsK IAkvKiB0aGlzIGlzIHNhZmUsIGR1ZSB0byBzdHJsZW4oKSB0ZXN0IGFib3ZlICovCi0Jc3RyY3B5 KHBtbGNfaG9zdCwgaC5oX25hbWUpOwotICAgIF9fcG1GcmVlSG9zdEVudEJ1ZmZlcihoYnVmKTsK KwlzdHJjcHkocG1sY19ob3N0LCBfX3BtSG9zdEVudE5hbWUoaG9zdCkpOworICAgIH0KKworICAg IHN0cyA9IF9fcG1BY2NBZGRDbGllbnQoX19wbVNvY2tBZGRySW5Ub0lQQWRkcihhZGRyKSwgJmNs aWVudG9wcyk7CisgICAgX19wbUZyZWVTb2NrQWRkckluKGFkZHIpOworICAgIF9fcG1GcmVlSG9z dEVudChob3N0KTsKIAotICAgIGlmICgoc3RzID0gX19wbUFjY0FkZENsaWVudChfX3BtU29ja0Fk ZHJJblRvSVBBZGRyKCZhZGRyKSwgJmNsaWVudG9wcykpIDwgMCkgeworICAgIGlmIChzdHMgPCAw KSB7CiAjaWZkZWYgUENQX0RFQlVHCiAJaWYgKHBtRGVidWcgJiBEQkdfVFJBQ0VfQ09OVEVYVCkg ewotCSAgICBhYnVmID0gX19wbVNvY2tBZGRySW5Ub1N0cmluZygmYWRkcik7CisJICAgIGFidWYg PSBfX3BtU29ja0FkZHJJblRvU3RyaW5nKGFkZHIpOwogCSAgICBmcHJpbnRmKHN0ZGVyciwgImNs aWVudCBhZGRyOiAlc1xuIiwgYWJ1Zik7CiAJICAgIGZyZWUoYWJ1Zik7CiAJICAgIF9fcG1BY2NE dW1wSG9zdHMoc3RkZXJyKTsKZGlmZiAtLWdpdCBhL3NyYy9wbXByb3h5L2NsaWVudC5jIGIvc3Jj L3BtcHJveHkvY2xpZW50LmMKaW5kZXggZDFlOWY3NS4uMmNkZmI3ZiAxMDA2NDQKLS0tIGEvc3Jj L3BtcHJveHkvY2xpZW50LmMKKysrIGIvc3JjL3BtcHJveHkvY2xpZW50LmMKQEAgLTI5LDcgKzI5 LDcgQEAgZXh0ZXJuIHZvaWQJU2h1dGRvd24odm9pZCk7CiBzdGF0aWMgaW50CiBOZXdDbGllbnQo dm9pZCkKIHsKLSAgICBpbnQgaTsKKyAgICBpbnQgaSwgYWxsb2NTaXplOwogCiAgICAgZm9yIChp ID0gMDsgaSA8IG5DbGllbnRzOyBpKyspCiAJaWYgKCFjbGllbnRbaV0uc3RhdHVzLmNvbm5lY3Rl ZCkKQEAgLTM3LDEwICszNywxMCBAQCBOZXdDbGllbnQodm9pZCkKIAogICAgIGlmIChpID09IGNs aWVudFNpemUpIHsKIAljbGllbnRTaXplID0gY2xpZW50U2l6ZSA/IGNsaWVudFNpemUgKiAyIDog TUlOX0NMSUVOVFNfQUxMT0M7Ci0JY2xpZW50ID0gKENsaWVudEluZm8qKQotCSAgICByZWFsbG9j KGNsaWVudCwgc2l6ZW9mKENsaWVudEluZm8pICogY2xpZW50U2l6ZSk7CisJYWxsb2NTaXplID0g KHNpemVvZihDbGllbnRJbmZvKSArIF9fcG1Tb2NrQWRkckluU2l6ZSgpKSAqIGNsaWVudFNpemU7 CisJY2xpZW50ID0gKENsaWVudEluZm8gKikgcmVhbGxvYyhjbGllbnQsIGFsbG9jU2l6ZSk7CiAJ aWYgKGNsaWVudCA9PSBOVUxMKSB7Ci0JICAgIF9fcG1Ob01lbSgiTmV3Q2xpZW50Iiwgc2l6ZW9m KENsaWVudEluZm8pICogY2xpZW50U2l6ZSwgUE1fUkVDT1ZfRVJSKTsKKwkgICAgX19wbU5vTWVt KCJOZXdDbGllbnQiLCBhbGxvY1NpemUsIFBNX1JFQ09WX0VSUik7CiAJICAgIFNodXRkb3duKCk7 CiAJICAgIGV4aXQoMSk7CiAJfQpAQCAtNTAsNiArNTAsMTIgQEAgTmV3Q2xpZW50KHZvaWQpCiAg ICAgcmV0dXJuIGk7CiB9CiAKK3N0YXRpYyBzdHJ1Y3QgX19wbVNvY2tBZGRySW4gKgorQ2xpZW50 QWRkcihDbGllbnRJbmZvICpjbGllbnQpCit7CisgICByZXR1cm4gKHN0cnVjdCBfX3BtU29ja0Fk ZHJJbiAqKSAmY2xpZW50LT5hZGRyWzBdOworfQorCiAvKiBNWV9CVUZMRU4gbmVlZHMgdG8gYmln IGVub3VnaCB0byBob2xkICJob3N0bmFtZSBwb3J0IiAqLwogI2RlZmluZSBNWV9CVUZMRU4gKE1B WEhPU1ROQU1FTEVOKzEwKQogI2RlZmluZSBNWV9WRVJTSU9OICJwbXByb3h5LXNlcnZlciAxXG4i CkBAIC02OCw4ICs3NCw4IEBAIEFjY2VwdE5ld0NsaWVudChpbnQgcmVxZmQpCiAgICAgY2hhcgkq YWJ1ZnA7CiAKICAgICBpID0gTmV3Q2xpZW50KCk7Ci0gICAgYWRkcmxlbiA9IHNpemVvZihjbGll bnRbaV0uYWRkcik7Ci0gICAgZmQgPSBfX3BtQWNjZXB0KHJlcWZkLCAoX19wbVNvY2tBZGRyICop JmNsaWVudFtpXS5hZGRyLCAmYWRkcmxlbik7CisgICAgYWRkcmxlbiA9IF9fcG1Tb2NrQWRkcklu U2l6ZSgpOworICAgIGZkID0gX19wbUFjY2VwdChyZXFmZCwgKHZvaWQgKilDbGllbnRBZGRyKCZj bGllbnRbaV0pLCAmYWRkcmxlbik7CiAgICAgaWYgKGZkID09IC0xKSB7CiAJX19wbU5vdGlmeUVy cihMT0dfRVJSLCAiQWNjZXB0TmV3Q2xpZW50KCVkKSBfX3BtQWNjZXB0IGZhaWxlZDogJXMiLAog CQkJcmVxZmQsIG5ldHN0cmVycm9yKCkpOwpAQCAtMTE1LDcgKzEyMSw3IEBAIEFjY2VwdE5ld0Ns aWVudChpbnQgcmVxZmQpCiAgICAgfQogCiAgICAgaWYgKCFvaykgewotCWFidWZwID0gX19wbVNv Y2tBZGRySW5Ub1N0cmluZygmY2xpZW50W2ldLmFkZHIpOworCWFidWZwID0gX19wbVNvY2tBZGRy SW5Ub1N0cmluZyhDbGllbnRBZGRyKCZjbGllbnRbaV0pKTsKIAlfX3BtTm90aWZ5RXJyKExPR19X QVJOSU5HLCAiQmFkIHZlcnNpb24gc3RyaW5nIGZyb20gY2xpZW50IGF0ICVzIiwgYWJ1ZnApOwog CWZyZWUoYWJ1ZnApOwogCWZwcmludGYoc3RkZXJyLCAiQWNjZXB0TmV3Q2xpZW50OiBiYWQgdmVy c2lvbiBzdHJpbmcgd2FzIFwiIik7CkBAIC0xMjcsNyArMTMzLDcgQEAgQWNjZXB0TmV3Q2xpZW50 KGludCByZXFmZCkKICAgICB9CiAKICAgICBpZiAoX19wbVNlbmQoZmQsIE1ZX1ZFUlNJT04sIHN0 cmxlbihNWV9WRVJTSU9OKSwgMCkgIT0gc3RybGVuKE1ZX1ZFUlNJT04pKSB7Ci0JYWJ1ZnAgPSBf X3BtU29ja0FkZHJJblRvU3RyaW5nKCZjbGllbnRbaV0uYWRkcik7CisJYWJ1ZnAgPSBfX3BtU29j a0FkZHJJblRvU3RyaW5nKENsaWVudEFkZHIoJmNsaWVudFtpXSkpOwogCV9fcG1Ob3RpZnlFcnIo TE9HX1dBUk5JTkcsICJBY2NlcHROZXdDbGllbnQ6IGZhaWxlZCB0byBzZW5kIHZlcnNpb24gIgog CQkJInN0cmluZyAoJXMpIHRvIGNsaWVudCBhdCAlc1xuIiwgTVlfVkVSU0lPTiwgYWJ1ZnApOwog CWZyZWUoYWJ1ZnApOwpAQCAtMTU5LDkgKzE2NSwxMCBAQCBBY2NlcHROZXdDbGllbnQoaW50IHJl cWZkKQogCSAgICBicCsrOwogCSAgICBjbGllbnRbaV0ucG1jZF9wb3J0ID0gKGludClzdHJ0b3Vs KGJwLCAmZW5kcCwgMTApOwogCSAgICBpZiAoKmVuZHAgIT0gJ1wwJykgewotCQlhYnVmcCA9IF9f cG1Tb2NrQWRkckluVG9TdHJpbmcoJmNsaWVudFtpXS5hZGRyKTsKKwkJYWJ1ZnAgPSBfX3BtU29j a0FkZHJJblRvU3RyaW5nKENsaWVudEFkZHIoJmNsaWVudFtpXSkpOwogCQlfX3BtTm90aWZ5RXJy KExPR19XQVJOSU5HLCAiQWNjZXB0TmV3Q2xpZW50OiBiYWQgcG1jZCBwb3J0ICIKIAkJCQkiXCIl c1wiIGZyb20gY2xpZW50IGF0ICVzIiwgYnAsIGFidWZwKTsKKwkJZnJlZShhYnVmcCk7CiAJCURl bGV0ZUNsaWVudCgmY2xpZW50W2ldKTsKIAkJcmV0dXJuIE5VTEw7CiAJICAgIH0KQEAgLTE3MCw3 ICsxNzcsNyBAQCBBY2NlcHROZXdDbGllbnQoaW50IHJlcWZkKQogICAgIH0KIAogICAgIGlmIChj bGllbnRbaV0ucG1jZF9ob3N0bmFtZSA9PSBOVUxMKSB7Ci0JYWJ1ZnAgPSBfX3BtU29ja0FkZHJJ blRvU3RyaW5nKCZjbGllbnRbaV0uYWRkcik7CisJYWJ1ZnAgPSBfX3BtU29ja0FkZHJJblRvU3Ry aW5nKENsaWVudEFkZHIoJmNsaWVudFtpXSkpOwogCV9fcG1Ob3RpZnlFcnIoTE9HX1dBUk5JTkcs ICJBY2NlcHROZXdDbGllbnQ6IGZhaWxlZCB0byBnZXQgUE1DRCAiCiAJCQkJImhvc3RuYW1lICgl cykgZnJvbSBjbGllbnQgYXQgJXMiLCBidWYsIGFidWZwKTsKIAlmcmVlKGFidWZwKTsKQEAgLTE4 NCw5ICsxOTEsMTAgQEAgQWNjZXB0TmV3Q2xpZW50KGludCByZXFmZCkKIAkgKiBub3RlIGVycm9y IG1lc3NhZ2UgZ2V0cyBhcHBlbmRlZCB0byBvbmNlIHBtY2QgY29ubmVjdGlvbiBpcwogCSAqIG1h ZGUgaW4gQ2xpZW50TG9vcCgpCiAJICovCi0JYWJ1ZnAgPSBfX3BtU29ja0FkZHJJblRvU3RyaW5n KCZjbGllbnRbaV0uYWRkcik7CisJYWJ1ZnAgPSBfX3BtU29ja0FkZHJJblRvU3RyaW5nKENsaWVu dEFkZHIoJmNsaWVudFtpXSkpOwogCWZwcmludGYoc3RkZXJyLCAiQWNjZXB0TmV3Q2xpZW50IFsl ZF0gZmQ9JWQgZnJvbSAlcyB0byAlcyAocG9ydCAlcykiLAogCQlpLCBmZCwgYWJ1ZnAsIGNsaWVu dFtpXS5wbWNkX2hvc3RuYW1lLCBicCk7CisJZnJlZShhYnVmcCk7CiAgICAgfQogI2VuZGlmCiAK ZGlmZiAtLWdpdCBhL3NyYy9wbXByb3h5L3BtcHJveHkuYyBiL3NyYy9wbXByb3h5L3BtcHJveHku YwppbmRleCA1ZDc1NDc0Li45NzNhYjJlIDEwMDY0NAotLS0gYS9zcmMvcG1wcm94eS9wbXByb3h5 LmMKKysrIGIvc3JjL3BtcHJveHkvcG1wcm94eS5jCkBAIC0yMjYsNyArMjI2LDcgQEAgT3BlblJl cXVlc3RTb2NrZXQoaW50IHBvcnQsIF9fdWludDMyX3QgaXBBZGRyKQogewogICAgIGludAkJCWZk OwogICAgIGludAkJCXN0czsKLSAgICBfX3BtU29ja0FkZHJJbglteUFkZHI7CisgICAgc3RydWN0 IF9fcG1Tb2NrQWRkckluICpteUFkZHI7CiAgICAgaW50CQkJb25lID0gMTsKIAogICAgIGZkID0g X19wbUNyZWF0ZVNvY2tldCgpOwpAQCAtMjY4LDE0ICsyNjgsMjIgQEAgT3BlblJlcXVlc3RTb2Nr ZXQoaW50IHBvcnQsIF9fdWludDMyX3QgaXBBZGRyKQogCURvbnRTdGFydCgpOwogICAgIH0KIAot ICAgIF9fcG1Jbml0U29ja0FkZHIoJm15QWRkciwgaXBBZGRyLCBodG9ucyhwb3J0KSk7Ci0gICAg c3RzID0gX19wbUJpbmQoZmQsIChfX3BtU29ja0FkZHIgKikmbXlBZGRyLCBzaXplb2YobXlBZGRy KSk7Ci0gICAgaWYgKHN0cyA8IDApeworICAgIG15QWRkciA9IF9fcG1BbGxvY1NvY2tBZGRySW4o KTsKKyAgICBpZiAobXlBZGRyID09IE5VTEwpIHsKKwlfX3BtTm90aWZ5RXJyKExPR19FUlIsICJP cGVuUmVxdWVzdFNvY2tldCglZCwgMHgleCkgYWRkciBhbGxvYyBmYWlsZWRcbiIsCisJCXBvcnQs IGlwQWRkcik7CisJRG9udFN0YXJ0KCk7CisgICAgfQorICAgIF9fcG1Jbml0U29ja0FkZHIobXlB ZGRyLCBpcEFkZHIsIGh0b25zKHBvcnQpKTsKKyAgICBzdHMgPSBfX3BtQmluZChmZCwgKHZvaWQg KilteUFkZHIsIF9fcG1Tb2NrQWRkckluU2l6ZSgpKTsKKyAgICBpZiAoc3RzIDwgMCkgewogCV9f cG1Ob3RpZnlFcnIoTE9HX0VSUiwgIk9wZW5SZXF1ZXN0U29ja2V0KCVkKSBfX3BtQmluZDogJXNc biIsCiAJCQlwb3J0LCBuZXRzdHJlcnJvcigpKTsKLQlfX3BtTm90aWZ5RXJyKExPR19FUlIsICJw bXByb3h5IGlzIGFscmVhZHkgcnVubmluZ1xuIik7CisJaWYgKG5ldGVycm9yKCkgPT0gRUFERFJJ TlVTRSkKKwkgICAgX19wbU5vdGlmeUVycihMT0dfRVJSLCAicG1wcm94eSBpcyBhbHJlYWR5IHJ1 bm5pbmdcbiIpOwogCURvbnRTdGFydCgpOwogICAgIH0KKyAgICBfX3BtRnJlZVNvY2tBZGRySW4o bXlBZGRyKTsKIAogICAgIHN0cyA9IF9fcG1MaXN0ZW4oZmQsIDUpOwkvKiBNYXguIG9mIDUgcGVu ZGluZyBjb25uZWN0aW9uIHJlcXVlc3RzICovCiAgICAgaWYgKHN0cyA9PSAtMSkgewpkaWZmIC0t Z2l0IGEvc3JjL3BtcHJveHkvcG1wcm94eS5oIGIvc3JjL3BtcHJveHkvcG1wcm94eS5oCmluZGV4 IGU4YjI5NzcuLmE3MzE4Y2YgMTAwNjQ0Ci0tLSBhL3NyYy9wbXByb3h5L3BtcHJveHkuaAorKysg Yi9zcmMvcG1wcm94eS9wbXByb3h5LmgKQEAgLTI2LDEzICsyNiwxMyBAQAogdHlwZWRlZiBzdHJ1 Y3QgewogICAgIGludAkJCWZkOwkJLyogY2xpZW50IHNvY2tldCBkZXNjcmlwdG9yICovCiAgICAg aW50CQkJdmVyc2lvbjsJLyogcHJveHktY2xpZW50IHByb3RvY29sIHZlcnNpb24gKi8KLSAgICBf X3BtU29ja0FkZHJJbglhZGRyOwkJLyogYWRkcmVzcyBvZiBjbGllbnQgKi8KICAgICBzdHJ1Y3Qg ewkJCQkvKiBTdGF0dXMgb2YgY29ubmVjdGlvbiB0byBjbGllbnQgKi8KIAl1bnNpZ25lZCBpbnQJ Y29ubmVjdGVkIDogMTsJLyogQ2xpZW50IGNvbm5lY3RlZCAqLwogICAgIH0gc3RhdHVzOwogICAg IGNoYXIJCSpwbWNkX2hvc3RuYW1lOwkvKiBQTUNEIGhvc3RuYW1lICovCiAgICAgaW50CQkJcG1j ZF9wb3J0OwkvKiBQTUNEIHBvcnQgKi8KICAgICBpbnQJCQlwbWNkX2ZkOwkvKiBQTUNEIHNvY2tl dCBkZXNjcmlwdG9yICovCisgICAgY2hhcgkJYWRkclswXTsJLyogYWRkcmVzcyBvZiBjbGllbnQg W19fcG1Tb2NrQWRkckluXSAqLwogfSBDbGllbnRJbmZvOwogCiBleHRlcm4gQ2xpZW50SW5mbwkq Y2xpZW50OwkJLyogQXJyYXkgb2YgY2xpZW50cyAqLwo= ------=_Part_22795068_1417934599.1352273348001-- From nscott@redhat.com Wed Nov 7 03:14:21 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA79ELtq135498 for ; Wed, 7 Nov 2012 03:14:21 -0600 X-ASG-Debug-ID: 1352279777-04cbb077af3a360001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id s3HHBsjBfHR0yvm5 for ; Wed, 07 Nov 2012 01:16:17 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA79GHed031499; Wed, 7 Nov 2012 04:16:17 -0500 Date: Wed, 7 Nov 2012 04:16:17 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <2143500626.22841066.1352279777043.JavaMail.root@redhat.com> In-Reply-To: Subject: Re: [RFC] PCP daemons running as non-root users MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [RFC] PCP daemons running as non-root users Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.40] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352279777 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113524 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Hey Frank, Thanks for looking it over. ----- Original Message ----- > > > I *think* it has to be a fixed ID, as we'll be persisting pmlogger > > logs, etc with this UID/GID. [...] > > (I don't see why. Files transferred between systems do not need > to preserve their numerical uid/gid's.) > I was thinking that archives created below /var/log/pcp/pmlogger//* would need to have consistent IDs but perhaps not. I can't really see a good reason why they should ... will assume not unless someone can think of something. > > > - adds __pmSetProcessIdentity() used by everyone (changes the > > existing perl PMDAs to use it, uses it in pmcd & co too). Add > > thread safety to the existing (perl wrapper) code while at it. > > In the end, all callers use the same code to switch user. > > Can you elaborate upon this part of the model? How do you imagine the > pmcd-invoked pmdas to be able to use it? > > If pmcd is fully unprivileged, pmcd always gets to run initially as root (bootup/service start)... > then it can't seteuid back & forth > between pcp and root / other users. (It should be fully unprivileged > if at all possible.) *nod*. The patch does a full privilege drop just before entering the main event processing loop (but after starting all agents which run as root unless they choose to not do so). Many do already, without this patch, using a perl API to switch user (the database pmdas tend to do this, and several others). I know of one production deployment which also has done this (directly in C) so their PMDAs don't run as root. > So, we'd probably need a setuid-root helper > program that launches pmdas. But then the pmdas themselves don't > need I think (hope) we can avoid any setuid helper. > to take action (in the form of that api call), since by the time they > are invoked, they'd be already running at reduced appropriate > privilege. They run as root from startup. They don't get that option at sighup time, anymore (which accompanies a ./Install), but they can now say in their Install scripts that they require a full pmcd restart). I'm currently thinking this tradeoff gives the best balance of backward compatibility, security, and functionality ... the full restart is a bit of a "big hammer", but its a tradeoff for those PMDAs that cannot run as "pcp" user. > > > - adds a "forced_restart" variable to pmdaproc.sh which allows > > an agent to request pmcd be restarted rather than SIGHUP'd when > > it is ./Install'd. [...] > > If you have a setuid wrapper program for launching non-pcp pmdas, > that > wrapper could have a SIGHUP-sending mode. > Not clear whether the setuid wrapper is really needed (and having it opens a window for security issues, so I'd prefer not to if possible). > > > - adds -U to all daemons so that root could be gone > > back to temporarily, easily, if theres some problem or maybe if > > someone wants some other unusual setup. > > How would this be used? root invoking modified initscripts? This option could be used to start pmcd as root once more, as a fall-back in case someones deployment still requires it. The initscripts wouldnt need to be modified...? (pmcd.options file has this option) > (An unprivileged user running "new_pmcd -U root" mustn't work :-) Yep, indeed, that wouldn't work. cheers. -- Nathan From fche@redhat.com Wed Nov 7 10:15:35 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA7GFYKF161594 for ; Wed, 7 Nov 2012 10:15:35 -0600 X-ASG-Debug-ID: 1352305051-04cbb077b2522b0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id HRJzzyZSMyXwKGWc for ; Wed, 07 Nov 2012 08:17:32 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA7GHVut017962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Nov 2012 11:17:31 -0500 Received: from fche.csb (vpn-9-65.rdu.redhat.com [10.11.9.65]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA7GHUw0012401; Wed, 7 Nov 2012 11:17:31 -0500 Received: by fche.csb (Postfix, from userid 2569) id 4E43F581B9; Wed, 7 Nov 2012 11:17:30 -0500 (EST) Date: Wed, 7 Nov 2012 11:17:30 -0500 From: "Frank Ch. Eigler" To: Nathan Scott Cc: pcp@oss.sgi.com Subject: Re: [RFC] PCP daemons running as non-root users Message-ID: <20121107161730.GF30514@redhat.com> X-ASG-Orig-Subj: Re: [RFC] PCP daemons running as non-root users References: <2143500626.22841066.1352279777043.JavaMail.root@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2143500626.22841066.1352279777043.JavaMail.root@redhat.com> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1352305051 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Hi, Nathan - > [...] *nod*. The patch does a full privilege drop just before > entering the main event processing loop (but after starting all > agents which run as root unless they choose to not do so). [...] Aha. That is simpler. One wrinkle in this scheme would be that once we have authenticated pmcd users, we'll want to make it possible for some of those users to get native privileges, in the sense of being able to access /proc//.... It sounds like such a scheme would require starting & keeping-open a root-privileged pmda open, which would apprx. fork / setuid / do-proc-work / die-when-the-client-disconnects. In the setuid-wrapper alternative, pmcd would manage that generally. (Doing such user authentication in the first place will require some auxiliary root process like saslauthd, but that's about the same in both designs.) - FChE From fche@redhat.com Wed Nov 7 12:19:20 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA7IJKnx168497 for ; Wed, 7 Nov 2012 12:19:20 -0600 X-ASG-Debug-ID: 1352312477-04cbb03c2901f50001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id r1HYQ4p2Drki830R for ; Wed, 07 Nov 2012 10:21:17 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA7ILHC5027959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Nov 2012 13:21:17 -0500 Received: from fche.csb (vpn-9-65.rdu.redhat.com [10.11.9.65]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA7ILF6F023012; Wed, 7 Nov 2012 13:21:16 -0500 Received: by fche.csb (Postfix, from userid 2569) id 2ABAA581B9; Wed, 7 Nov 2012 13:21:14 -0500 (EST) To: Nathan Scott Cc: Dave Brolley , pcp@oss.sgi.com Subject: Re: NSS/NSPR include file avoidance References: <1105026124.22792921.1352272029019.JavaMail.root@redhat.com> <1898649091.22795070.1352273348007.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: NSS/NSPR include file avoidance From: fche@redhat.com (Frank Ch. Eigler) Date: Wed, 07 Nov 2012 13:21:14 -0500 In-Reply-To: <1898649091.22795070.1352273348007.JavaMail.root@redhat.com> (Nathan Scott's message of "Wed, 7 Nov 2012 02:29:08 -0500 (EST)") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1352312477 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Nathan Scott writes: > [...] > Anyway, happily, it seems resolvable. This patch should apply > to git://sourceware.org/git/pcpfans.git brolley/nssmerge branch. > It uses the old C trick of forward declaring a struct and then > only using pointers to it in publicly visible places [...] Makes sense. > [...] > + inaddr = __pmAllocInAddr(); (NULL check? or at least an assert?) - FChE From brolley@redhat.com Wed Nov 7 12:27:59 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA7IRx7x169336 for ; Wed, 7 Nov 2012 12:27:59 -0600 X-ASG-Debug-ID: 1352312995-04bdf0029e03180001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id DdqEg3FnrPQHSKPo for ; Wed, 07 Nov 2012 10:29:55 -0800 (PST) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA7ITtKH030684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Nov 2012 13:29:55 -0500 Received: from [10.15.16.135] (dhcp-10-15-16-135.yyz.redhat.com [10.15.16.135]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA7ITsdQ009339; Wed, 7 Nov 2012 13:29:54 -0500 Message-ID: <509AA8A2.8010606@redhat.com> Date: Wed, 07 Nov 2012 13:29:54 -0500 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121016 Thunderbird/16.0.1 MIME-Version: 1.0 To: Nathan Scott CC: pcp@oss.sgi.com Subject: Re: NSS/NSPR include file avoidance References: <1898649091.22795070.1352273348007.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: NSS/NSPR include file avoidance In-Reply-To: <1898649091.22795070.1352273348007.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1352312995 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com On 11/07/2012 02:29 AM, Nathan Scott wrote: > Compile tested only at this stage ... keen to hear your thoughts > on this approach though & any review comments you might have on > this patch. Thanks! > The goal of the patch and the methods used to achieve it are ok with me. I took a quick look at it and didn't spot anything obviously wrong (beyond what Frank found). The branch is in a decent state with respect to fixes for running the the qa testsuite with NSS enabled. If you like, I'll apply the patch and shake out any problems. Dave From nscott@redhat.com Wed Nov 7 12:45:26 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA7IjQcC171415 for ; Wed, 7 Nov 2012 12:45:26 -0600 X-ASG-Debug-ID: 1352314039-04cb6c3cb105120001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id aPAJahyZtU3ljorq for ; Wed, 07 Nov 2012 10:47:20 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA7IlJpP030295; Wed, 7 Nov 2012 13:47:19 -0500 Date: Wed, 7 Nov 2012 13:47:19 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <541548740.23127836.1352314039898.JavaMail.root@redhat.com> In-Reply-To: <509AA8A2.8010606@redhat.com> Subject: Re: NSS/NSPR include file avoidance MIME-Version: 1.0 X-ASG-Orig-Subj: Re: NSS/NSPR include file avoidance Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.40] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352314040 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113564 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > On 11/07/2012 02:29 AM, Nathan Scott wrote: > > Compile tested only at this stage ... keen to hear your thoughts > > on this approach though & any review comments you might have on > > this patch. Thanks! > > > The goal of the patch and the methods used to achieve it are ok with > me. > I took a quick look at it and didn't spot anything obviously wrong > (beyond what Frank found). > > The branch is in a decent state with respect to fixes for running the > the qa testsuite with NSS enabled. If you like, I'll apply the patch > and shake out any problems. > That'd be great, thanks. I'll add those failure handling cases (looks like there's a few littered around), and prepare a branch you could pull from. cheers. -- Nathan From nscott@redhat.com Thu Nov 8 00:56:41 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA86ufWY225384 for ; Thu, 8 Nov 2012 00:56:41 -0600 X-ASG-Debug-ID: 1352357915-04cb6c3cae29d60001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id Tcps8Dp97A6XEVQ0 for ; Wed, 07 Nov 2012 22:58:36 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA86wZUJ022180 for ; Thu, 8 Nov 2012 01:58:35 -0500 Date: Thu, 8 Nov 2012 01:58:35 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1293366388.23334199.1352357915298.JavaMail.root@redhat.com> In-Reply-To: <954559129.23333359.1352357672269.JavaMail.root@redhat.com> Subject: pcp updates: nss/nspr progress MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: nss/nspr progress Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.69] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1352357915 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113610 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge configure | 14 + configure.in | 12 + qa/063 | 6 qa/067 | 3 qa/src/pducheck.c | 4 qa/src/pmcdgone.c | 5 src/include/pcp.conf.in | 8 + src/include/pcp/impl.h | 2 src/libpcp/src/auxconnect.c | 251 ++++++++++++++++++++-------------- src/libpcp/src/check-statics | 2 src/libpcp/src/ipc.c | 14 - src/libpcp/src/logconnect.c | 20 +- src/libpcp_trace/src/pdu.c | 13 - src/pmdas/simple/GNUmakefile | 3 src/pmdas/simple/GNUmakefile.install | 7 src/pmdas/trace/Makefile.proto | 4 src/pmdas/trivial/GNUmakefile | 3 src/pmdas/trivial/GNUmakefile.install | 1 src/pmdas/txmon/GNUmakefile | 3 src/pmdas/txmon/GNUmakefile.install | 2 src/pmlogger/dopdu.c | 8 - src/pmlogger/pmlogger.c | 38 ++--- 22 files changed, 252 insertions(+), 171 deletions(-) commit 313d3ab66b5fd6ba27db9ae7d09d74351ae0dd3f Author: Dave Brolley Date: Mon Nov 5 14:29:26 2012 -0500 Fix qa test case 367 for NSS/NSPR. Use the __pm* socket I/O API consistently Implement __pmRead() commit ffc2aa32bc704c7b2e2b22cccf3dbf6a7e46d76c Author: Dave Brolley Date: Thu Nov 1 17:28:23 2012 -0400 Fix qa test 601 for NSS/NSPR. Provide nss/nspr search paths. commit e56cd187b7d914b3c3dd026268735337984f4ab9 Author: Dave Brolley Date: Tue Oct 30 17:26:17 2012 -0400 Fix qa test case 324 for NSS/NSPR. Pass nss/nspr search paths via CFLAGS. commit 65d3e91e84d2acb51e58c3d8c50388936a75c82c Author: Dave Brolley Date: Tue Oct 30 17:03:51 2012 -0400 Fix qa test case 199 for NSS/NSPR - Pass nss/nspr include search paths in CFLAGS. commit 166cd347d977d0bf1ab2417c1f7f911c3dd4619c Author: Dave Brolley Date: Tue Oct 30 16:01:27 2012 -0400 pcp/qa test case 067 Specify no timeout on PR_Accept. Accept fd numbers of more than 3 digits in length. commit 055342149275744d71ef6d4ce299ceced845fd6f Author: Dave Brolley Date: Tue Oct 30 12:51:31 2012 -0400 Fix qa test case 063 for NSS/NSPR Generate, propagate and use PCP_NSS_INC_DIR and PCP_NSPR_INC_DIR. commit e8eea2bda0e9c4699ce302d00e6aa2012ce8d5c1 Author: Dave Brolley Date: Tue Oct 23 17:13:36 2012 -0400 Use the abstracted __pm* socket I/O interface consistently throughout. commit 37debb698c35fe4b5fbb9b044763955d36e18a0d Author: Dave Brolley Date: Tue Oct 23 17:12:42 2012 -0400 Do not call __pmResetIPC on the client fd until we're finished using it. commit a8f60225bbdc6aa55dc823e420ee653cab73785a Author: Dave Brolley Date: Tue Oct 23 17:10:52 2012 -0400 Preserve the port setting of the address in __pmSetSockAddr() commit cc856d2d5969db4ee6c4a6b356ce9241c16a7998 Author: Dave Brolley Date: Tue Oct 23 17:10:04 2012 -0400 Add missing copyright. commit fe326535e18155e5c1bbe3a779f106fb6db07fd6 Author: Dave Brolley Date: Thu Oct 18 17:02:47 2012 -0400 Return IP addresses in network byte order. commit b2ea9f0f70d752b716aa8b214904ad6e8da875ad Author: Dave Brolley Date: Wed Oct 17 15:24:14 2012 -0400 Use the new __pm* socket API consistently throughout pmlogger. commit 8e7101266197410af0a6e01d4dbb6991d3f9628f Author: Dave Brolley Date: Wed Oct 17 15:22:26 2012 -0400 Add #include search paths for NSS and NSPR when building the 'simple' pmda. commit 6e87dbaeac565c9e4316df2d6455b78ad7cd9d1a Author: Dave Brolley Date: Fri Oct 12 11:35:27 2012 -0400 Use select(3) instead of PR_Poll, even for NSPR sockets. - Could not poll native and NSPR sockets separately since one blocks the other. - PR_Poll does not seem to respond to SIGINT, making it impossible to stop the pmcd using SIGINT. - Translate NSPR file descriptors to native ones and use select to poll both the native and NSPR sockts at the same time. commit 56a3d62186dfa3f87ec66b0de5875e600753f99b Author: Dave Brolley Date: Thu Oct 11 13:12:39 2012 -0400 Don't process an empty nspr_set in nsprSelect. commit c07e042b821f1f1f6e0d1453408d45f4b024fcd9 Author: Dave Brolley Date: Thu Oct 11 13:10:43 2012 -0400 Mark nsprFds as an optional symbol. commit a195efdaee08fdba7aa62005a89b4fde83e6b557 Author: Dave Brolley Date: Wed Oct 10 11:13:51 2012 -0400 Remove comment from ipc.c which had been moved to auxconnect.c. From nscott@redhat.com Thu Nov 8 00:57:43 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA86vh53225472 for ; Thu, 8 Nov 2012 00:57:43 -0600 X-ASG-Debug-ID: 1352357979-04bdf0029d2b040001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id TclBhQebX04BKMSO for ; Wed, 07 Nov 2012 22:59:39 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA86xdd4022249 for ; Thu, 8 Nov 2012 01:59:39 -0500 Date: Thu, 8 Nov 2012 01:59:39 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <856458250.23334390.1352357979052.JavaMail.root@redhat.com> Subject: pcp updates: more nss/nspr progress MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: more nss/nspr progress Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.69] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1352357979 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113610 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge Makepkgs | 9 build/rpm/GNUmakefile | 3 build/rpm/pcp.spec.in | 4 configure |13775 +++++++++------------------------- configure.in | 230 qa/063 | 6 qa/067 | 4 qa/src/chkacc1.c | 27 qa/src/chkacc2.c | 23 qa/src/chkacc3.c | 35 qa/src/pducheck.c | 4 qa/src/pmcdgone.c | 5 src/include/builddefs.in | 23 src/include/pcp.conf.in | 8 src/include/pcp/impl.h | 77 src/include/pcp/platform_header.h.in | 9 src/libpcp/src/GNUmakefile | 10 src/libpcp/src/access.c | 43 src/libpcp/src/auxconnect.c | 1336 ++- src/libpcp/src/check-statics | 3 src/libpcp/src/ipc.c | 109 src/libpcp/src/logconnect.c | 55 src/libpcp_gui/src/timeclient.c | 16 src/libpcp_pmcd/src/client.c | 23 src/libpcp_pmda/src/open.c | 20 src/libpcp_trace/src/pdu.c | 13 src/perl/LogImport/Makefile.PL | 2 src/perl/PMDA/Makefile.PL | 2 src/perl/PMDA/local.c | 43 src/pmcd/src/agent.c | 10 src/pmcd/src/client.c | 30 src/pmcd/src/client.h | 17 src/pmcd/src/config.c | 36 src/pmcd/src/pmcd.c | 28 src/pmdas/linux/pmda.c | 1 src/pmdas/simple/GNUmakefile | 3 src/pmdas/simple/GNUmakefile.install | 7 src/pmdas/trace/Makefile.proto | 4 src/pmdas/trivial/GNUmakefile | 3 src/pmdas/trivial/GNUmakefile.install | 1 src/pmdas/txmon/GNUmakefile | 3 src/pmdas/txmon/GNUmakefile.install | 2 src/pmlogger/dopdu.c | 8 src/pmlogger/pmlogger.c | 38 src/pmlogger/ports.c | 71 src/pmproxy/client.c | 34 src/pmproxy/pmproxy.c | 20 src/pmproxy/pmproxy.h | 10 48 files changed, 5421 insertions(+), 10822 deletions(-) commit 4de7b814d529523662e22fe5e06ababf5cc3fa70 Author: Nathan Scott Date: Thu Nov 8 17:48:07 2012 +1100 Rejig the mechanism by which NSS/NSPR headers are included In particular, this removes any/all direct references to these headers from publicly visible headers so that back-compatibility story remains intact after the merge. Also, will avoid shooting ourselves in the foot with existing pcp-gui builds. One recently introduced little memleak plugged in a pmcd error path (related to a dynamic net address buffer allocation), and also some day1(?) QA test bugs fixed in the qa/src/chkacc*.c - some cases of error code checking were incorrect. commit b84afcd97fc9c2eb70e0c45f92f8813dd7a03367 Author: Nathan Scott Date: Thu Nov 8 17:40:54 2012 +1100 Allow long-option variants for Makepkgs options too commit 4531566940b919e07bae51532dbc82c5866d9799 Author: Nathan Scott Date: Thu Nov 8 10:55:03 2012 +1100 Make Daves configure-opt-capture-for-build-system-use slightly more generic commit 192639be06b856ba86cfa5334285bf011939c781 Author: Nathan Scott Date: Thu Nov 8 10:18:44 2012 +1100 Remove qa/067 debugging leftover which seems accidentally committed. commit c11c43fcedb843686b50092dcb228cefcd21a1c8 Merge: c22791c bda030e Author: Nathan Scott Date: Thu Nov 8 10:13:02 2012 +1100 Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into nssmerge Conflicts: Makepkgs configure qa/063 src/pmdas/trace/Makefile.proto Conflict resolution involved: fixing overlaps on Makepkgs configury changes (mingw vs nss changes), rebuilding configure, and reverting NSS related include (-I) changes to the other two since thats where they need to end up anyway (for backward compatibility) as part of coming changes. commit bda030ed6ee4c6fd410bb4ef7d23137ba9ac59bc Author: Dave Brolley Date: Tue Nov 6 17:52:53 2012 -0500 Respect --without-nss in Makepkgs - Pass the option to configure in Makepkgs script - Propagate --without-nss as NSS_CONFIG_FLAGS to builddefs and ot pcp.spec.in - Use it in build/rpm/GNUmakefile commit 313d3ab66b5fd6ba27db9ae7d09d74351ae0dd3f Author: Dave Brolley Date: Mon Nov 5 14:29:26 2012 -0500 Fix qa test case 367 for NSS/NSPR. Use the __pm* socket I/O API consistently Implement __pmRead() commit ffc2aa32bc704c7b2e2b22cccf3dbf6a7e46d76c Author: Dave Brolley Date: Thu Nov 1 17:28:23 2012 -0400 Fix qa test 601 for NSS/NSPR. Provide nss/nspr search paths. commit e56cd187b7d914b3c3dd026268735337984f4ab9 Author: Dave Brolley Date: Tue Oct 30 17:26:17 2012 -0400 Fix qa test case 324 for NSS/NSPR. Pass nss/nspr search paths via CFLAGS. commit 65d3e91e84d2acb51e58c3d8c50388936a75c82c Author: Dave Brolley Date: Tue Oct 30 17:03:51 2012 -0400 Fix qa test case 199 for NSS/NSPR - Pass nss/nspr include search paths in CFLAGS. commit 166cd347d977d0bf1ab2417c1f7f911c3dd4619c Author: Dave Brolley Date: Tue Oct 30 16:01:27 2012 -0400 pcp/qa test case 067 Specify no timeout on PR_Accept. Accept fd numbers of more than 3 digits in length. commit 055342149275744d71ef6d4ce299ceced845fd6f Author: Dave Brolley Date: Tue Oct 30 12:51:31 2012 -0400 Fix qa test case 063 for NSS/NSPR Generate, propagate and use PCP_NSS_INC_DIR and PCP_NSPR_INC_DIR. commit e8eea2bda0e9c4699ce302d00e6aa2012ce8d5c1 Author: Dave Brolley Date: Tue Oct 23 17:13:36 2012 -0400 Use the abstracted __pm* socket I/O interface consistently throughout. commit 37debb698c35fe4b5fbb9b044763955d36e18a0d Author: Dave Brolley Date: Tue Oct 23 17:12:42 2012 -0400 Do not call __pmResetIPC on the client fd until we're finished using it. commit a8f60225bbdc6aa55dc823e420ee653cab73785a Author: Dave Brolley Date: Tue Oct 23 17:10:52 2012 -0400 Preserve the port setting of the address in __pmSetSockAddr() commit cc856d2d5969db4ee6c4a6b356ce9241c16a7998 Author: Dave Brolley Date: Tue Oct 23 17:10:04 2012 -0400 Add missing copyright. commit fe326535e18155e5c1bbe3a779f106fb6db07fd6 Author: Dave Brolley Date: Thu Oct 18 17:02:47 2012 -0400 Return IP addresses in network byte order. commit b2ea9f0f70d752b716aa8b214904ad6e8da875ad Author: Dave Brolley Date: Wed Oct 17 15:24:14 2012 -0400 Use the new __pm* socket API consistently throughout pmlogger. commit 8e7101266197410af0a6e01d4dbb6991d3f9628f Author: Dave Brolley Date: Wed Oct 17 15:22:26 2012 -0400 Add #include search paths for NSS and NSPR when building the 'simple' pmda. commit 6e87dbaeac565c9e4316df2d6455b78ad7cd9d1a Author: Dave Brolley Date: Fri Oct 12 11:35:27 2012 -0400 Use select(3) instead of PR_Poll, even for NSPR sockets. - Could not poll native and NSPR sockets separately since one blocks the other. - PR_Poll does not seem to respond to SIGINT, making it impossible to stop the pmcd using SIGINT. - Translate NSPR file descriptors to native ones and use select to poll both the native and NSPR sockts at the same time. commit 56a3d62186dfa3f87ec66b0de5875e600753f99b Author: Dave Brolley Date: Thu Oct 11 13:12:39 2012 -0400 Don't process an empty nspr_set in nsprSelect. commit c07e042b821f1f1f6e0d1453408d45f4b024fcd9 Author: Dave Brolley Date: Thu Oct 11 13:10:43 2012 -0400 Mark nsprFds as an optional symbol. commit a195efdaee08fdba7aa62005a89b4fde83e6b557 Author: Dave Brolley Date: Wed Oct 10 11:13:51 2012 -0400 Remove comment from ipc.c which had been moved to auxconnect.c. commit b45f16b6071bf43a5739e1bb4c5fbb222d650206 Author: Dave Brolley Date: Wed Oct 10 11:10:59 2012 -0400 Merge NSS/NSPR implementation of the socket I/O abstraction from brolley/nss. - Merges changes into the new organization where separate copies of each function exist, as opposed to separate implementations within each function. - Moves NSPR file descriptor information into the IPC table. From kenj@internode.on.net Thu Nov 8 14:44:22 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA8KiM79021441 for ; Thu, 8 Nov 2012 14:44:22 -0600 X-ASG-Debug-ID: 1352407578-04bdf0029c5f6a0001-S8gJnT Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id tKAXLQAkCQaQxd0i for ; Thu, 08 Nov 2012 12:46:18 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.141 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBANQZnFB20Yh6/2dsb2JhbAANN4YYwFABAQEEIwRSEAsYAgImAgJXsHZukwuBII4UghKBEwOVe5NG Received: from ppp118-209-136-122.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.136.122]) by ipmail04.adl6.internode.on.net with ESMTP; 09 Nov 2012 07:15:52 +1030 Message-ID: <1352407595.4051.99.camel@bozo.localdomain> Subject: Re: [pcp] PMIE Help From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] PMIE Help To: chandana@desilva.id.au Cc: pcp@oss.sgi.com Date: Fri, 09 Nov 2012 07:46:35 +1100 In-Reply-To: <50939986.4050203@desilva.id.au> References: <50939986.4050203@desilva.id.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail04.adl6.internode.on.net[150.101.137.141] X-Barracuda-Start-Time: 1352407578 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC1_TG070 X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113662 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.50 BSF_SC1_TG070 Custom Rule TG070 On Fri, 2012-11-02 at 20:59 +1100, Chandana De Silva wrote: > All, > > I am rying to write a rule to check MySQL Slave lag. > > I have a simple rule which works, as shown below. What I want to have > is a slightly more complex rule which also prints the rate of change, > which the number of seconds the slave has caught up or lost in the > last minute. I think I can get that with the calculation for > lag_rateofchange. > I need to have a rule which is something like; > > $replication_lag >= $lag_critical && $lag_rateofchange >0 > -> shell "$send_nagios -S MySQL_Replication -s 1 Slave %v seconds > behind master, catching up at seconds per minute\n"; > > How can I get the value of $ lag_rateofchange in the ouput text ? ( I > have tried a second %v as suggested by the pmie man page, but that > repeated the first value.) Chandana, Sorry for the tardy response ... foreshadows that there is not a good answer to your question ... 8^(> One of the weaknesses of the pmie "language" is the inability to extract values from arbitrary parts of the expression predicate and paste them into action parameters. %v (and in fact %h and %i also) is a special case "hack" ... from the man page the qualifier "left-most top-level expression in the condition" pretty much means there is only ONE expression that can be picked out. In your example (after macro expansion) the rule is mysql.slave_status.seconds_behind_master >= 3600 && (( mysql.slave_status.seconds_behind_master @0 - mysql.slave_status.seconds_behind_master @1 )) > 0 Since there are no instances or hosts in the expression, %v will be bound to the value of mysql.slave_status.seconds_behind_master when the predicate is true and rule is executed. To get the you're after would need something even more complicated ... is really the difference between mysql.slave_status.seconds_behind_master now and mysql.slave_status.seconds_behind_master at the previous sample all divided by $delta for this rule ... you can get this from _another_ rule, like this (mysql.slave_status.seconds_behind_master @0 - mysql.slave_status.seconds_behind_master @1) / $delta > 0 && mysql.slave_status.seconds_behind_master >= 3600 I'm curious where the reference to a second %v is in the pmie(1) man page ... that would be wrong and should be corrected. Sorry, not the answer you were hoping for. From chandana@desilva.id.au Thu Nov 8 15:50:39 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA8LodU6025339 for ; Thu, 8 Nov 2012 15:50:39 -0600 X-ASG-Debug-ID: 1352411557-04bdf0029c64c80001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id ha9mp0oZqtzbMoxs (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 08 Nov 2012 13:52:37 -0800 (PST) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TWa1c-000O2e-JN; Thu, 08 Nov 2012 21:52:36 +0000 Received: from [192.168.19.77] (ip-34.83.45.175.VOCUS.net.au [175.45.83.34]) by mail.desilva.id.au (Postfix) with ESMTPSA id 8233517F4; Fri, 9 Nov 2012 08:49:07 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/tSEc729PT5N73cATV9AdTiNsaKVqj+ZI= Message-ID: <509C299F.4090703@desilva.id.au> Date: Fri, 09 Nov 2012 08:52:31 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: Ken McDonell CC: pcp@oss.sgi.com Subject: Re: [pcp] PMIE Help References: <50939986.4050203@desilva.id.au> <1352407595.4051.99.camel@bozo.localdomain> X-ASG-Orig-Subj: Re: [pcp] PMIE Help In-Reply-To: <1352407595.4051.99.camel@bozo.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1352411557 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113668 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- I think my interpretation of the man page was too wide. %v Values(s) from the left-most top-level expression in the condition subject to the host and instance assignments that make the condition true. I took Values(s) to men that it will take each value mentioned in the expression in a left-to-right order. On 09/11/12 07:46, Ken McDonell wrote: > I'm curious where the reference to a second %v is in the pmie(1) man > page ... that would be wrong and should be corrected. From nscott@redhat.com Thu Nov 8 16:07:04 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA8M731N026305 for ; Thu, 8 Nov 2012 16:07:04 -0600 X-ASG-Debug-ID: 1352412540-04cb6c3caf60b60001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id gLH0B9UpC79BFbES for ; Thu, 08 Nov 2012 14:09:01 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA8M90XD025832; Thu, 8 Nov 2012 17:09:00 -0500 Date: Thu, 8 Nov 2012 17:09:00 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Cc: Dave Brolley Message-ID: <361853688.23773003.1352412540433.JavaMail.root@redhat.com> Subject: pcp updates: nssmerge branch spring cleaning MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: nssmerge branch spring cleaning Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352412540 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113668 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge src/include/pcp.conf.in | 12 ------------ src/perl/LogImport/Makefile.PL | 2 +- src/perl/PMDA/Makefile.PL | 2 +- src/pmdas/simple/GNUmakefile | 4 ++-- src/pmdas/simple/GNUmakefile.install | 3 +-- src/pmdas/trace/Makefile.proto | 2 +- src/pmdas/trivial/GNUmakefile | 4 ++-- src/pmdas/trivial/GNUmakefile.install | 1 - src/pmdas/txmon/GNUmakefile | 4 ++-- src/pmdas/txmon/GNUmakefile.install | 3 +-- 10 files changed, 11 insertions(+), 26 deletions(-) commit d191ce86120a35c41e72865d33cbcdcce5bdc72c Author: Nathan Scott Date: Fri Nov 9 09:07:13 2012 +1100 Cleanup a few leftover NSS/NSPR include directives From nscott@redhat.com Fri Nov 9 00:58:11 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA96wB8W082754 for ; Fri, 9 Nov 2012 00:58:11 -0600 X-ASG-Debug-ID: 1352444409-04cbb03c297c030001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id AbseaHv6j5b9koAb for ; Thu, 08 Nov 2012 23:00:09 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA9708Rl008874 for ; Fri, 9 Nov 2012 02:00:08 -0500 Date: Fri, 9 Nov 2012 02:00:08 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1538082689.23980446.1352444408911.JavaMail.root@redhat.com> Subject: pcp updates: python + pmstat fixes MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: python + pmstat fixes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1352444409 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113704 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev src/pmstat/pmstat.c | 4 ++-- src/python/pcp.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) commit 187140f124c77f06154ff9f26ad433f91c550500 Author: Nathan Scott Date: Fri Nov 9 17:58:39 2012 +1100 Fix pmstat handling of odd corner case in CPU metrics Came across a machine which was exhibiting a kernel bug, possibly in the Radeon driver, such that all CPU time was being consumed in the kernel. Its likely interrupts were disabled for extended periods too, as on a 1sec sampling interval, pmstat would often observe no change in the CPU time metrics. When this unusual situation arises, pmstat attempts to divide by zero and takes sigfpe - guard against this, and handle it as if no values were observed (which is fairly close to true). commit a50212140dea611cb92b8626549f1140ae80c393 Author: Nathan Scott Date: Fri Nov 9 16:10:46 2012 +1100 Correct the python ctype used for pmAtomValue 32bit integers The Red Hat DTS testing folk have uncovered a bug using PCP QA test 707, in the python PMAPI wrapper, which results in a sigsegv in the test_pcp.python code. It turns out we've been using the wrong sized ctype for the 32bit integer values, and they ended up being assigned into 64bits by accident. This was harmless on (LE) x86_64 but on powerpc64 (BE), life became interesting. Small numbers like 32 (e.g. hinv.ncpus) became very big numbers, and we end up walking off the end of pythons address space when iterating over each CPU. Red Hat bz #873751. From wwwrun@oss.sgi.com Fri Nov 9 11:53:05 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA9Hr5Gt133306 for ; Fri, 9 Nov 2012 11:53:05 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qA9Hr5cT133305; Fri, 9 Nov 2012 11:53:05 -0600 Date: Fri, 9 Nov 2012 11:53:05 -0600 From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 931] New: pmchart new-chart metric-list should be searchable X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp-gui X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: fche@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: nathans@debian.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: Message-ID: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=931 Summary: pmchart new-chart metric-list should be searchable Product: pcp Version: unspecified Platform: All OS/Version: Linux Status: NEW Severity: major Priority: P5 Component: pcp-gui AssignedTo: nathans@debian.org ReportedBy: fche@redhat.com CC: pcp@oss.sgi.com Estimated Hours: 0.0 Classification: Unclassified Sometimes we know substrings, but can't be bothered to navigate down the tree widget to find them. -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From wwwrun@oss.sgi.com Fri Nov 9 12:32:39 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA9IWd7O137243 for ; Fri, 9 Nov 2012 12:32:39 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qA9IWdh8137242; Fri, 9 Nov 2012 12:32:39 -0600 Date: Fri, 9 Nov 2012 12:32:39 -0600 From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 932] New: expose pmRegisterDerived X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp-gui X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: fche@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: nathans@debian.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: Message-ID: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=932 Summary: expose pmRegisterDerived Product: pcp Version: unspecified Platform: All OS/Version: Linux Status: NEW Severity: major Priority: P5 Component: pcp-gui AssignedTo: nathans@debian.org ReportedBy: fche@redhat.com CC: pcp@oss.sgi.com Estimated Hours: 0.0 Classification: Unclassified pmchart should have some UI for creating/managing view-associated derived-metric expressions, so that derived values can be conveniently viewed and packaged. -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From chandana@desilva.id.au Sat Nov 10 13:42:58 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,J_CHICKENPOX_41, J_CHICKENPOX_45,J_CHICKENPOX_75 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAAJgvoG023350 for ; Sat, 10 Nov 2012 13:42:57 -0600 X-ASG-Debug-ID: 1352576696-04bdf0339352930001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id MsLgbirileYPSNxn (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Sat, 10 Nov 2012 11:44:57 -0800 (PST) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TXGzA-0003Uc-7Y for pcp@oss.sgi.com; Sat, 10 Nov 2012 19:44:56 +0000 Received: from [192.168.1.57] (unknown [192.168.1.57]) by mail.desilva.id.au (Postfix) with ESMTPSA id D965454FC for ; Sun, 11 Nov 2012 06:41:28 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+zKxawScqcONfAru9QyG3iHy8tzFPGjug= Message-ID: <509EAEB5.5020805@desilva.id.au> Date: Sun, 11 Nov 2012 06:44:53 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: Build Errors on CentOS 4.8 Content-Type: text/plain; charset=ISO-8859-1; format=flowed X-ASG-Orig-Subj: Build Errors on CentOS 4.8 Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1352576696 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113848 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- All, I tried to build PCP 3.6.9 on a Cent)S 4.8 - i386 host, and got the error shown below. I was able to build 3.5.11-1 without a problem. Nathan has asked me to send this error to the list. I have had this same error on newer CentOS 5 versions, which I was able to resolve by using a host with a clean build of CentOS with the Development tools package group. This did not work on the 4.8 version. Chandana These are the package groups install on the CentOS 4.8 host: %packages @ editors @ emacs @ system-tools @ british-support @ dialup @ legacy-software-development @ development-tools @ ruby kernel e2fsprogs perl-TimeDate kernel-devel grub subversion Build Error =========== ./Makepkgs == Building pcp, log is in Logs/pcp == Configuring pcp for vendor/distro installation (--prefix=/usr --sysconfdir=/etc --localstatedir=/var) == Packaging pcp, log is in Logs/pcp Packaging failed, see log in Logs/pcp Provides: LogImport.so.debug MMV.so.debug PMDA.so.debug bigun.so.debug libpcp.so.3.debug libpcp_gui.so.2.debug libpcp_import.so.1.debug libpcp_mmv.so.1.debug libpcp_pmda.so.3.debug libpcp_trace.so.2.debug pmapi.so.debug pmcd.debug pmda_linux.so.debug pmda_mmv.so.debug pmda_pmcd.so.debug pmda_proc.so.debug pmda_sample.so.debug pmda_sendmail.so.debug pmie.debug pmlogger.debug pmproxy.debug Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 RPM build errors: File not found: /tmp/pcp-build-13661/usr/lib/python2.3/site-packages/pcp.pyo File not found: /tmp/pcp-build-13661/usr/lib/python2.3/site-packages/pcpi.pyo gmake[1]: *** [pack_pcp] Error 1 make: *** [pack_pcp] Error 2 make: Leaving directory `/home/chandana/pcp-3.6.9/build' From wwwrun@oss.sgi.com Sun Nov 11 17:31:10 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qABNVA63178432 for ; Sun, 11 Nov 2012 17:31:10 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qABNVANV178431; Sun, 11 Nov 2012 17:31:10 -0600 Date: Sun, 11 Nov 2012 17:31:10 -0600 Message-Id: <201211112331.qABNVANV178431@oss.sgi.com> From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 931] pmchart new-chart metric-list should be searchable X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp-gui X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: nathans@debian.org X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: nathans@debian.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: In-Reply-To: References: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=931 --- Comment #1 from Nathan Scott 2012-11-11 17:31:09 CST --- There is a button on the new chart (and edit chart) metric selection window with a magnifying glass - that exposes metric name search functionality. Evidently, a bit of a user interface failure here though :) ... any suggestions on how to make this more obvious? -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From nscott@redhat.com Sun Nov 11 17:49:40 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_41 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qABNneMx179540 for ; Sun, 11 Nov 2012 17:49:40 -0600 X-ASG-Debug-ID: 1352677900-04bdf033949fa60001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 8ZirMGyM71dFGoOk for ; Sun, 11 Nov 2012 15:51:41 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qABNpcDu001921; Sun, 11 Nov 2012 18:51:39 -0500 Date: Sun, 11 Nov 2012 18:51:38 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: chandana@desilva.id.au Cc: pcp@oss.sgi.com Message-ID: <70846228.24854879.1352677898818.JavaMail.root@redhat.com> In-Reply-To: <509EAEB5.5020805@desilva.id.au> Subject: Re: [pcp] Build Errors on CentOS 4.8 MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Build Errors on CentOS 4.8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1352677900 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.113958 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header ----- Original Message ----- > All, > > I tried to build PCP 3.6.9 on a Cent)S 4.8 - i386 host, and got the > error shown below. I was able to build 3.5.11-1 without a problem. > Nathan has asked me to send this error to the list. > > I have had this same error on newer CentOS 5 versions, which I was > able > to resolve by using a host with a clean build of CentOS with the > Development tools package group. This did not work on the 4.8 > version. > ... > > RPM build errors: > File not found: > /tmp/pcp-build-13661/usr/lib/python2.3/site-packages/pcp.pyo > File not found: > /tmp/pcp-build-13661/usr/lib/python2.3/site-packages/pcpi.pyo I think this is a result of these lines from src/include/builddefs (autogenerated from builddefs.in) - ifeq "$(TARGET_OS)" "linux" PYTHON_INSTALL = \ $(AWK) '{print} /.pyc$$/ {sub(/.pyc$$/,".pyo"); print}' \ < $(TOPDIR)/python-pcp.list > $(TOPDIR)/python-pcp.list.rpm else ... If you comment that out, does the build proceed to completion? If so, we'll need to tighten up that "if linux" guard to be "if linux and not rpm before a certain version". thanks. -- Nathan From wwwrun@oss.sgi.com Mon Nov 12 06:00:32 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qACC0WEc219347 for ; Mon, 12 Nov 2012 06:00:32 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qACC0W4o219346; Mon, 12 Nov 2012 06:00:32 -0600 Date: Mon, 12 Nov 2012 06:00:32 -0600 Message-Id: <201211121200.qACC0W4o219346@oss.sgi.com> From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 931] pmchart new-chart metric-list should be searchable X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp-gui X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: fche@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: nathans@debian.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: In-Reply-To: References: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=931 --- Comment #2 from Frank Ch. Eigler 2012-11-12 06:00:31 CST --- Ah yes, there it is. How about putting the search box always there, above or below the tree view, replacing the tree view with search results? -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From chandana@desilva.id.au Mon Nov 12 16:15:23 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qACMFM3S256331 for ; Mon, 12 Nov 2012 16:15:23 -0600 X-ASG-Debug-ID: 1352758644-04bdf03392f3ef0001-S8gJnT Received: from mho-02-ewr.mailhop.org (mho-04-ewr.mailhop.org [204.13.248.74]) by cuda.sgi.com with ESMTP id vtgsh1d48Sbq6L5F (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Mon, 12 Nov 2012 14:17:24 -0800 (PST) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.74 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TY2Jn-000MWd-Mq for pcp@oss.sgi.com; Mon, 12 Nov 2012 22:17:23 +0000 Received: from [192.168.19.77] (ip-34.83.45.175.VOCUS.net.au [175.45.83.34]) by mail.desilva.id.au (Postfix) with ESMTPSA id 8F7975C29 for ; Tue, 13 Nov 2012 09:13:57 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19ChWG4rwEPq2dPOTwsAj7cZgyZbKinfHE= Message-ID: <50A1756E.9030700@desilva.id.au> Date: Tue, 13 Nov 2012 09:17:18 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: Re: [pcp] Build Errors on CentOS 4.8 References: X-ASG-Orig-Subj: Re: [pcp] Build Errors on CentOS 4.8 In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-04-ewr.mailhop.org[204.13.248.74] X-Barracuda-Start-Time: 1352758644 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114043 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Nathan, I had to do a little bit more than that. I had to comment out the whole PYTHON section, not just those few lines. Also the python bit in /rpm/pcp.spec.in Thanks On 13/11/12 05:00, pcp-request@oss.sgi.com wrote: > I think this is a result of these lines from src/include/builddefs > (autogenerated from builddefs.in) - > > > ifeq "$(TARGET_OS)" "linux" > PYTHON_INSTALL = \ > $(AWK) '{print} /.pyc$$/ {sub(/.pyc$$/,".pyo"); print}' \ > < $(TOPDIR)/python-pcp.list > $(TOPDIR)/python-pcp.list.rpm > else > ... > > > If you comment that out, does the build proceed to completion? If so, > we'll need to tighten up that "if linux" guard to be "if linux and not > rpm before a certain version". From nscott@redhat.com Mon Nov 12 16:37:43 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qACMbh0A257522 for ; Mon, 12 Nov 2012 16:37:43 -0600 X-ASG-Debug-ID: 1352759984-04cbb0626bee340001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 3QlHMLA4jsB2mWbE for ; Mon, 12 Nov 2012 14:39:45 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qACMdh8J030562; Mon, 12 Nov 2012 17:39:43 -0500 Date: Mon, 12 Nov 2012 17:39:43 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: chandana@desilva.id.au Cc: pcp@oss.sgi.com Message-ID: <1385170403.25390896.1352759983221.JavaMail.root@redhat.com> In-Reply-To: <50A1756E.9030700@desilva.id.au> Subject: Re: [pcp] Build Errors on CentOS 4.8 MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Build Errors on CentOS 4.8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1352759984 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114045 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header ----- Original Message ----- > Nathan, > > I had to do a little bit more than that. > > I had to comment out the whole PYTHON section, not just those few > lines. > Also the python bit in /rpm/pcp.spec.in > Oh, OK - I was trying to get a successful build with python bits, not a python-disabled build. What was the subsequent error after you removed the PYTHON_INSTALL chunk (below)? > On 13/11/12 05:00, pcp-request@oss.sgi.com wrote: > > I think this is a result of these lines from src/include/builddefs > > (autogenerated from builddefs.in) - > > > > > > ifeq "$(TARGET_OS)" "linux" > > PYTHON_INSTALL = \ > > $(AWK) '{print} /.pyc$$/ {sub(/.pyc$$/,".pyo"); print}' \ > > < $(TOPDIR)/python-pcp.list > > > $(TOPDIR)/python-pcp.list.rpm > > else > > ... > > > > > > If you comment that out, does the build proceed to completion? If > > so, > > we'll need to tighten up that "if linux" guard to be "if linux and > > not > > rpm before a certain version". > > _______________________________________________ > pcp mailing list > pcp@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/pcp > From chandana@desilva.id.au Tue Nov 13 10:29:47 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qADGTkqA105951 for ; Tue, 13 Nov 2012 10:29:47 -0600 X-ASG-Debug-ID: 1352824306-04bdf03391131770001-S8gJnT Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by cuda.sgi.com with ESMTP id 08I2BCsnlk5mXjd8 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Tue, 13 Nov 2012 08:31:47 -0800 (PST) X-Barracuda-Envelope-From: chandana@desilva.id.au X-Barracuda-Apparent-Source-IP: 204.13.248.66 Received: from d110-33-163-129.sun801.vic.optusnet.com.au ([110.33.163.129] helo=mail.desilva.id.au) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TYJOs-0001I7-GZ; Tue, 13 Nov 2012 16:31:46 +0000 Received: from [192.168.1.57] (unknown [192.168.1.57]) by mail.desilva.id.au (Postfix) with ESMTPSA id F31915C29; Wed, 14 Nov 2012 03:28:19 +1100 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 110.33.163.129 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+kIIoWBqwGYL2C14fjK9mjhBD+k3lE6pM= Message-ID: <50A275EE.1030202@desilva.id.au> Date: Wed, 14 Nov 2012 03:31:42 +1100 From: Chandana De Silva Reply-To: chandana@desilva.id.au User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: Nathan Scott CC: pcp@oss.sgi.com Subject: Re: [pcp] Build Errors on CentOS 4.8 References: <1385170403.25390896.1352759983221.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: [pcp] Build Errors on CentOS 4.8 In-Reply-To: <1385170403.25390896.1352759983221.JavaMail.root@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mho-03-ewr.mailhop.org[204.13.248.66] X-Barracuda-Start-Time: 1352824307 X-Barracuda-Encrypted: AES256-SHA X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114115 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Here is how I got did the build First Try ------------- $ grep -C 3 "remove python" src/include/builddefs.in # RPM byte-compiles and installs results in our DIST_ROOT, cater for this: ifeq "$(TARGET_OS)" "linux" PYTHON_INSTALL = # remove python #PYTHON_INSTALL = \ # remove python # $(AWK) '{print} /.pyc$$/ {sub(/.pyc$$/,".pyo"); print}' \ # remove python # < $(TOPDIR)/python-pcp.list > $(TOPDIR)/python-pcp.list.rpm else ifeq "$(shell [ '$(PACKAGE_DISTRIBUTION)' = cocoa \ -o '$(PACKAGE_DISTRIBUTION)' = macosx \ ./Makepkgs Result --------- RPM build errors: Could not open %files file /home/m4u-chandana/pcp-3.6.9/pcp-3.6.9/python-pcp.list.rpm: No such file or directory gmake[1]: *** [pack_pcp] Error 1 make: *** [pack_pcp] Error 2 Second Try ----------------- $ grep -C 3 "remove python" build/rpm/pcp.spec.in %files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list %defattr(-,root,root) # remove python #%files -n python-pcp -f python-pcp.list.rpm # remove python #%defattr(-,root,root) %changelog * Fri Oct 12 2012 Nathan Scott - 3.6.9-1 ./Makepkgs clean Result -------- == Packaging pcp, log is in Logs/pcp Packaging failed, see log in Logs/pcp if [ ! -L $SRC_ROOT -a "linux" != mingw ] ; then \ if [ -n "$SRC_ROOT" ]; then \ rm -rf $SRC_ROOT || exit 1; \ ln -s . $SRC_ROOT || exit 1; \ fi; \ fi; \ fi ln: `../pcp-3.6.9/.': cannot overwrite directory make: *** [pcp.src] Error 1 Third Try ------------ Makepkgs clean did not clean very well, start again in a fresh directory with the same changes ./Makepkgs Result --------- == Packaging pcp, log is in Logs/pcp Packaging failed, see log in Logs/pcp RPM build errors: Installed (but unpackaged) file(s) found: /usr/lib/python2.3/site-packages/pcp.py /usr/lib/python2.3/site-packages/pcp.pyc /usr/lib/python2.3/site-packages/pcpi.py /usr/lib/python2.3/site-packages/pcpi.pyc /usr/lib/python2.3/site-packages/pmapi.so gmake[1]: *** [pack_pcp] Error 1 make: *** [pack_pcp] Error 2 At this point, I gave up and removed all the python stuff from builddefs.in and the spec file. Chandana On 13/11/12 09:39, Nathan Scott wrote: > Oh, OK - I was trying to get a successful build with python bits, > not a python-disabled build. What was the subsequent error after > you removed the PYTHON_INSTALL chunk (below)? From nscott@redhat.com Tue Nov 13 17:03:46 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qADN3j0K172183 for ; Tue, 13 Nov 2012 17:03:46 -0600 X-ASG-Debug-ID: 1352847947-04bdf0339314c370001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id pvJqm9liKOHU2hE8 for ; Tue, 13 Nov 2012 15:05:47 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qADN5lJa015296; Tue, 13 Nov 2012 18:05:47 -0500 Date: Tue, 13 Nov 2012 18:05:47 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: chandana@desilva.id.au Cc: pcp@oss.sgi.com Message-ID: <670940513.26069332.1352847947038.JavaMail.root@redhat.com> In-Reply-To: <50A275EE.1030202@desilva.id.au> Subject: Re: [pcp] Build Errors on CentOS 4.8 MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Build Errors on CentOS 4.8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352847947 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114141 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header Hi Chandana, > PYTHON_INSTALL = > # remove python #PYTHON_INSTALL = \ > # remove python # $(AWK) '{print} /.pyc$$/ > {sub(/.pyc$$/,".pyo"); > print}' \ > # remove python # < $(TOPDIR)/python-pcp.list > > $(TOPDIR)/python-pcp.list.rpm ... > RPM build errors: > Could not open %files file > /home/m4u-chandana/pcp-3.6.9/pcp-3.6.9/python-pcp.list.rpm: No such > file or directory OK, so that file should have been created by ... ah, heh, I see what happened. By removing the PYTHON_INSTALL entirely, we've prevented the python-pcp.list.rpm file from being created at all. Something like this should get us back on track: PYTHON_INSTALL = cp $(TOPDIR)/python-pcp.list $(TOPDIR)/python-pcp.list.rpm Could you see if that runs to completion, or is there another error after that? Its very close to the end of the build here, so there's not much else left that could go wrong I think. (famous last words) > Second Try > ----------------- > $ grep -C 3 "remove python" build/rpm/pcp.spec.in > %files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list > %defattr(-,root,root) > > # remove python #%files -n python-pcp -f python-pcp.list.rpm > # remove python #%defattr(-,root,root) > > %changelog > * Fri Oct 12 2012 Nathan Scott - 3.6.9-1 > > ./Makepkgs clean I think you need "-clean" not clean? > > Result > -------- > == Packaging pcp, log is in Logs/pcp > Packaging failed, see log in Logs/pcp > if [ ! -L $SRC_ROOT -a "linux" != mingw ] ; then \ > if [ -n "$SRC_ROOT" ]; then \ > rm -rf $SRC_ROOT || exit 1; \ > ln -s . $SRC_ROOT || exit 1; \ > fi; \ > fi; \ > fi > ln: `../pcp-3.6.9/.': cannot overwrite directory > make: *** [pcp.src] Error 1 The make (dist)clean should have removed that at the start of the build (its leftover from an earlier build in the same directory). cheers. -- Nathan From nscott@redhat.com Wed Nov 14 01:14:50 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_45 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAE7Enxk036142 for ; Wed, 14 Nov 2012 01:14:50 -0600 X-ASG-Debug-ID: 1352877412-04cbb062681530f0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 5TJ0UyVPCGuVjzPZ for ; Tue, 13 Nov 2012 23:16:53 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAE7GqsM025148 for ; Wed, 14 Nov 2012 02:16:52 -0500 Date: Wed, 14 Nov 2012 02:16:52 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1278703799.26139405.1352877412354.JavaMail.root@redhat.com> Subject: pcp updates: non-root qa updates MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: non-root qa updates Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1352877412 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114173 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev .gitignore | 3 - qa/041 | 3 - qa/041.out | 2 qa/119 | 3 - qa/187 | 2 qa/294 | 5 +- qa/295 | 5 +- qa/382 | 5 +- qa/457 | 15 +++++- qa/457.out | 109 +++++++++++++++++++++++++++++++---------------- qa/458 | 4 - qa/458.out | 23 +++------ qa/461 | 4 - qa/461.out | 20 ++------ qa/529 | 7 ++- qa/538 | 5 +- qa/common.filter | 1 qa/qa_hosts.master | 1 src/pmdas/linux/help | 2 src/pmdas/logger/event.c | 6 +- 20 files changed, 137 insertions(+), 88 deletions(-) commit d2f897258dbf27fe47cf7c7f310cb1fbc7c4daa2 Author: Nathan Scott Date: Wed Nov 14 18:15:37 2012 +1100 Revert accidental permissions change on some out files commit 943b2caf2ae6900048ec58f323872b64def41808 Author: Nathan Scott Date: Wed Nov 14 18:15:04 2012 +1100 Next round of QA changes allowing for non-root daemons commit f1f169d4ccd0d970697604a84336adeda1481e95 Author: Nathan Scott Date: Wed Nov 14 17:32:28 2012 +1100 Add ignore fluff for tmp vi files and pmcd/pmda log files commit cfe31a88c6398b66ae80f7fdefbb5360d87fa304 Author: Nathan Scott Date: Wed Nov 14 17:31:42 2012 +1100 Reinstance the pmdalogger tests, checked working with latest code commit 42b3d3e3837df7f27e616c40df3061752a6f0c9e Author: Nathan Scott Date: Wed Nov 14 17:24:14 2012 +1100 Improve notrun handling in test 187 when a remote pmcd not found commit 1ce5e17f710060d3773a327a67d77a4b78175cc9 Author: Nathan Scott Date: Wed Nov 14 17:23:12 2012 +1100 Update to qa/041 to still work when pmcd not running as root commit 270885b37a013c4b9f3cca30f49c9237b8eabc07 Author: Nathan Scott Date: Wed Nov 14 17:22:19 2012 +1100 Fix pmdalogger error handling for directory files, RHEL6 commit f85b963a400b8fb038f309b9344852f22ba9389b Author: Nathan Scott Date: Tue Nov 13 09:01:03 2012 +1100 Fix typo in hinv.ndisk help, remove floppy disk reference From nscott@redhat.com Wed Nov 14 23:33:52 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAF5Xpcl217666 for ; Wed, 14 Nov 2012 23:33:51 -0600 X-ASG-Debug-ID: 1352957755-04cb6c508310150001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id ImLf7jOrbPUR20Cn for ; Wed, 14 Nov 2012 21:35:55 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAF5Zsmo002539 for ; Thu, 15 Nov 2012 00:35:55 -0500 Date: Thu, 15 Nov 2012 00:35:54 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <2103956249.26678282.1352957754917.JavaMail.root@redhat.com> Subject: pcp updates: qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1352957755 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114258 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/1108 | 7 ++++++- qa/119 | 2 +- qa/244 | 19 +++++++------------ qa/279 | 1 + qa/297 | 29 +++++++++++------------------ qa/382 | 3 ++- qa/common.check | 14 ++++++++++++++ qa/mk.qa_hosts | 11 +++++++---- qa/qa_hosts.master | 3 +-- 9 files changed, 50 insertions(+), 39 deletions(-) commit 59e79ec21ddd167db6c6b95f40b3ac85ea035b28 Author: Nathan Scott Date: Thu Nov 15 16:32:13 2012 +1100 Make qa/244 dynamically search for a free port to avoid conflicts Turns out postgres will listen on the same port this test assumed was free. This change adds a generic helper routine allowing one to scan for a free port from some base port and updates qa/244 to make use of it. commit 06fb0b2a1ae4bc1a787bcb55e5715a59869ad5f1 Author: Nathan Scott Date: Thu Nov 15 16:30:13 2012 +1100 Make qa/279 use forced_restart explicitly in one of its cases This ensures the test exercises what it is trying to exercise still, in the exciting new world of pcp daemons running non-root. Test will still work for older releases too, handily. commit 45803c4468e5c80f3943b8a7c0442713e66ae128 Author: Nathan Scott Date: Thu Nov 15 16:29:08 2012 +1100 Extend master qa host file with some more local test hosts commit 335ec988b74c21ff78996a62d6d78cf02df35cbd Author: Nathan Scott Date: Thu Nov 15 16:28:24 2012 +1100 Add qa/297 pmproxy -U option filter in case its used commit 9274d7d0c4bdcf63735b71cb18a67b2ae0b09ab7 Author: Nathan Scott Date: Thu Nov 15 16:26:41 2012 +1100 Add qa/382 pmdasample -U option filter in case its used Also make some additional test hosts visible, use /bin/domainname too if its found and no domainname has been found by that stage. commit 00b60b2933adf10a5344c661c6522a73b5b77ae8 Author: Nathan Scott Date: Thu Nov 15 16:25:33 2012 +1100 use more portable chown invocation in qa/119 commit 12c8523bce7f2510484fe0ab063e48103d7ee9b7 Author: Nathan Scott Date: Thu Nov 15 16:24:59 2012 +1100 local pmlogger control file changes no longer affect qa/1108 From nscott@redhat.com Thu Nov 15 20:57:55 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAG2vtOm050873 for ; Thu, 15 Nov 2012 20:57:55 -0600 X-ASG-Debug-ID: 1353034799-04cbb06ab04b520001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id r24VrYYsriGG4Ge6 for ; Thu, 15 Nov 2012 18:59:59 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAG2xxrZ023825 for ; Thu, 15 Nov 2012 21:59:59 -0500 Date: Thu, 15 Nov 2012 21:59:59 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1449870620.27182577.1353034799083.JavaMail.root@redhat.com> Subject: pcp updates: unprivileged daemons MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: unprivileged daemons Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353034799 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114344 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev build/mac/cmdline-install | 6 +-- build/mac/installer-resources/postflight | 4 -- build/mac/installer-resources/postinstall | 30 +++++++++++++++--- build/mac/installer-resources/postupgrade | 30 +++++++++++++++--- build/mac/installer-resources/preflight | 4 -- build/mac/installer-resources/preinstall | 4 -- build/mac/installer-resources/preupgrade | 4 -- build/rpm/devtoolset.spec | 12 ++++++- build/rpm/fedora.spec | 12 ++++++- build/rpm/pcp.spec.in | 11 ++++++ build/sun/postinstall | 5 +++ configure.in | 4 +- debian/GNUmakefile | 2 - debian/pcp-testsuite.postinst | 7 ++++ debian/pcp.postinst | 5 +++ man/man1/pmdashping.1 | 8 ++++ qa/314 | 5 +-- src/include/pcp/impl.h | 1 src/include/pcp/platform_header.h.in | 1 src/libpcp/src/util.c | 44 +++++++++++++++++++++++++++ src/libpcp/src/win32.c | 7 ++++ src/perl/PMDA/PMDA.xs | 2 - src/perl/PMDA/local.c | 24 -------------- src/pmcd/pmcd.options | 5 ++- src/pmcd/pmdaproc.sh | 6 ++- src/pmcd/rc_pmcd | 2 - src/pmcd/src/.gitignore | 1 src/pmcd/src/pmcd.c | 34 +++++++++++++------- src/pmdas/aix/aix.c | 4 +- src/pmdas/apache/Install | 1 src/pmdas/apache/apache.c | 2 + src/pmdas/bash/Install | 1 src/pmdas/bash/bash.c | 2 + src/pmdas/bonding/Install | 1 src/pmdas/bonding/pmdabonding.pl | 2 - src/pmdas/cisco/Install | 14 -------- src/pmdas/cisco/pmda.c | 1 src/pmdas/darwin/pmda.c | 2 + src/pmdas/dbping/Install | 5 --- src/pmdas/dbping/pmdadbping.pl | 1 src/pmdas/dtsrun/Install | 1 src/pmdas/dtsrun/pmdadtsrun.pl | 1 src/pmdas/elasticsearch/Install | 1 src/pmdas/elasticsearch/pmdaelasticsearch.pl | 3 - src/pmdas/freebsd/freebsd.c | 2 + src/pmdas/gpsd/Install | 1 src/pmdas/gpsd/pmdagpsd.pl | 1 src/pmdas/hotproc/Install | 15 --------- src/pmdas/hotproc/src/hotproc.c | 1 src/pmdas/kvm/Install | 8 ++-- src/pmdas/kvm/Remove | 4 -- src/pmdas/kvm/pmdakvm.pl | 6 +-- src/pmdas/linux/pmda.c | 2 + src/pmdas/linux_proc/Install | 5 --- src/pmdas/linux_proc/pmda.c | 19 +++++++++-- src/pmdas/lmsensors/Install | 14 -------- src/pmdas/lmsensors/lmsensors.c | 2 + src/pmdas/logger/Install | 3 + src/pmdas/logger/logger.c | 2 + src/pmdas/lustrecomm/Install | 17 ---------- src/pmdas/lustrecomm/lustrecomm.c | 2 + src/pmdas/mailq/Install | 14 -------- src/pmdas/mailq/mailq.c | 2 + src/pmdas/memcache/Install | 5 --- src/pmdas/memcache/pmdamemcache.pl | 7 +--- src/pmdas/mmv/Install | 1 src/pmdas/mmv/mmv.c | 2 + src/pmdas/mounts/Install | 17 ---------- src/pmdas/mounts/mounts.c | 2 + src/pmdas/mssql/Install | 5 --- src/pmdas/mssql/pmdamssql.pl | 4 -- src/pmdas/mysql/Install | 5 --- src/pmdas/mysql/pmdamysql.pl | 1 src/pmdas/named/Install | 1 src/pmdas/named/pmdanamed.pl | 3 + src/pmdas/netfilter/Install | 1 src/pmdas/netfilter/pmdanetfilter.pl | 3 + src/pmdas/news/Install | 5 --- src/pmdas/news/pmdanews.pl | 7 +--- src/pmdas/oracle/Install | 1 src/pmdas/pdns/Install | 1 src/pmdas/postfix/Install | 1 src/pmdas/postfix/pmdapostfix.pl | 2 + src/pmdas/postgresql/Install | 1 src/pmdas/process/Install | 23 +------------- src/pmdas/roomtemp/Install | 17 ---------- src/pmdas/rsyslog/Install | 1 src/pmdas/rsyslog/pmdarsyslog.pl | 5 +-- src/pmdas/samba/Install | 1 src/pmdas/samba/pmdasamba.pl | 2 + src/pmdas/sample/Install | 14 -------- src/pmdas/sample/src/pmda.c | 21 ++++++++++-- src/pmdas/sendmail/Install | 18 ----------- src/pmdas/sendmail/sendmail.c | 2 + src/pmdas/shping/Install | 15 --------- src/pmdas/shping/pmda.c | 13 ++++++- src/pmdas/simple/Install | 6 +-- src/pmdas/simple/pmdasimple.pl | 2 + src/pmdas/simple/simple.c | 2 + src/pmdas/snmp/Install | 5 --- src/pmdas/snmp/pmdasnmp.pl | 2 + src/pmdas/summary/Install | 13 ------- src/pmdas/summary/pmda.c | 1 src/pmdas/systemtap/Install | 5 --- src/pmdas/systemtap/pmdasystemtap.pl | 6 +-- src/pmdas/trace/Install | 16 +-------- src/pmdas/trace/src/pmda.c | 2 + src/pmdas/trivial/Install | 17 ---------- src/pmdas/trivial/trivial.c | 2 + src/pmdas/txmon/Install | 16 --------- src/pmdas/txmon/txmon.c | 2 + src/pmdas/vmware/Install | 5 --- src/pmdas/vmware/pmdavmware.pl | 6 +-- src/pmdas/weblog/Install | 16 --------- src/pmdas/weblog/pmda.c | 1 src/pmdas/zimbra/Install | 3 + src/pmdas/zimbra/pmdazimbra.pl | 2 + src/pmie/src/pmie.c | 12 ++++++- src/pmlogctl/pmlogger_check.sh | 8 ++-- src/pmlogger/pmlogger.c | 18 +++++++++-- src/pmproxy/pmproxy.c | 6 +-- src/pmproxy/pmproxy.options | 6 +-- 122 files changed, 406 insertions(+), 423 deletions(-) commit ee474263ee8737dd75540ab435fe47e39ef9bb05 Author: Nathan Scott Date: Fri Nov 16 13:52:09 2012 +1100 Transition daemons to run under an unprivileged user account Introduces a common __pmSetProcessIdentity() helper routine that allows a daemon started as root to drop privileges. A common -U command line option is used in many (more) daemons now to allow them to potentially run as root again should an issue arise. The perl PCP::PMDA module has been updated to use it in its set_user interface (pre-existing, for PMDAs already dropping privileges). Packaging support is added to create a "pcp" user/group for the PCP daemons to use - which they now do by default. pmcd is the trickiest, as it creates children (pmdas) that may or may not have to run as the same user (or even root, for backward compatibility). The approach taken has been to start all PMDAs, then drop privileges, then enter the main (network facing) loop. This means the agents also run initially as root, allowing them to change user (e.g. to postgres) if needed, or to continue to run as root (back-compat) or to also switch to running as "pcp". Many of the PMDAs have been updated to do the latter (whereever possible). The one caveat with the above is that sighup handling in pmcd is no longer as straight-forward. Since pmcd is no longer root when it receives sighup, it can only (re)start pmdas running as the same user. Since the Install scripts use sighup to request pmcd start the new agent, we've had to add a 'forced_restart' shell variable into the pmdaproc.sh known set, which can be used to indicate that a PMDA requires a full pmcd restart to complete its Install. This is *set by default* for backward compatibility, thus PMDA authors who choose to run their PMDA as "pcp", should set forced_restart to false - allowing sighup to start their PMDA, and be less invasive to existing pmcd clients (which will otherwise need to reconnect to pmcd, typically losing all state). pmproxy has been changed from "nobody" to run as the "pcp" user by default as well (old behaviour available via -U still). System pmlogger and pmie daemons also now run as the "pcp" user by default. commit 0265c2fa11f3f57857289bcbd8ed18808300b08b Author: Nathan Scott Date: Fri Nov 16 12:01:23 2012 +1100 Ensure non-root pmcd can write to tmpfile location in qa/314 From nscott@redhat.com Fri Nov 16 17:34:52 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_33 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAGNYqQ6167289 for ; Fri, 16 Nov 2012 17:34:52 -0600 X-ASG-Debug-ID: 1353109017-04cbb06ab17f680001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id xgQXNkWG0eZqUBPd for ; Fri, 16 Nov 2012 15:36:57 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAGNavqT016080 for ; Fri, 16 Nov 2012 18:36:57 -0500 Date: Fri, 16 Nov 2012 18:36:57 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <2016108665.27699101.1353109017038.JavaMail.root@redhat.com> Subject: pcp updates: further non-root qa updates MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: further non-root qa updates Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.68] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353109017 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114422 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/1049 | 12 +++++------- qa/280 | 4 ++-- qa/280.out | 4 ++-- qa/282 | 1 + src/pmie/pmie_check.sh | 1 + src/pmie/rc_pmie | 7 +++---- src/pmlogctl/pmlogger_check.sh | 1 + 7 files changed, 15 insertions(+), 15 deletions(-) commit d26a93f7ecd7feafdf4afc6427cf543ab7f0a5d0 Author: David Disseldorp Date: Sat Nov 17 10:34:22 2012 +1100 qa/282: filter pcp owned processes in the ps output commit b72caf859f491615e3704e3e34be0c72af6440d4 Author: Nathan Scott Date: Sat Nov 17 10:33:14 2012 +1100 If recent pcp being tested, ensure pmie doesnt switch user in qa/1049 commit 0f788085c54b882797c433f8753cc119e15add05 Author: Nathan Scott Date: Sat Nov 17 10:27:43 2012 +1100 Update qa/280 to work with non-root daemons commit 0fef8f9a6f5357fb62fe7c839705569809616cde Author: Nathan Scott Date: Sat Nov 17 10:22:46 2012 +1100 If scripts (re)create log/pmie dirs, force ownership to pcp:pcp once more From makc@iinet.net.au Sun Nov 18 23:14:49 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAJ5Enjq221528 for ; Sun, 18 Nov 2012 23:14:49 -0600 X-ASG-Debug-ID: 1353302216-04bdf03ea0ceb00001-S8gJnT Received: from icp-osb-irony-out4.external.iinet.net.au (icp-osb-irony-out4.external.iinet.net.au [203.59.1.220]) by cuda.sgi.com with ESMTP id VCT1odYmAuc77f7o for ; Sun, 18 Nov 2012 21:16:56 -0800 (PST) X-Barracuda-Envelope-From: makc@iinet.net.au X-Barracuda-Apparent-Source-IP: 203.59.1.220 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmcJACjAqVDL2Rwk/2dsb2JhbABFhTe8dAQEgQiBCIJfZyc+iD4BEZ5hoFiOGoMnA5V8hg2KNoMD X-IronPort-AV: E=Sophos;i="4.83,276,1352044800"; d="scan'208";a="59045650" Received: from unknown (HELO emma.crabbed.net) ([203.217.28.36]) by icp-osb-irony-out4.iinet.net.au with ESMTP; 19 Nov 2012 13:16:55 +0800 Received: by emma.crabbed.net (Postfix, from userid 16314) id 01E893C5CC7; Mon, 19 Nov 2012 16:16:54 +1100 (EST) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <20649.49350.953707.964416@iinet.net.au> Date: Mon, 19 Nov 2012 16:16:54 +1100 From: Max Matveev To: pcp@oss.sgi.com Subject: PCP on Solaris X-Mailer: VM 7.17 under 21.4 (patch 19) "Constant Variable" XEmacs Lucid X-ASG-Orig-Subj: PCP on Solaris X-Barracuda-Connect: icp-osb-irony-out4.external.iinet.net.au[203.59.1.220] X-Barracuda-Start-Time: 1353302216 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114622 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- After Nathan dragged me into checking his recent change to Solaris post-install scripts I've attempted to build 3.6.10 on Open Solaris 2009 VM I've been using for the last several years. The build failed rather miserably. I've fixed some of the problems and while doing that it made me think what version of Solaris should be used to test pcp - Open Solaris 2009 was new and shiny at the time but it's getting long in the tooth. Does anyone on this list has interest in a particular version of Solaris (or Open Indiana or Illumos)? max From pcp-announce-bounces@oss.sgi.com Mon Nov 19 18:45:39 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAK0jScs076358; Mon, 19 Nov 2012 18:45:28 -0600 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAK0iLxN076255 for ; Mon, 19 Nov 2012 18:44:21 -0600 X-ASG-Debug-ID: 1353372389-04cbb06ab214e730001-87ZIJf Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id gk57hfBepcwSIETA for ; Mon, 19 Nov 2012 16:46:29 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAK0kTiN023161; Mon, 19 Nov 2012 19:46:29 -0500 Date: Mon, 19 Nov 2012 19:46:29 -0500 (EST) From: Nathan Scott To: pcp-announce@oss.sgi.com Message-ID: <587041321.28475890.1353372389138.JavaMail.root@redhat.com> In-Reply-To: <2010221349.28472597.1353371155808.JavaMail.root@redhat.com> MIME-Version: 1.0 X-ASG-Orig-Subj: PCP 3.6.10 released [NOTE: this release contains security improvements] X-Originating-IP: [10.64.50.148] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353372389 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114698 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Cc: David Disseldorp , Thomas Biege Subject: [pcp-announce] PCP 3.6.10 released [NOTE: this release contains security improvements] X-BeenThere: pcp-announce@oss.sgi.com X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Nathan Scott List-Id: pcp announcements List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: pcp-announce-bounces@oss.sgi.com Errors-To: pcp-announce-bounces@oss.sgi.com Hi all, PCP 3.6.10 has now been released. This update is the first to include the changes that make all PCP daemons (pmcd, pmlogger, pmie, pmproxy, and all-PMDAs-that-choose-to-opt-in) run under an unprivileged user account, rather than as root. The account should be automatically created by the packaging system being used (rpm/deb/dmg). Additionally, it includes important changes to the way many of the PCP shell scripts choose to name temporary files (using the PID of the shell script). This addresses CVE-2012-5530 which was found and kindly reported to us by Thomas Beige and equally kindly fixed by David Disseldorp (both from SUSE). Thanks! A note for PMDA authors, for agents that are not part of PCP: in order to ensure continued function for you, by default, your PMDA will continue to run as root (or whichever user you are currently running as). That is, provided it runs as a daemon and not a DSO. If you would like to drop privileges, please refer to the example PMDAs included in PCP (e.g. pmdasample or pmdasimple) - in particular, their main() routines and Install scripts - its very straight forward to switch over. Feel free to seek clarification and ask questions on either the #pcp IRC channel on freenode.net or the pcp@oss.sgi.com mailing list. pcp-3.6.10 (19 November 2012) - Transition daemons to run under an unprivileged account. - Fixes for security advisory CVE-2012-5530: tmpfile flaws. - Fix pcp(1) command short-form pmlogger reporting. - Fix pmdalogger error handling for directory files. - Fix pmstat handling of odd corner case in CPU metrics. - Correct the python ctype used for pmAtomValue 32bit ints. - Add missing RPM spec dependency for python-ctypes. - Corrections to pmdamysql metrics units. - Add pmdamysql slave status metrics. - Improve pmcollectl error messages. - Parameterize pmcollectl CPU counts in interrupt subsys. - Fix generic RPM packaging for powerpc builds. - Fix python API use of reentrant libpcp string routines. - Python code backporting for RHEL5 in qa and pmcollectl. - Fix edge cases in capturing interrupt error counts. cheers. -- Nathan _______________________________________________ pcp-announce mailing list pcp-announce@oss.sgi.com http://oss.sgi.com/mailman/listinfo/pcp-announce From nscott@redhat.com Mon Nov 19 20:50:26 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAK2oPs4090544 for ; Mon, 19 Nov 2012 20:50:26 -0600 X-ASG-Debug-ID: 1353379952-04bdf039f715b0b0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 9UFBjvR4EX62CTF7 for ; Mon, 19 Nov 2012 18:52:32 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAK2qVxU031006 for ; Mon, 19 Nov 2012 21:52:32 -0500 Date: Mon, 19 Nov 2012 21:52:31 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <224270109.28497655.1353379951853.JavaMail.root@redhat.com> Subject: pcp updates: secure tmpfile naming MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: secure tmpfile naming Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.148] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353379952 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114708 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev CHANGELOG | 17 ++- GNUmakefile | 1 Makepkgs | 19 +-- build/mac/build-installer | 10 - build/mac/cmdline-install | 16 +-- build/mac/install-pcp | 48 ++++----- build/rpm/devtoolset.spec | 57 ++++++++-- build/rpm/fedora.spec | 12 +- build/rpm/pcp.spec.in | 2 configure | 29 ++++- configure.in | 19 +++ debian/changelog | 3 man/man1/pcp.1 | 1 qa/023 | 4 qa/1049 | 12 -- qa/184 | 1 qa/184.out | 2 qa/280 | 4 qa/280.out | 4 qa/282 | 1 qa/315 | 2 qa/368 | 3 qa/455 | 4 qa/507 | 4 qa/564 | 1 qa/646 | 3 qa/646.out | 4 src/genpmda/genpmda | 4 src/include/pcp/pmiestats.h | 3 src/libpcp/src/check-statics | 31 ++--- src/pcp/pcp.sh | 114 ++++++++++----------- src/pmafm/mkaf | 12 +- src/pmafm/pmafm | 18 +-- src/pmcd/pmdaproc.sh | 82 +++++++-------- src/pmcd/rc_pcp | 4 src/pmcd/rc_pmcd | 47 ++++---- src/pmdas/bash/GNUmakefile | 1 src/pmdas/bash/Install | 3 src/pmdas/cisco/Install | 4 src/pmdas/hotproc/Install | 7 - src/pmdas/hotproc/help.fmt | 6 - src/pmdas/mmv/GNUmakefile | 1 src/pmdas/mmv/Install | 3 src/pmdas/pmcd/src/pmcd.c | 14 +- src/pmdas/sample/Install | 4 src/pmdas/shping/Install | 10 - src/pmdas/weblog/Install | 48 ++++----- src/pmdas/weblog/Web.Allservers.pmchart | 42 +++---- src/pmdas/weblog/Web.Perserver.Bytes.pmchart | 32 +++--- src/pmdas/weblog/Web.Perserver.Requests.pmchart | 34 +++--- src/pmdas/weblog/server.sh | 46 ++++---- src/pmie/GNUmakefile | 3 src/pmie/pmie_check.sh | 77 +++++++------- src/pmie/pmie_daily.sh | 78 +++++++------- src/pmie/rc_pmie | 52 ++++----- src/pmie/src/pmie.c | 14 +- src/pmieconf/rules.c | 13 +- src/pmieconf/xtractnames | 8 - src/pmlogconf/pmlogconf-setup.sh | 37 +++--- src/pmlogconf/pmlogconf.sh | 127 +++++++++++------------- src/pmlogctl/pmlogger_check.sh | 47 ++++---- src/pmlogctl/pmlogger_daily.sh | 90 ++++++++--------- src/pmlogctl/pmlogger_merge.sh | 25 ++-- src/pmlogctl/pmnewlog.sh | 62 +++++------ src/pmlogger/GNUmakefile | 1 src/pmlogger/rc_pmlogger | 20 +-- src/pmlogsummary/pmwtf.sh | 45 ++++---- src/pmns/Make.stdpmid | 19 +-- src/pmns/Rebuild | 55 +++++----- src/pmns/pmnsadd | 20 +-- src/pmproxy/rc_pmproxy | 22 ++-- 71 files changed, 882 insertions(+), 786 deletions(-) commit b9e95a1069a55ffc2e198786513a024c81893879 Author: David Disseldorp Date: Mon Nov 19 12:30:29 2012 +1100 pmns: set a sane umask before creating tmp dir This allows access to the tmp directory when run with a silly umask setting. This is needed to pass test 082. commit 2f0fd7aa05b09ccfbdcddf0c87c3a869b6def6cf Author: Nathan Scott Date: Mon Nov 19 11:26:06 2012 +1100 Prepare for pcp-3.6.10 release - docs, spec, version updates commit 8cd331e2b6be0a8d3ec93cb4ec0a031efd53a591 Author: David Disseldorp Date: Mon Nov 19 10:42:01 2012 +1100 Fix qa/368 with pmlogconf filter to handle nested tmp commit dff5c1fe0735bacf6ee194dc55e53a8fdaf8be3b Author: David Disseldorp Date: Mon Nov 19 10:37:29 2012 +1100 Add qa/646 PCP_TMP_DIR filter for mmvdump commit 72745de30d87eb4ba00c7f426e4e05982a94912e Author: David Disseldorp Date: Mon Nov 19 10:34:30 2012 +1100 fix qa/184 pmnewlog filter as it uses mktemp now commit e85bfc0c137cb8e06f4678042be6ee36cc52e5f4 Author: David Disseldorp Date: Mon Nov 19 10:31:40 2012 +1100 qa/646 use PCP_TMP_DIR for mmv cleanup path commit 63948e94d0a26893db524389b50d1f2a24d9b3d2 Author: Nathan Scott Date: Mon Nov 19 10:28:10 2012 +1100 Create PCP_TMP_DIRs at install time removing potential races commit ed4080387109f946c005871f1400e5459ede55b1 Author: Nathan Scott Date: Mon Nov 19 10:26:10 2012 +1100 Fix a pcp(1) regression from recent tmpfile fixes commit c97946c9ed24ae6d71a271fab0495dbd9013f4fd Author: Nathan Scott Date: Mon Nov 19 09:58:47 2012 +1100 Small improvement to the pcp(1) status command Noticed the script was expecting to find "pcplog" in the archive path from daemon pmloggers; thats an old IRIXism so extend it to also check for the modern variants first (.../pmlogger/...) and falling back to the old-style. Removed redundant cmdline argument handling (-h and args). commit ca9e7bf7be5cc33b6b23f2653a6df244482b9eb7 Author: Nathan Scott Date: Mon Nov 19 09:53:20 2012 +1100 Use parameterised PCP_RUN_DIR in qa/023 commit ce67c8f3a58e0cc4bbd4b6f9006900c1aba046e9 Author: David Disseldorp Date: Fri Nov 16 16:51:04 2012 +1100 Nest tmp files under mktemp subdirs Many scripts currently manipulate predictable files in /tmp and /var/tmp, allowing for symlink race vulnerabilities. Addresses CVE-2012-5530: insecure pcp script tmp file handling. commit 0f3908cada8a50e8af04e527ba1a60cb5257e483 Author: David Disseldorp Date: Fri Nov 16 16:25:43 2012 +1100 Use mktemp for init script temporary state files Addresses CVE-2012-5530: insecure pcp script tmp file handling. commit 1506c33e927580ea90040e3a494766908f87da54 Author: David Disseldorp Date: Fri Nov 16 16:11:58 2012 +1100 Fix tmp file clean-up in mac build-installer script The trap function erroneously removes any "exit" or "$status" files. commit 9dc864f4a1aff46cd41c0060e4af0c2572b81297 Author: David Disseldorp Date: Fri Nov 16 15:15:37 2012 +1100 Remove fixed PMIE_DIR path Nest pmie subdirectory under PCP_TMP_DIR, as is expected by rc_pmie. commit f85836da54f9927875c26ef2548862e59867345d Author: David Disseldorp Date: Fri Nov 16 15:10:28 2012 +1100 Consistently use PCP_TMP_DIR in pmlogger_check.sh Rather than a hard-coded /var/tmp path. commit 0400aaa1576be56dc5dd15c42fb7b299705d5696 Author: David Disseldorp Date: Fri Nov 16 15:08:47 2012 +1100 Add --with-tmpdir configure argument Allow for specification of PCP_TMP_DIR at configure time. From nscott@redhat.com Mon Nov 19 21:08:00 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAK3805r092086 for ; Mon, 19 Nov 2012 21:08:00 -0600 X-ASG-Debug-ID: 1353381008-04bdf039f715ba70001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 2uopjFwXSiAYs53B for ; Mon, 19 Nov 2012 19:10:08 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAK3A8mk018837 for ; Mon, 19 Nov 2012 22:10:08 -0500 Date: Mon, 19 Nov 2012 22:10:08 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1637235421.28501080.1353381008322.JavaMail.root@redhat.com> In-Reply-To: <20649.49350.953707.964416@iinet.net.au> Subject: PCP on IRIX MIME-Version: 1.0 X-ASG-Orig-Subj: PCP on IRIX Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.148] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353381008 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114708 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Hi all, A similar-but-different angle to Max's question - does anyone have any interest in using the open source PCP version of PCP on IRIX? There's a few code quirks and special cases littered all over that deal with IRIX, particularly in QA tests, that would be good to be able to remove. Would anyone be disadvantaged by removal of IRIX-specific pieces from PCP? Given there's no open source IRIX kernel PMDA, I would guess not ... but best to ask first just in case. cheers. -- Nathan From nscott@redhat.com Mon Nov 19 23:20:06 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAK5K6ZU101772 for ; Mon, 19 Nov 2012 23:20:06 -0600 X-ASG-Debug-ID: 1353388934-04cb6c508115c9a0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id FXU7En65uHJL9vua for ; Mon, 19 Nov 2012 21:22:14 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAK5MExn007717 for ; Tue, 20 Nov 2012 00:22:14 -0500 Date: Tue, 20 Nov 2012 00:22:14 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <618247833.28534510.1353388934024.JavaMail.root@redhat.com> Subject: pcp updates: dev->nssmerge branch merge + pick up Daves latest MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: dev->nssmerge branch merge + pick up Daves latest Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.148] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353388934 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114717 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge qa/067 | 2 +- qa/131 | 3 ++- qa/200 | 1 + qa/273 | 1 + qa/294 | 2 +- qa/295 | 2 +- src/libpcp/src/connect.c | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) commit ccd1b3c4091bf46c511a2bac042f366fc0c182b7 Merge: 0196f89 e63ba4a Author: Nathan Scott Date: Tue Nov 20 14:54:39 2012 +1100 Merge dev branch back into nssmerge commit 0196f89385420d184ca6c7f7f6a175a78cd7a1fe Author: Dave Brolley Date: Mon Nov 19 16:13:38 2012 -0500 Rework regexp which filters fd numbers. commit cb4d5a3fa62e5d58d3a51460df2e9157120b9657 Author: Dave Brolley Date: Mon Nov 19 16:10:38 2012 -0500 Filter __pmDataIPC messages which only occur when NSS/NSPR is enabled. commit 854d770abff3525e1a8c2bb276f7ed814b081c1d Author: Dave Brolley Date: Mon Nov 19 16:09:36 2012 -0500 Fix intermittent failure of test qa/131. If the initial connection timed out (as expected) all was well. However, sometimes the connection was successful and the handshake would time out. In this case, pminfo reported an IPC protocol failure. This was because __pmConnectHandshake did not propagate the PM_ERR_TIMEOUT from __pmGetPDU to the caller and instead was retuning PM_ERR_IPC for all errors except PDU_ERROR. __pmConnectHandshake now propagates the PM_ERR_TIMEOUT. The test script has been enhanced to handle the message which occurs when this happens. From kenj@internode.on.net Tue Nov 20 00:26:32 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_33, TO_NO_BRKTS_PCNT autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAK6QVti113672 for ; Tue, 20 Nov 2012 00:26:32 -0600 X-ASG-Debug-ID: 1353392919-04bdf039f91646d0001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id vE8VozDLWIvivIL9 for ; Mon, 19 Nov 2012 22:28:40 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApIBAP0hq1B20f6n/2dsb2JhbAANOIYgwAqBBQYCJgJTH7RNcII9kEiBIosPgU6CFIETA5V8k0Y Received: from ppp118-209-254-167.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.254.167]) by ipmail07.adl2.internode.on.net with ESMTP; 20 Nov 2012 16:58:39 +1030 Message-ID: <1353392978.19208.5.camel@bozo.localdomain> Subject: pcp updates From: Ken McDonell X-ASG-Orig-Subj: pcp updates To: pcp@oss.sgi.com Date: Tue, 20 Nov 2012 17:29:38 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353392919 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114721 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- First of (at least) two batches of changes to fix build and qa issues. Changes committed to git://oss.sgi.com/kenj/pcp.git dev Makepkgs | 6 +++--- debian/rules | 2 +- qa/GNUmakefile | 4 ++++ qa/common | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) commit 3d573a8ef8bd51cc898cf923cae94e793505ddcf Author: Ken McDonell Date: Tue Nov 20 17:24:34 2012 +1100 qa/GNUmakefile - bigger stick for cp NNN NNN.out badness Clearing the .SUFFIXES list is not enough (don't belive the gmake documentation!) ... need to over-ride the implicit rule that is checking date dependencies between NNN.out and NNN and when the former is older, doing $ cp NNN NNN.out which is 100% bogus in this context. commit 259c433363a3d7ee0924eb74df2e0ead21f3c0d6 Author: Ken McDonell Date: Tue Nov 20 17:22:29 2012 +1100 qa/common - need $PCP_BIN_ADM in the environment When running QA within a git tree (_really_ needed for QA development), then we need some extra help now that the qa tree is embedded within the pcp tree. commit e568a45a2a2e74fccca3ade069802b8f516b25ac Author: Ken McDonell Date: Tue Nov 20 17:18:44 2012 +1100 debian/rules - don't set $AWK in env for configure configure works out where to find a working awk/gawk by itself, there is no need to set $AWK before running configure. commit e30465bc25e5177350eead210551dc3b2c929a88 Author: Ken McDonell Date: Tue Nov 20 17:16:33 2012 +1100 Makepkgs - fix echo typo Target to make is src-link-pcp not src-link so make diagnostic message match makefile. commit f0bf4abe6b5ffff814c5f63105610efec622768d Author: Ken McDonell Date: Tue Nov 20 07:00:39 2012 +1100 Makepkgs - explicitly set --libexecdir for configure For the non-RPM builds (especially the Debian-based ones) need to explicitly set --libexecdir=/usr/lib to retain historical path settings for pmlogger and friends in $PCP_BINADM_DIR From kenj@internode.on.net Tue Nov 20 18:33:04 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAL0X4Nn228108 for ; Tue, 20 Nov 2012 18:33:04 -0600 X-ASG-Debug-ID: 1353458110-04cbb035a5195d0001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id IOjW2Mn8NKneiKWJ for ; Tue, 20 Nov 2012 16:35:10 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAKwgrFB20f8g/2dsb2JhbAANN4YgvEuDO4EFBgImAlMfs0twknmBIosSgTuCFIETA5V+gRySKA Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail07.adl2.internode.on.net with ESMTP; 21 Nov 2012 11:05:09 +1030 Message-ID: <1353458169.19208.9.camel@bozo.localdomain> Subject: pcp updates From: Ken McDonell X-ASG-Orig-Subj: pcp updates To: pcp@oss.sgi.com Date: Wed, 21 Nov 2012 11:36:09 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353458110 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114793 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Without this change, Makepkgs was building packages that created a dir called /default/pmlogger Changes committed to git://oss.sgi.com/kenj/pcp.git dev configure |14135 ++++++++++++++--------------------------------------------- configure.in | 2 2 files changed, 3476 insertions(+), 10661 deletions(-) commit 469241b5e7847f6d2dead890b572ede27de31053 Author: Ken McDonell Date: Tue Nov 20 17:44:34 2012 +1100 configure{.in} - fix $PCP_TMP_DIR Was being set incorrectly to "default" ... revert to historical behaviour of testing for /var/tmp else using /tmp if --with-tmpdir is NOT specified in the configure command line. From nscott@redhat.com Tue Nov 20 21:59:35 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_33 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAL3xZLa241928 for ; Tue, 20 Nov 2012 21:59:35 -0600 X-ASG-Debug-ID: 1353470500-04cb6c7d771f510001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id n2EdNR6vgnipdNor for ; Tue, 20 Nov 2012 20:01:41 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAL41eu1025841 for ; Tue, 20 Nov 2012 23:01:40 -0500 Date: Tue, 20 Nov 2012 23:01:40 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <2031511353.29165231.1353470500146.JavaMail.root@redhat.com> Subject: pcp updates: qa + packaging/configuring MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa + packaging/configuring Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.128] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353470500 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114807 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev Makepkgs | 6 configure |12699 +++++++++++-------------------------------------------- configure.in | 2 debian/rules | 4 qa/115 | 2 qa/187 | 12 qa/365 | 1 qa/555 | 14 qa/GNUmakefile | 4 qa/common | 1 qa/common.check | 19 qa/src/interp4.c | 6 12 files changed, 2797 insertions(+), 9973 deletions(-) commit edea25e14e6fe804ce95dc0107d30c1cbb5cb4c4 Merge: deb0816 469241b Author: Nathan Scott Date: Wed Nov 21 14:58:18 2012 +1100 Merge branch 'dev' of git://oss.sgi.com/kenj/pcp into dev Conflicts: debian/rules Resolve conflict by picking both sets of configure-related changes. commit deb08162ed8e5b6d4af8ca51794f2f09ed44d000 Author: Nathan Scott Date: Wed Nov 21 14:56:10 2012 +1100 Fix long-standing QA issue - interp4.c vs valgrind commit 12e925741000c9041c83edd970b7140556c4351d Author: Nathan Scott Date: Wed Nov 21 14:54:41 2012 +1100 Improve QA robustness in presence of simple host naming setup commit 847de72c2c2eb7bb7ed4b8b59b8e7c590ee2fad3 Author: Nathan Scott Date: Wed Nov 21 14:54:02 2012 +1100 Fix long-standing QA issue on RHEL6.3 for me, rsyslog vs security labels commit 30912f0277d63c25035d79480ae508e77805bdc7 Author: Nathan Scott Date: Wed Nov 21 14:53:10 2012 +1100 Use new-world-order tmp dir scheme for deb packages too commit 8aa3e82c587daa3bbe49df10404d17d8fc93b993 Author: Nathan Scott Date: Wed Nov 21 14:46:57 2012 +1100 Handle a couple more QA cases with simple (hosts) DNS configuration commit 469241b5e7847f6d2dead890b572ede27de31053 Author: Ken McDonell Date: Tue Nov 20 17:44:34 2012 +1100 configure{.in} - fix $PCP_TMP_DIR Was being set incorrectly to "default" ... revert to historical behaviour of testing for /var/tmp else using /tmp if --with-tmpdir is NOT specified in the configure command line. commit 3d573a8ef8bd51cc898cf923cae94e793505ddcf Author: Ken McDonell Date: Tue Nov 20 17:24:34 2012 +1100 qa/GNUmakefile - bigger stick for cp NNN NNN.out badness Clearing the .SUFFIXES list is not enough (don't belive the gmake documentation!) ... need to over-ride the implicit rule that is checking date dependencies between NNN.out and NNN and when the former is older, doing $ cp NNN NNN.out which is 100% bogus in this context. commit 259c433363a3d7ee0924eb74df2e0ead21f3c0d6 Author: Ken McDonell Date: Tue Nov 20 17:22:29 2012 +1100 qa/common - need $PCP_BIN_ADM in the environment When running QA within a git tree (_really_ needed for QA development), then we need some extra help now that the qa tree is embedded within the pcp tree. commit e568a45a2a2e74fccca3ade069802b8f516b25ac Author: Ken McDonell Date: Tue Nov 20 17:18:44 2012 +1100 debian/rules - don't set $AWK in env for configure configure works out where to find a working awk/gawk by itself, there is no need to set $AWK before running configure. commit e30465bc25e5177350eead210551dc3b2c929a88 Author: Ken McDonell Date: Tue Nov 20 17:16:33 2012 +1100 Makepkgs - fix echo typo Target to make is src-link-pcp not src-link so make diagnostic message match makefile. commit f0bf4abe6b5ffff814c5f63105610efec622768d Author: Ken McDonell Date: Tue Nov 20 07:00:39 2012 +1100 Makepkgs - explicitly set --libexecdir for configure For the non-RPM builds (especially the Debian-based ones) need to explicitly set --libexecdir=/usr/lib to retain historical path settings for pmlogger and friends in $PCP_BINADM_DIR From nscott@redhat.com Wed Nov 21 03:32:40 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAL9WeZ7025027 for ; Wed, 21 Nov 2012 03:32:40 -0600 X-ASG-Debug-ID: 1353490489-04bdf005d32e670001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id cqzmmWJu9cMbfkTo for ; Wed, 21 Nov 2012 01:34:49 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAL9Ym0Z027907 for ; Wed, 21 Nov 2012 04:34:49 -0500 Date: Wed, 21 Nov 2012 04:34:48 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <349481812.29271152.1353490488773.JavaMail.root@redhat.com> Subject: pcp updates: fix shping timeouts MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: fix shping timeouts Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.128] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353490489 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114828 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev src/pmdas/shping/shping.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit b0114990a968407c5ae39eb7546fe45d69d43107 Author: Nathan Scott Date: Wed Nov 21 20:33:02 2012 +1100 Fix issues with pmdashping timeouts observed on multi-core x86_64 Test qa/323 has been failing frequently for some time here. Root cause turned out to be signal related again, this time interacting poorly with pthreads. A race existed between the calls to signal() in the main() thread vs the refresh() thread - in reality, signals are process-wide and cannot be directed to specific threads. So, whether timeouts were applied at all or not depended on the order of calls to signal(), which could go either way but often ended up not being applied. From nscott@redhat.com Wed Nov 21 04:09:45 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALA9j9H031492 for ; Wed, 21 Nov 2012 04:09:45 -0600 X-ASG-Debug-ID: 1353492714-04cb6c7d792a9d0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 8iCwEVAGarAz0aO5 for ; Wed, 21 Nov 2012 02:11:54 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qALABsL0031129; Wed, 21 Nov 2012 05:11:54 -0500 Date: Wed, 21 Nov 2012 05:11:54 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Cc: Dave Brolley Message-ID: <677961875.29282851.1353492714400.JavaMail.root@redhat.com> Subject: pcp updates: dev->nssmerge MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: dev->nssmerge Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.128] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353492714 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114830 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge qa/462 | 2 +- qa/462.out | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) commit c0e5b2b5728a803103af75c3f61681f1e4465f45 Merge: 04e13d3 1625d52 Author: Nathan Scott Date: Wed Nov 21 21:07:52 2012 +1100 Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into nssmerge commit 1625d520f69e354a9633256f3c6f1429aff66273 Author: Dave Brolley Date: Tue Nov 20 10:58:27 2012 -0500 qa test case 462. Filter all sequences of 3 or more periods as [dots]. Adjust the expected output. commit 04e13d38e3835d64ed2162c9639123239d2f98d9 Merge: ccd1b3c b011499 Author: Nathan Scott Date: Wed Nov 21 21:05:14 2012 +1100 Merge branch 'dev' into nssmerge From kenj@internode.on.net Wed Nov 21 13:19:03 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALJJ3qe085588 for ; Wed, 21 Nov 2012 13:19:03 -0600 X-ASG-Debug-ID: 1353525672-04cb6c7d774f890001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id f5EH3x6bm7kGb20o for ; Wed, 21 Nov 2012 11:21:13 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAE8prVB20f8g/2dsb2JhbAANN4YgvA2DEQEBAQQjVhALFAQCAiYCAlcGE7NZcJMSgSKLEgmDR4ETA5JMgzKTRIFHJA Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail07.adl2.internode.on.net with ESMTP; 22 Nov 2012 05:51:11 +1030 Message-ID: <1353525733.19208.26.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa + packaging/configuring From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa + packaging/configuring To: Nathan Scott Cc: pcp@oss.sgi.com Date: Thu, 22 Nov 2012 06:22:13 +1100 In-Reply-To: <2031511353.29165231.1353470500146.JavaMail.root@redhat.com> References: <2031511353.29165231.1353470500146.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353525672 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114867 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Tue, 2012-11-20 at 23:01 -0500, Nathan Scott wrote: > Changes committed to git://oss.sgi.com/pcp/pcp.git dev > > ... > > commit 30912f0277d63c25035d79480ae508e77805bdc7 > Author: Nathan Scott > Date: Wed Nov 21 14:53:10 2012 +1100 > > Use new-world-order tmp dir scheme for deb packages too Why are we using --with-tmpdir=/var/lib/pcp/tmp in the package builds? I think the $PCP_TMP_DIR things all belong in /tmp or /var/tmp as per the historical status quo. I don't know of any other software that creates and deletes temporary files below /var/lib However, there is another BIGGER problem in this area ... the modes of the temporary directories in the debian packages are wrong (it maybe the case for other packaging but these are the packages I've been concentrating my diagnosis on). They should be drwxrwxrwxt but are being packaged and installed as drwxr-xr-x. This is a relatively recent regression, and NOTHING related to pmlogger (or pmie) works with the directory modes set like this ... they need to be world writeable and "sticky" (aka "restricted deletion flag" set). I cannot see where the problem has being introduced as the Makefile install lines look correct, as in $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/mmv $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmdabash and sudo make install does the right thing, so this is something related to a change to install-sh (that I cannot see) or some Debian packaging magic (that I do not understand). Once this is understood/fixed, I can get back to my earlier problem where the non-root change causes additional problems for pmlogger where the symlink "primary" is unreadable for anyone other than the "pcp" user ... but more on that later when I get past the current directory mode obstacle. And all I wanted to do 3 days ago was QA some pmie "debug mode" changes ... sigh. From kenj@internode.on.net Wed Nov 21 15:09:43 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,J_CHICKENPOX_33, J_CHICKENPOX_38 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALL9h3Q097006 for ; Wed, 21 Nov 2012 15:09:43 -0600 X-ASG-Debug-ID: 1353532312-04cb6c7d7753d40001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id 7ZKdfPABoJxiLtAC for ; Wed, 21 Nov 2012 13:11:53 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAI9CrVB20f8g/2dsb2JhbAANN4YgvAyDEQEBAQQjVhALGAICJgICVwazcHCTC4EijmKBEwOVfpNEgUck Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail07.adl2.internode.on.net with ESMTP; 22 Nov 2012 07:41:52 +1030 Message-ID: <1353532374.19208.41.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa + packaging/configuring From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa + packaging/configuring To: Nathan Scott Cc: pcp@oss.sgi.com Date: Thu, 22 Nov 2012 08:12:54 +1100 In-Reply-To: <1353525733.19208.26.camel@bozo.localdomain> References: <2031511353.29165231.1353470500146.JavaMail.root@redhat.com> <1353525733.19208.26.camel@bozo.localdomain> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353532312 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114874 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Thu, 2012-11-22 at 06:22 +1100, Ken McDonell wrote: > ... > However, there is another BIGGER problem in this area ... the modes of > the temporary directories in the debian packages are wrong (it maybe the > case for other packaging but these are the packages I've been > concentrating my diagnosis on). They should be drwxrwxrwxt but are > being packaged and installed as drwxr-xr-x. OK some progress. It appears to be the debian helper dh_fixperms that is resetting the modes (I have proved this using --execlude tmp/pmlogger to dh_fixperms). So the questions is ... did dh_fixperms change recently (google says no), or is there some PCP change that has undone or unmasked the way this was being "fixed" before? The way to fix it appears to be in the pcp.postinst script ... does that seem "right"? I'd like to do it there, as I suspect I'm going to need a chmod pcp.pcp ... there also. From nscott@redhat.com Wed Nov 21 16:33:25 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALMXPaa103671 for ; Wed, 21 Nov 2012 16:33:25 -0600 X-ASG-Debug-ID: 1353537335-04cbb035a759700001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id GCvVlyiLzr6BqtPY for ; Wed, 21 Nov 2012 14:35:36 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qALMZZU9009025 for ; Wed, 21 Nov 2012 17:35:35 -0500 Date: Wed, 21 Nov 2012 17:35:35 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1853931663.29798818.1353537335388.JavaMail.root@redhat.com> Subject: pcp updates: debian tmpdir handling MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: debian tmpdir handling Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353537335 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114880 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 756a5cb5c2f03914c39b5596fdfdd58dd275844e Author: Nathan Scott Date: Thu Nov 22 09:34:36 2012 +1100 Fix permissions on debian local tmpdir install From nscott@redhat.com Wed Nov 21 16:35:30 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,J_CHICKENPOX_33, J_CHICKENPOX_38,J_CHICKENPOX_44 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALMZUY1103824 for ; Wed, 21 Nov 2012 16:35:30 -0600 X-ASG-Debug-ID: 1353537461-04cb6c7d7755f10001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id ZeilhqgCoCgYv9Mz for ; Wed, 21 Nov 2012 14:37:41 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qALMbcjX009131; Wed, 21 Nov 2012 17:37:38 -0500 Date: Wed, 21 Nov 2012 17:37:38 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1464778735.29799163.1353537458244.JavaMail.root@redhat.com> In-Reply-To: <1353532374.19208.41.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa + packaging/configuring MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa + packaging/configuring Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353537461 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114880 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Hi Ken, ----- Original Message ----- > On Thu, 2012-11-22 at 06:22 +1100, Ken McDonell wrote: > > ... > > However, there is another BIGGER problem in this area ... the modes > > of > > the temporary directories in the debian packages are wrong (it > > maybe the > > case for other packaging but these are the packages I've been > > concentrating my diagnosis on). They should be drwxrwxrwxt but are > > being packaged and installed as drwxr-xr-x. > > OK some progress. > > It appears to be the debian helper dh_fixperms that is resetting the > modes (I have proved this using --execlude tmp/pmlogger to > dh_fixperms). > > So the questions is ... did dh_fixperms change recently (google says > no), or is there some PCP change that has undone or unmasked the way > this was being "fixed" before? The difference is we have never installed these directories in the past. Previously, we created the directories on the fly then changed mode at some point later. The recent CVE pointed out this race & we had to do something about it (more in next mail & hopefully some from David). > The way to fix it appears to be in the pcp.postinst script ... does > that seem "right"? I think that may cause problems with package checking processes (done by sysadmins), because installed files would be immediately modified after install which would be odd/questionable in their minds. This is fixed in dev branch (regression was introduced by me after the pcp-3.6.10 release too, 1000 apologies!) > I'd like to do it there, as I suspect I'm going to > need a chmod pcp.pcp ... there also. With the sticky bit set, root.root ownership will be correct, I think. cheers. -- Nathan From kenj@internode.on.net Wed Nov 21 16:55:52 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALMtqGE105483 for ; Wed, 21 Nov 2012 16:55:52 -0600 X-ASG-Debug-ID: 1353538681-04cb6c7d7a564d0001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id 23etORn8DpcG1SyD for ; Wed, 21 Nov 2012 14:58:01 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAMhbrVB20f8g/2dsb2JhbAANN4YgvA2DO4EFBgImAlMfs1hwkwWBIosSCYEzghSBEwOVfpNEgUc Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail07.adl2.internode.on.net with ESMTP; 22 Nov 2012 09:28:00 +1030 Message-ID: <1353538743.19208.50.camel@bozo.localdomain> Subject: pcp updates From: Ken McDonell X-ASG-Orig-Subj: pcp updates To: pcp@oss.sgi.com Date: Thu, 22 Nov 2012 09:59:03 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353538681 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114882 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/kenj/pcp.git dev src/pcp/pcp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 979cdb54e81fda258451d9c665a0812c59426160 Merge: e4308e1 b011499 Author: Ken McDonell Date: Wed Nov 21 22:17:10 2012 +1100 Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev commit e4308e1d72222f56e700847c486b858815bd383f Author: Ken McDonell Date: Wed Nov 21 21:07:05 2012 +1100 pcp.sh - usage change missed in previous commit If we're going to change the arguments to pcp(1) as per commit 741f7b6 (not sure why this was a good idea), then need this change to make the usage message match the code. From nscott@redhat.com Wed Nov 21 17:17:56 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALNHuju107469 for ; Wed, 21 Nov 2012 17:17:56 -0600 X-ASG-Debug-ID: 1353540006-04cbb035a75a3b0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id OjlnFwdxPWULe5WJ for ; Wed, 21 Nov 2012 15:20:06 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qALNK3s1030763; Wed, 21 Nov 2012 18:20:03 -0500 Date: Wed, 21 Nov 2012 18:20:03 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell , David Disseldorp Cc: pcp@oss.sgi.com Message-ID: <1448695455.29805581.1353540003239.JavaMail.root@redhat.com> In-Reply-To: <1353525733.19208.26.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa + packaging/configuring MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa + packaging/configuring Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353540006 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114884 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > On Tue, 2012-11-20 at 23:01 -0500, Nathan Scott wrote: > > Changes committed to git://oss.sgi.com/pcp/pcp.git dev > > > > ... > > > > commit 30912f0277d63c25035d79480ae508e77805bdc7 > > Author: Nathan Scott > > Date: Wed Nov 21 14:53:10 2012 +1100 > > > > Use new-world-order tmp dir scheme for deb packages too > > Why are we using --with-tmpdir=/var/lib/pcp/tmp in the package > builds? The initial patch for this arrived from David, so I'm going to let him field this one too. :) My thinking below... > I think the $PCP_TMP_DIR things all belong in /tmp or /var/tmp as per > the historical status quo. I don't know of any other software that > creates and deletes temporary files below /var/lib > There appear to be a few, e.g. MySQL does this ... googling finds a few others. And the official-looking: http://www.tldp.org/LDP/Linux-Filesystem-Hierarchy/html/var.html says: "...this hierarchy holds state information pertaining to an application or the system. State information is data that programs modify while they run, and that pertains to one specific host". ... which seems to cover it. Certainly the description of /var/tmp (files that should exist even after a reboot) does not cover our use of that. My own thinking was along the lines "we need to create these dirs with the correct permissions, in a race-free manner, unequivocally", and the installation process seemed a good time. Since /var/tmp and /tmp are also created explicitly by rpm/deb packages, it seemed a good option. The one concern I (still) have is that these wont be automagically cleaned up by the (optional) cron tmpdir sweepers ... while the main PCP daemons tend to cleanup, I know of one library that does a very ordinary job of cleaning up its own mmv turds. That said, tmpwatch can be a pain and I've seen it clean up active mmv files for a very long running process! Damned if you do and damned if you don't. > ... > Once this is understood/fixed, I can get back to my earlier problem > where the non-root change causes additional problems for pmlogger > where > the symlink "primary" is unreadable for anyone other than the "pcp" > user ... but more on that later when I get past the current directory > mode obstacle. Hmm, I wonder if those two problem are related. From an RPM point of view, I've not observed this issue you're seeing, so hopefully with the debian packaging fix from earlier today this will go away also. > And all I wanted to do 3 days ago was QA some pmie "debug mode" > changes ... sigh. Ah well, its all for the greater good! ;) (much less exposed to remote root exploits now) cheers. -- Nathan From kenj@internode.on.net Wed Nov 21 17:27:25 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALNRPJD109018 for ; Wed, 21 Nov 2012 17:27:25 -0600 X-ASG-Debug-ID: 1353540575-04cbb035a55a630001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id j6TIFRwA8wqeCAsO for ; Wed, 21 Nov 2012 15:29:35 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAO5irVB20f8g/2dsb2JhbAANN4YgvA6DEgEBBCNWEAsaAiYCAlcGs25wkwSBIo5igRMDlX6TRA Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail07.adl2.internode.on.net with ESMTP; 22 Nov 2012 09:59:34 +1030 Message-ID: <1353540637.19208.52.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa + packaging/configuring From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa + packaging/configuring To: Nathan Scott Cc: David Disseldorp , pcp@oss.sgi.com Date: Thu, 22 Nov 2012 10:30:37 +1100 In-Reply-To: <1448695455.29805581.1353540003239.JavaMail.root@redhat.com> References: <1448695455.29805581.1353540003239.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353540575 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114884 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Wed, 2012-11-21 at 18:20 -0500, Nathan Scott wrote: ... > Hmm, I wonder if those two problem are related. From an RPM point of > view, I've not observed this issue you're seeing, so hopefully with > the debian packaging fix from earlier today this will go away also. Which commit fixes the debian packaging? If it is edea25e14e6fe804ce95dc0107d30c1cbb5cb4c4 to add --with-tmp then this one does NOT fix the modes problem. From nscott@redhat.com Wed Nov 21 17:29:33 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qALNTXIU109263 for ; Wed, 21 Nov 2012 17:29:33 -0600 X-ASG-Debug-ID: 1353540703-04cb6c7d7a56ee0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id aZ9nUVq1KLJMaLt1 for ; Wed, 21 Nov 2012 15:31:43 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qALNVfeW031297; Wed, 21 Nov 2012 18:31:41 -0500 Date: Wed, 21 Nov 2012 18:31:41 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <56227264.29808845.1353540701193.JavaMail.root@redhat.com> In-Reply-To: <1353540637.19208.52.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa + packaging/configuring MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa + packaging/configuring Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353540703 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114884 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > On Wed, 2012-11-21 at 18:20 -0500, Nathan Scott wrote: > ... > > Hmm, I wonder if those two problem are related. From an RPM point > > of > > view, I've not observed this issue you're seeing, so hopefully with > > the debian packaging fix from earlier today this will go away also. > > Which commit fixes the debian packaging? > > If it is edea25e14e6fe804ce95dc0107d30c1cbb5cb4c4 to add --with-tmp > then > this one does NOT fix the modes problem. > > Sorry, fat-fingered the push ... 18669aad2140039b9d8ce9ed073b44b171846e03 is there now. cheers. -- Nathan From kenj@internode.on.net Wed Nov 21 18:35:43 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_33 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM0Zhn1114539 for ; Wed, 21 Nov 2012 18:35:43 -0600 X-ASG-Debug-ID: 1353544672-04cbb035a45bb80001-S8gJnT Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id WABZHhqKz6pHPEXw for ; Wed, 21 Nov 2012 16:37:53 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.131 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApcBACxyrVB20f8g/2dsb2JhbAANN4YguC2DYYM7BIEHAiYCtE5wkwCBIosSg1CBEwOVfpNE Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail07.adl2.internode.on.net with ESMTP; 22 Nov 2012 11:07:52 +1030 Message-ID: <1353544735.19208.60.camel@bozo.localdomain> Subject: Collateral damage in non-root changes From: Ken McDonell X-ASG-Orig-Subj: Collateral damage in non-root changes To: pcp@oss.sgi.com Date: Thu, 22 Nov 2012 11:38:55 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail07.adl2.internode.on.net[150.101.137.131] X-Barracuda-Start-Time: 1353544672 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114888 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Now, emerging from the smoke of the packaging battle, I have a subtle, but serious issue falling out of the recent non-root changes. It relates to the various tmp directories used by pmie, pmlogger, the pmcd pmda, the mmv pmda and the control scripts for pmie and pmlogger. The world used to be thus ... kenj@vm00:~$ pcp Performance Co-Pilot configuration on vm00.localdomain: platform: Linux vm00 3.2.0-25-generic #40-Ubuntu SMP Wed May 23 20:30:51 UTC 2012 x86_64 hardware: 2 cpus, 1 disk, 239MB RAM timezone: EST-11 pmcd: Version 3.6.5-1, 9 agents, 1 client pmda: pmcd trace sendmail sample sampledso linux mmv trivial simple pmlogger: primary logger: /var/log/pcp/pmlogger/vm00/20121121.11.07 kenj@vm00:~$ ls -ld /var/tmp/{pm*,mmv} drwxrwxrwt 2 root root 4096 Aug 10 03:07 /var/tmp/mmv drwxrwxrwt 2 root root 4096 Aug 10 03:09 /var/tmp/pmie drwxrwxrwt 2 root root 4096 Nov 21 11:07 /var/tmp/pmlogger kenj@vm00:~$ ls -l /var/tmp/{pm*,mmv} /var/tmp/mmv: total 8 -rw-r--r-- 1 kenj kenj 4344 Aug 10 02:16 test /var/tmp/pmie: total 0 /var/tmp/pmlogger: total 4 -rw-r--r-- 1 root root 79 Nov 21 11:07 1187 lrwxrwxrwx 1 root root 22 Nov 21 11:07 primary -> /var/tmp/pmlogger/1187 And it is now it looks like this ... kenj@bozo:~/src/pcp$ pcp Performance Co-Pilot configuration on bozo.localdomain: platform: Linux bozo 3.0.0-14-generic #23-Ubuntu SMP Mon Nov 21 20:28:43 UTC 2011 x86_64 hardware: 6 cpus, 2 disks, 8001MB RAM timezone: EST-11 pmcd: Version 3.6.10-1, 6 agents, 1 client pmda: pmcd sample sampledso linux mmv simple pmlogger: primary logger: bozo/20121122.11.27 kenj@bozo:~/src/pcp$ ls -ld /var/lib/pcp/tmp drwxrwxrwt 6 root root 4096 2012-11-22 11:27 /var/lib/pcp/tmp kenj@bozo:~/src/pcp$ ls -ld /var/lib/pcp/tmp/* drwxrwxrwt 2 root root 4096 2012-11-22 10:54 /var/lib/pcp/tmp/mmv drwxrwxrwt 2 root root 4096 2012-11-22 10:54 /var/lib/pcp/tmp/pmdabash drwxrwxrwt 2 root root 4096 2012-11-22 10:54 /var/lib/pcp/tmp/pmie drwxrwxrwt 2 root root 4096 2012-11-22 11:27 /var/lib/pcp/tmp/pmlogger kenj@bozo:~/src/pcp$ ls -l /var/lib/pcp/tmp/pmlogger total 4 -rw-r--r-- 1 pcp pcp 79 2012-11-22 11:27 8013 lrwxrwxrwx 1 pcp pcp 30 2012-11-22 11:27 primary -> /var/lib/pcp/tmp/pmlogger/8013 Aside from the path change (which is expected), note the ownership of the files in /var/lib/pcp/tmp/pmlogger is now with pcp.pcp (expected also). Now check out this oddity ... kenj@bozo:~/src/pcp$ cat /var/lib/pcp/tmp/pmlogger/8013 4330 bozo.localdomain /var/log/pcp/pmlogger/bozo/20121122.11.27 pmlogger_check kenj@bozo:~/src/pcp$ cat /var/lib/pcp/tmp/pmlogger/primary cat: /var/lib/pcp/tmp/pmlogger/primary: Permission denied Arrgh ... this breaks the pmlogger control scripts and QA. But it gets odder ... kenj@bozo:~/src/pcp$ sudo chown pcp.pcp /var/lib/pcp/tmp/pmlogger kenj@bozo:~/src/pcp$ cat /var/lib/pcp/tmp/pmlogger/primary 4330 bozo.localdomain /var/log/pcp/pmlogger/bozo/20121122.11.27 pmlogger_check I think this is ONLY is a problem for the symlink ... and the only fix I can see working is the chmod to be done in the packaging. Any suggestions? From nscott@redhat.com Wed Nov 21 20:43:03 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_33 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM2h27I127361 for ; Wed, 21 Nov 2012 20:43:03 -0600 X-ASG-Debug-ID: 1353552312-04cb6c7d765dcc0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id whRj4kUULoV2ByY8 for ; Wed, 21 Nov 2012 18:45:12 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAM2j8N2023000; Wed, 21 Nov 2012 21:45:08 -0500 Date: Wed, 21 Nov 2012 21:45:08 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1659133897.29841595.1353552308874.JavaMail.root@redhat.com> In-Reply-To: <1353544735.19208.60.camel@bozo.localdomain> Subject: Re: [pcp] Collateral damage in non-root changes MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353552312 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114896 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Hi Ken, ----- Original Message ----- > ... > And it is now it looks like this ... > > kenj@bozo:~/src/pcp$ pcp > Performance Co-Pilot configuration on bozo.localdomain: > > platform: Linux bozo 3.0.0-14-generic #23-Ubuntu SMP Mon Nov 21 > 20:28:43 UTC 2011 x86_64 > hardware: 6 cpus, 2 disks, 8001MB RAM > timezone: EST-11 > pmcd: Version 3.6.10-1, 6 agents, 1 client > pmda: pmcd sample sampledso linux mmv simple > pmlogger: primary logger: bozo/20121122.11.27 > kenj@bozo:~/src/pcp$ ls -ld /var/lib/pcp/tmp > drwxrwxrwt 6 root root 4096 2012-11-22 11:27 /var/lib/pcp/tmp > kenj@bozo:~/src/pcp$ ls -ld /var/lib/pcp/tmp/* > drwxrwxrwt 2 root root 4096 2012-11-22 10:54 /var/lib/pcp/tmp/mmv > drwxrwxrwt 2 root root 4096 2012-11-22 10:54 > /var/lib/pcp/tmp/pmdabash > drwxrwxrwt 2 root root 4096 2012-11-22 10:54 /var/lib/pcp/tmp/pmie > drwxrwxrwt 2 root root 4096 2012-11-22 11:27 > /var/lib/pcp/tmp/pmlogger > kenj@bozo:~/src/pcp$ ls -l /var/lib/pcp/tmp/pmlogger > total 4 > -rw-r--r-- 1 pcp pcp 79 2012-11-22 11:27 8013 > lrwxrwxrwx 1 pcp pcp 30 2012-11-22 11:27 primary -> > /var/lib/pcp/tmp/pmlogger/8013 > > Aside from the path change (which is expected), note the ownership of > the files in /var/lib/pcp/tmp/pmlogger is now with pcp.pcp (expected > also). > > Now check out this oddity ... > > kenj@bozo:~/src/pcp$ cat /var/lib/pcp/tmp/pmlogger/8013 > 4330 > bozo.localdomain > /var/log/pcp/pmlogger/bozo/20121122.11.27 > pmlogger_check > kenj@bozo:~/src/pcp$ cat /var/lib/pcp/tmp/pmlogger/primary > cat: /var/lib/pcp/tmp/pmlogger/primary: Permission denied That doesn't make sense to me (nor do I see how chown on the pmlogger directory changes this behaviour) - the permissions of a symlink are irrelevant - as described here... http://superuser.com/questions/303040/how-do-file-permissions-apply-to-symlinks Which suggests its the directory... hmmm... the only thing I can think of is a kernel issue. Is it possible that there was a process holding open the existing /var/lib/pcp/tmp/pmlogger when the new deb was installed (with super-dh_fixperms powers) and somehow the in-kernel cached dentry / inode for the earlier directory is being used for permission checks rather than the new one? A reboot would prove it one way or the other, cos for me this does not happen (have checked two machines now - see below). > Arrgh ... this breaks the pmlogger control scripts and QA. > > But it gets odder ... > > kenj@bozo:~/src/pcp$ sudo chown pcp.pcp /var/lib/pcp/tmp/pmlogger > kenj@bozo:~/src/pcp$ cat /var/lib/pcp/tmp/pmlogger/primary > 4330 > bozo.localdomain > /var/log/pcp/pmlogger/bozo/20121122.11.27 > pmlogger_check > > I think this is ONLY is a problem for the symlink ... and the only > fix I > can see working is the chmod to be done in the packaging. > > Any suggestions? > We need to understand the root cause, the packaging is setting up the permissions appropriately as far as I can tell. On my Debian machine, I see the expected behaviour (this with no intervention after dpkg installing todays deb's): nathans@verge:~$ ls -ld /var/lib/pcp/tmp drwxrwxrwt 6 root root 57 Nov 22 13:26 /var/lib/pcp/tmp/ nathans@verge:~$ ls -ld /var/lib/pcp/tmp/pmlogger drwxrwxrwt 2 root root 32 Nov 22 13:26 /var/lib/pcp/tmp/pmlogger/ nathans@verge:~$ ls -ld /var/lib/pcp/tmp/pmlogger/* -rw-r--r-- 1 pcp pcp 82 Nov 22 13:26 /var/lib/pcp/tmp/pmlogger/17640 lrwxrwxrwx 1 pcp pcp 31 Nov 22 13:26 /var/lib/pcp/tmp/pmlogger/primary -> /var/lib/pcp/tmp/pmlogger/17640 nathans@verge:~$ cat /var/lib/pcp/tmp/pmlogger/17640 4330 verge.scott.net.au /var/log/pcp/pmlogger/verge/20121122.13.26 pmlogger_check nathans@verge:~$ cat /var/lib/pcp/tmp/pmlogger/primary 4330 verge.scott.net.au /var/log/pcp/pmlogger/verge/20121122.13.26 pmlogger_check nathans@verge:~$ uname -a Linux verge 2.6.32-5-686 #1 SMP Sun May 6 04:01:19 UTC 2012 i686 GNU/Linux nathans@verge:~$ cat /etc/debian_version wheezy/sid That's on an XFS filesystem. I have another machine running with an ext4 root, RHEL6 and it also displays the correct/expected behaviour. Is there anything unusual about your /var (or /var/lib or ...?) Have you tried turning it off and on again? (host bozo) cheers. -- Nathan From nscott@redhat.com Wed Nov 21 23:28:36 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM5SamI151561 for ; Wed, 21 Nov 2012 23:28:36 -0600 X-ASG-Debug-ID: 1353562243-04cb6c7d7661630001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 90volf9A5W8ubfqF for ; Wed, 21 Nov 2012 21:30:43 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAM5Uhhu018351 for ; Thu, 22 Nov 2012 00:30:43 -0500 Date: Thu, 22 Nov 2012 00:30:43 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1916667754.29862726.1353562243339.JavaMail.root@redhat.com> In-Reply-To: <1831616034.29862670.1353562162592.JavaMail.root@redhat.com> Subject: pcp updates: pmdasystemd MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: pmdasystemd Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353562243 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114908 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev GNUmakefile | 10 aclocal.m4 | 172 +++++++++++ build/rpm/fedora.spec | 3 build/rpm/pcp.spec.in | 3 configure | 216 ++++++++++++++ configure.in | 9 qa/652 | 87 +++++ qa/652.out | 46 +++ src/include/builddefs.in | 5 src/pmdas/GNUmakefile | 13 src/pmdas/systemd/.gitignore | 3 src/pmdas/systemd/GNUmakefile | 64 ++++ src/pmdas/systemd/Install | 31 ++ src/pmdas/systemd/Remove | 24 + src/pmdas/systemd/help | 47 +++ src/pmdas/systemd/pmns | 31 ++ src/pmdas/systemd/root | 11 src/pmdas/systemd/systemd.c | 613 +++++++++++++++++++++++++++++++++++++++++- src/pmns/stdpmid.pcp | 1 19 files changed, 1368 insertions(+), 23 deletions(-) commit 4887bea6dd72ddfa86613966132cb04fcdd879f2 Author: Nathan Scott Date: Thu Nov 22 16:08:46 2012 +1100 Fix some typos/leftovers in pmdasystemd comments/strings commit ad58190f4e1fc511f9d6b7e13887fc8995db633b Author: Nathan Scott Date: Thu Nov 22 16:02:50 2012 +1100 Add systemd SUBDIR into the build always, not conditionally Ensure that the pmdasystemd source ends up in the src tarball. Guard the actual pmdasystemd build on PMDA_SYSTEMD variable instead of using a Linux platform check. Split top level PMDAs makefile SUBDIRS macro into C/Perl PMDA lists separately, as its not clear it was actually intended to be this way once, and has atrophied a little. Cosmetic only. commit 66e81aac727e023b08dbb1ad49d99f594fe8ecbf Author: Nathan Scott Date: Thu Nov 22 15:59:03 2012 +1100 Add aclocal.m4 into toplevel makefile so it ends up in src tarball commit f21c8586a0af587aa758d261acdbd3918d260787 Merge: e4bf72a da6d0c5 Author: Nathan Scott Date: Thu Nov 22 15:15:20 2012 +1100 Merge branch 'fche/journald2' of git://sourceware.org/git/pcpfans into dev commit da6d0c5c53433ad6003a4a91a7e42bb9ee9ff465 Author: Frank Ch. Eigler Date: Wed Nov 21 19:02:01 2012 -0500 systemd-journal: no systemd.h commit 2c2965526d50bd28649e3a507e99c0b145b9a6b6 Author: Frank Ch. Eigler Date: Wed Nov 21 18:58:10 2012 -0500 systemd-journald: add systemd-devel to future fedora/rhel buildrequires commit feaf116abffca1776bc81a0ecf607cdebfe238c6 Author: Frank Ch. Eigler Date: Wed Nov 21 18:51:39 2012 -0500 systemd-journal: add pcpqa test case 652 commit 7aa13cce3fb588cb5489094def22da557cb6b0b8 Author: Frank Ch. Eigler Date: Wed Nov 21 17:58:23 2012 -0500 systemd-journald: stop ignoring the need for .gitignore commit 84c7705d10812cacc02d258c384997c90408e158 Author: Frank Ch. Eigler Date: Wed Nov 21 17:57:56 2012 -0500 systemd-journald: copy incoming journald field strings, due to lack of \0 commit f39fcf2c0b89eb79f520aca9be7697d54e983c17 Author: Frank Ch. Eigler Date: Wed Nov 21 17:57:31 2012 -0500 systemd-journald pmda: make domain #114 official commit 6a376dafd968ce2563690052c6c97824ceb2e4f6 Author: Frank Ch. Eigler Date: Wed Nov 21 17:16:16 2012 -0500 systemd-journald PMDA, v2 From nscott@redhat.com Wed Nov 21 23:48:54 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,J_CHICKENPOX_55, J_CHICKENPOX_72,J_CHICKENPOX_74 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM5msAY153610 for ; Wed, 21 Nov 2012 23:48:54 -0600 X-ASG-Debug-ID: 1353563464-04bdf005d3630c0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id 59UFtrbZipRpYZda for ; Wed, 21 Nov 2012 21:51:04 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAM5p3vD032689; Thu, 22 Nov 2012 00:51:04 -0500 Date: Thu, 22 Nov 2012 00:51:03 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <1879723554.29864698.1353563463967.JavaMail.root@redhat.com> In-Reply-To: <487934067.29863205.1353562538625.JavaMail.root@redhat.com> Subject: pmdasystemd review MIME-Version: 1.0 X-ASG-Orig-Subj: pmdasystemd review Content-Type: multipart/mixed; boundary="----=_Part_29864695_1389262659.1353563463963" X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353563464 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114910 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ------=_Part_29864695_1389262659.1353563463963 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hi Frank, Following on from our #pcp and other earlier discussion, I've pulled pmdasystemd into the dev branch. I made a few tweaks, all minor - build related, and typos. [ This is another event metric PMDA, so I'd encourage others to review and pass on judgements^Wopinions as well, if they have any thoughts, since this is a, er, growth industry. Some interesting precedents are being set by experimentation with these new agents at the moment and the more eyes the merrier. ] I have a few other review comments as well, things I didn't think of earlier ... let know your thinking on these, please. - Can this PMDA run as an unprivileged user? If the answer is yes, the attached "unprivileged.patch" would suit. However if the answer is no, then the DSO mode is not useful & we may as well remove that code. - There's an empty README file in src/pmdas/systemd - nuke it? A man page might be handy to brain dump and issues or tidbits for people trying it out - perhaps see pmdabash.1 as a sample. - I noticed the metric names seemed to glop (to my eye) both the event metrics and their parameters into one pmns subtree. I noticed also there's a little comment to say "these ones are one group" and "these others are event metrics" - suggests that the parameters might warrant their own little part of the pmns. Up to you, though. I experimented with one way (see attached "parameters.patch") but other options might be more clear - it might be better to use the terminology in your comment, which could result in systemd.journal.fields.*, for example. The code generally looks great though, hopefully it will become a generally handy little PMDA for people once systemd has taken over the world. ;) cheers. -- Nathan ------=_Part_29864695_1389262659.1353563463963 Content-Type: text/x-patch; name=unprivileged.patch Content-Disposition: attachment; filename=unprivileged.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9wbWRhcy9zeXN0ZW1kL0luc3RhbGwgYi9zcmMvcG1kYXMvc3lzdGVt ZC9JbnN0YWxsCmluZGV4IDg1ODlhMzguLmZiN2ZhZmUgMTAwNzU1Ci0tLSBhL3NyYy9wbWRhcy9z eXN0ZW1kL0luc3RhbGwKKysrIGIvc3JjL3BtZGFzL3N5c3RlbWQvSW5zdGFsbApAQCAtMjUsNiAr MjUsNyBAQCBwbWRhX2ludGVyZmFjZT01CiBkc29fb3B0PXRydWUKIHBpcGVfb3B0PXRydWUKIGRh ZW1vbl9vcHQ9dHJ1ZQorZm9yY2VkX3Jlc3RhcnQ9ZmFsc2UKIHBtZGFTZXR1cAogcG1kYUluc3Rh bGwKIApkaWZmIC0tZ2l0IGEvc3JjL3BtZGFzL3N5c3RlbWQvc3lzdGVtZC5jIGIvc3JjL3BtZGFz L3N5c3RlbWQvc3lzdGVtZC5jCmluZGV4IDUyMjMyZDMuLmVjNWI0OTYgMTAwNjQ0Ci0tLSBhL3Ny Yy9wbWRhcy9zeXN0ZW1kL3N5c3RlbWQuYworKysgYi9zcmMvcG1kYXMvc3lzdGVtZC9zeXN0ZW1k LmMKQEAgLTM4MSw5ICszODEsMTAgQEAgc3lzdGVtZF9pbml0KHBtZGFJbnRlcmZhY2UgKmRwKQog ICAgICAgICBzbnByaW50ZihoZWxwcGF0aCwgc2l6ZW9mKGhlbHBwYXRoKSwgIiVzJWMiICJzeXN0 ZW1kIiAiJWMiICJoZWxwIiwKICAgICAgICAgICAgICAgICAgcG1HZXRDb25maWcoIlBDUF9QTURB U19ESVIiKSwgc2VwLCBzZXApOwogICAgICAgICBwbWRhRFNPKGRwLCBQTURBX0lOVEVSRkFDRV81 LCAic3lzdGVtZCBEU08iLCBoZWxwcGF0aCk7CisgICAgfSBlbHNlIHsKKwlfX3BtU2V0UHJvY2Vz c0lkZW50aXR5KCJwY3AiKTsKICAgICB9CiAKLQogICAgIGRwLT52ZXJzaW9uLmZvdXIuZmV0Y2gg PSBzeXN0ZW1kX2ZldGNoOwogICAgIGRwLT52ZXJzaW9uLmZvdXIuc3RvcmUgPSBzeXN0ZW1kX3N0 b3JlOwogICAgIGRwLT52ZXJzaW9uLmZvdXIucHJvZmlsZSA9IHN5c3RlbWRfcHJvZmlsZTsK ------=_Part_29864695_1389262659.1353563463963 Content-Type: text/x-patch; name=parameters.patch Content-Disposition: attachment; filename=parameters.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9wbWRhcy9zeXN0ZW1kL2hlbHAgYi9zcmMvcG1kYXMvc3lzdGVtZC9o ZWxwCmluZGV4IDMzNzQ2YjAuLjEyMmM3NTEgMTAwNjQ0Ci0tLSBhL3NyYy9wbWRhcy9zeXN0ZW1k L2hlbHAKKysrIGIvc3JjL3BtZGFzL3N5c3RlbWQvaGVscApAQCAtMzEsMTcgKzMxLDIwIEBACiBU aGUgbnVtYmVyIG9mIGF0dGFjaGVkIGNsaWVudHMuCiBAIHN5c3RlbWQubWF4bWVtIE1heGltdW0g bnVtYmVyIG9mIHF1ZXVlZCBldmVudCBieXRlcy4KIE1heGltdW0gbnVtYmVyIG9mIHF1ZXVlZCBl dmVudCBieXRlcyAoYXBwcnguIDEyOCBieXRlcyBwZXIgY3Vyc29yIHN0cmluZykuCi1AIHN5c3Rl bWQuam91cm5hbC5jdXJzb3IgVGhlIGN1cnNvciwgYW4gaW1wbGljaXQgam91cm5hbGQgZmllbGQu CisKK0Agc3lzdGVtZC5wYXJhbWV0ZXJzLmN1cnNvciBUaGUgY3Vyc29yLCBhbiBpbXBsaWNpdCBq b3VybmFsZCBmaWVsZC4KIFRoaXMgaXMgdGhlIGpvdXJuYWwgZW50cnkncyBwZXJtYW5lbnQsIGds b2JhbGx5IHVuaXF1ZSBjdXJzb3Igc3RyaW5nLgotQCBzeXN0ZW1kLmpvdXJuYWwuc3RyaW5nIEEg am91cm5hbCBmaWVsZCB0aGF0IG1heSBiZSBhIHN0cmluZy4KK0Agc3lzdGVtZC5wYXJhbWV0ZXJz LnN0cmluZyBBIGpvdXJuYWwgZmllbGQgdGhhdCBtYXkgYmUgYSBzdHJpbmcuCiBBIGpvdXJuYWwg ZmllbGQgY29waWVkIHZlcmJhdGltLCBhcyBhIFBNX1RZUEVfU1RSSU5HIG9iamVjdCwgcHJlc3Vt ZWQgYXMKIGEgdmFsaWQgc3RyaW5nIChpbiBzb21lIGVuY29kaW5nKSwgaWYgdGhlIGZpZWxkIGRp ZCBub3QgY29udGFpbiBhbnkgXDAgY2hhcmFjdGVycy4KLUAgc3lzdGVtZC5qb3VybmFsLmJsb2Ig QSBqb3VybmFsIGZpZWxkIGNvcGllZCB2ZXJiYXRpbS4KK0Agc3lzdGVtZC5wYXJhbWV0ZXJzLmJs b2IgQSBqb3VybmFsIGZpZWxkIGNvcGllZCB2ZXJiYXRpbS4KIEEgam91cm5hbCBmaWVsZCBjb3Bp ZWQgdmVyYmF0aW0sIGFzIGEgUE1fVFlQRV9BR0dSRUdBVEUgb2JqZWN0LgorCiBAIHN5c3RlbWQu am91cm5hbC5yZWNvcmRzIEpvdXJuYWwgZW50cmllcywgZW5jb2RlZCBhcyBzdHJpbmdzIGFuZCBi bG9icy4KLUVhY2ggbmV3IGpvdXJuYWxkIGV2ZW50IGZpZWxkIGlzIGdpdmVuIGEgc3lzdGVtZC5q b3VybmFsLmN1cnNvciBzdHJpbmcgdG8KLWlkZW50aWZ5IGl0LCBhbmQgYSBjb2xsZWN0aW9uIG9m IHN0cmluZyBhbmQgYmxvYiBmaWVsZHMgKGFzIGFwcHJvcHJpYXRlKS4KK0VhY2ggbmV3IGpvdXJu YWxkIGV2ZW50IGZpZWxkIGlzIGdpdmVuIGEgc3lzdGVtZC5wYXJhbWV0ZXJzLmN1cnNvciBzdHJp bmcKK3RvIGlkZW50aWZ5IGl0LCBhbmQgYSBjb2xsZWN0aW9uIG9mIHN0cmluZyBhbmQgYmxvYiBm aWVsZHMgKGFzIGFwcHJvcHJpYXRlKS4KKwogQCBzeXN0ZW1kLmpvdXJuYWwucmVjb3Jkc19yYXcg Sm91cm5hbCBlbnRyaWVzLCBlbmNvZGVkIGFzIGJsb2IgcGFyYW1ldGVycyBvbmx5LgotRWFjaCBu ZXcgam91cm5hbGQgZXZlbnQgZmllbGQgaXMgZ2l2ZW4gYSBzeXN0ZW1kLmpvdXJuYWwuY3Vyc29y IHN0cmluZyB0bwotaWRlbnRpZnkgaXQsIGFuZCBhIGJsb2IgZmllbGRzIHRoZSByZXByb2R1Y2Ug dGhlIEZJRUxEPXZhbHVlIGJpdC1mb3ItYml0LgorRWFjaCBuZXcgam91cm5hbGQgZXZlbnQgZmll bGQgaXMgZ2l2ZW4gYSBzeXN0ZW1kLnBhcmFtZXRlcnMuY3Vyc29yIHN0cmluZwordG8gaWRlbnRp ZnkgaXQsIGFuZCBhIGJsb2IgZmllbGRzIHRoZSByZXByb2R1Y2UgdGhlIEZJRUxEPXZhbHVlIGJp dC1mb3ItYml0LgogCmRpZmYgLS1naXQgYS9zcmMvcG1kYXMvc3lzdGVtZC9wbW5zIGIvc3JjL3Bt ZGFzL3N5c3RlbWQvcG1ucwppbmRleCA2NGViNzRiLi40OGNiNGY3IDEwMDY0NAotLS0gYS9zcmMv cG1kYXMvc3lzdGVtZC9wbW5zCisrKyBiL3NyYy9wbWRhcy9zeXN0ZW1kL3BtbnMKQEAgLTE3LDE1 ICsxNywxNyBAQAogc3lzdGVtZCB7CiAgICAgbnVtY2xpZW50cwkJU1lTVEVNRDowOjAKICAgICBt YXhtZW0JCVNZU1RFTUQ6MDoxCisgICAgcGFyYW1ldGVycwogICAgIGpvdXJuYWwKIH0KIAotc3lz dGVtZC5qb3VybmFsIHsKLSAgICAvKiBzeXN0ZW1kLmpvdXJuYWwtZmllbGRzICovCitzeXN0ZW1k LnBhcmFtZXRlcnMgewogICAgIGN1cnNvciAgICAgICAgICAgICAgU1lTVEVNRDoxOjAKICAgICBz dHJpbmcgICAgICAgICAgICAgIFNZU1RFTUQ6MToxIC8qIHB1cmUgYXNjaWkgKi8KICAgICBibG9i ICAgICAgICAgICAgICAgIFNZU1RFTUQ6MToyIC8qIG5vdCBwdXJlIGFzY2lpICovCi0gICAgLyog dGhlIHJlY29yZHMgdGhlbXNlbHZlcyAqLworfQorCitzeXN0ZW1kLmpvdXJuYWwgewogICAgIHJl Y29yZHMgICAgICAgICAgICAgU1lTVEVNRDoyOjAKICAgICByZWNvcmRzX3JhdyAgICAgICAgIFNZ U1RFTUQ6MjoxCiB9CmRpZmYgLS1naXQgYS9zcmMvcG1kYXMvc3lzdGVtZC9zeXN0ZW1kLmMgYi9z cmMvcG1kYXMvc3lzdGVtZC9zeXN0ZW1kLmMKaW5kZXggNTIyMzJkMy4uYTBiZDFmMCAxMDA2NDQK LS0tIGEvc3JjL3BtZGFzL3N5c3RlbWQvc3lzdGVtZC5jCisrKyBiL3NyYy9wbWRhcy9zeXN0ZW1k L3N5c3RlbWQuYwpAQCAtNjIsMTcgKzYyLDE3IEBAIHN0YXRpYyBwbWRhTWV0cmljIG1ldHJpY3Rh YltdID0gewogICAgIHsgTlVMTCwKICAgICAgIHsgUE1EQV9QTUlEKDAsMSksIFBNX1RZUEVfVTMy LCBQTV9JTkRPTV9OVUxMLCBQTV9TRU1fSU5TVEFOVCwKICAgICAgICAgUE1EQV9QTVVOSVRTKDAs MCwxLDAsMCwwKSB9LCB9LAotLyogam91cm5hbC5jdXJzb3IgKi8KKy8qIHBhcmFtZXRlcnMuY3Vy c29yICovCiAjZGVmaW5lIE1FVFJJQ1RBQl9KT1VSTkFMX0NVUlNPUl9QTUlEIG1ldHJpY3RhYlsy XS5tX2Rlc2MucG1pZAogICAgIHsgTlVMTCwKICAgICAgIHsgUE1EQV9QTUlEKDEsMCksIFBNX1RZ UEVfU1RSSU5HLCBQTV9JTkRPTV9OVUxMLCBQTV9TRU1fSU5TVEFOVCwKICAgICAgICAgUE1EQV9Q TVVOSVRTKDAsMCwwLDAsMCwwKSB9LCB9LAotLyogam91cm5hbC5zdHJpbmcgKi8KKy8qIHBhcmFt ZXRlcnMuc3RyaW5nICovCiAjZGVmaW5lIE1FVFJJQ1RBQl9KT1VSTkFMX1NUUklOR19QTUlEIG1l dHJpY3RhYlszXS5tX2Rlc2MucG1pZAogICAgIHsgTlVMTCwKICAgICAgIHsgUE1EQV9QTUlEKDEs MSksIFBNX1RZUEVfU1RSSU5HLCBQTV9JTkRPTV9OVUxMLCBQTV9TRU1fSU5TVEFOVCwKICAgICAg ICAgUE1EQV9QTVVOSVRTKDAsMCwwLDAsMCwwKSB9LCB9LAotLyogam91cm5hbC5ibG9iICovCisv KiBwYXJhbWV0ZXJzLmJsb2IgKi8KICNkZWZpbmUgTUVUUklDVEFCX0pPVVJOQUxfQkxPQl9QTUlE IG1ldHJpY3RhYls0XS5tX2Rlc2MucG1pZAogICAgIHsgTlVMTCwKICAgICAgIHsgUE1EQV9QTUlE KDEsMiksIFBNX1RZUEVfQUdHUkVHQVRFLCBQTV9JTkRPTV9OVUxMLCBQTV9TRU1fSU5TVEFOVCwK ------=_Part_29864695_1389262659.1353563463963-- From kenj@internode.on.net Thu Nov 22 00:35:51 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM6ZplZ160236 for ; Thu, 22 Nov 2012 00:35:51 -0600 X-ASG-Debug-ID: 1353566280-04cbb035a766110001-S8gJnT Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id r4c5F7ftImjyNUas for ; Wed, 21 Nov 2012 22:38:00 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.145 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAG3HrVB20f8g/2dsb2JhbAANN4YhvBGDEQEBAQMBI1YFCwtCAgJXBogaEatgcJJxj3KBEwOOfYEhhWGBHJIo Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail06.adl6.internode.on.net with ESMTP; 22 Nov 2012 17:07:59 +1030 Message-ID: <1353566342.4467.5.camel@bozo.localdomain> Subject: Re: [pcp] Collateral damage in non-root changes From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes To: Nathan Scott Cc: pcp@oss.sgi.com Date: Thu, 22 Nov 2012 17:39:02 +1100 In-Reply-To: <1659133897.29841595.1353552308874.JavaMail.root@redhat.com> References: <1659133897.29841595.1353552308874.JavaMail.root@redhat.com> Content-Type: multipart/mixed; boundary="=-Hh9PgYYXBKX/ASPFFUss" X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl6.internode.on.net[150.101.137.145] X-Barracuda-Start-Time: 1353566280 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114912 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- --=-Hh9PgYYXBKX/ASPFFUss Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Wed, 2012-11-21 at 21:45 -0500, Nathan Scott wrote: ... > That doesn't make sense to me (nor do I see how chown on the > pmlogger directory changes this behaviour) - the permissions > of a symlink are irrelevant - as described here... > http://superuser.com/questions/303040/how-do-file-permissions-apply-to-symlinks > > Which suggests its the directory... hmmm... the only thing I > can think of is a kernel issue. ... Nod. > Is it possible that there was > a process holding open the existing /var/lib/pcp/tmp/pmlogger > when the new deb was installed (with super-dh_fixperms powers) > and somehow the in-kernel cached dentry / inode for the earlier > directory is being used for permission checks rather than the > new one? No ... see below. > A reboot would prove it one way or the other, cos for me this > does not happen (have checked two machines now - see below). Seen on two different Linux Mint machines, rebooted one, still a problem. Problem also seen on Ubuntu, but not Debian or Mac OS X (that's all the testing I've done at this point). The attached script shows the problem nicely ... I get lots of FAILED messages ... 8^(> I agree it is a kernel botch, probably by Ubuntu ... maybe fixed in their latest versions (my Ubuntu and Linux Mint are going on for 12 months out of date). My suggestion is we note this in case it comes up again for a real user (I don't count!) and pro tem I'll apply my chown workaround outside the package builds so my QA works on the systems where the kernel bug is seen. --=-Hh9PgYYXBKX/ASPFFUss Content-Type: application/x-shellscript; name="symtest" Content-Disposition: attachment; filename="symtest" Content-Transfer-Encoding: 7bit #!/bin/sh me=`id -un` other=pcpqa sudo rm -rf /var/tmp/symtest /tmp/bar sudo -u root mkdir /var/tmp/symtest sudo -u root chmod 1777 /var/tmp/symtest echo bar >/tmp/bar sudo -u $other cp /tmp/bar /var/tmp/symtest/1234 sudo -u $other ln -s /var/tmp/symtest/1234 /var/tmp/symtest/foo ls -ld /var/tmp/symtest echo echo "symlink owned by $other" ls -l /var/tmp/symtest echo "As user $other (uid=`id -u $other`) ..." file="`sudo -u $other cat /var/tmp/symtest/foo 2>/dev/null`" link="`sudo -u $other cat /var/tmp/symtest/1234 2>/dev/null`" if [ "$link" = "$file" -a "$file" = bar ] then echo OK else echo "FAILED" echo "file: `sudo -u $other cat /var/tmp/symtest/foo`" echo "file via symlink: `sudo -u $other cat /var/tmp/symtest/1234`" fi echo "As user $me (uid=`id -u $me`)..." file="`cat /var/tmp/symtest/foo 2>/dev/null`" link="`cat /var/tmp/symtest/1234 2>/dev/null`" if [ "$link" = "$file" -a "$file" = bar ] then echo OK else echo "FAILED" echo "file: `cat /var/tmp/symtest/foo`" echo "file via symlink: `cat /var/tmp/symtest/1234`" fi echo echo "symlink owned by $me" sudo rm -f /var/tmp/symtest/foo sudo -u $me ln -s /var/tmp/symtest/1234 /var/tmp/symtest/foo ls -l /var/tmp/symtest echo "As user $other (uid=`id -u $other`) ..." file="`sudo -u $other cat /var/tmp/symtest/foo 2>/dev/null`" link="`sudo -u $other cat /var/tmp/symtest/1234 2>/dev/null`" if [ "$link" = "$file" -a "$file" = bar ] then echo OK else echo "FAILED" echo "file: `sudo -u $other cat /var/tmp/symtest/foo`" echo "file via symlink: `sudo -u $other cat /var/tmp/symtest/1234`" fi echo "As user $me (uid=`id -u $me`)..." file="`cat /var/tmp/symtest/foo 2>/dev/null`" link="`cat /var/tmp/symtest/1234 2>/dev/null`" if [ "$link" = "$file" -a "$file" = bar ] then echo OK else echo "FAILED" echo "file: `cat /var/tmp/symtest/foo`" echo "file via symlink: `cat /var/tmp/symtest/1234`" fi sudo rm -rf /var/tmp/symtest /tmp/bar --=-Hh9PgYYXBKX/ASPFFUss-- From nscott@redhat.com Thu Nov 22 02:15:41 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM8FfvP172723 for ; Thu, 22 Nov 2012 02:15:41 -0600 X-ASG-Debug-ID: 1353572271-04cbb035a769400001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id MlmQhobml57BMfCx for ; Thu, 22 Nov 2012 00:17:51 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAM8Hl04028546; Thu, 22 Nov 2012 03:17:48 -0500 Date: Thu, 22 Nov 2012 03:17:47 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1325320647.29899954.1353572267882.JavaMail.root@redhat.com> In-Reply-To: <1353566342.4467.5.camel@bozo.localdomain> Subject: Re: [pcp] Collateral damage in non-root changes MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353572271 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114918 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > On Wed, 2012-11-21 at 21:45 -0500, Nathan Scott wrote: > ... > > That doesn't make sense to me (nor do I see how chown on the > > pmlogger directory changes this behaviour) - the permissions > > of a symlink are irrelevant - as described here... > > http://superuser.com/questions/303040/how-do-file-permissions-apply-to-symlinks > > > > Which suggests its the directory... hmmm... the only thing I > > can think of is a kernel issue. ... > > Nod. > Also "lsattr -d " might show some unexpected attribute? Can't think what attribute might cause this behaviour though. Otherwise maybe some selinux or other security module coming into play? (guessing wildly) cheers. -- Nathan From nscott@redhat.com Thu Nov 22 02:43:27 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAM8hRKs176278 for ; Thu, 22 Nov 2012 02:43:27 -0600 X-ASG-Debug-ID: 1353573937-04cb6c7d7767e10001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id KqSSlk6byBK6BEWW for ; Thu, 22 Nov 2012 00:45:37 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAM8jYNu011291; Thu, 22 Nov 2012 03:45:34 -0500 Date: Thu, 22 Nov 2012 03:45:34 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1189256242.29916179.1353573934583.JavaMail.root@redhat.com> In-Reply-To: <1325320647.29899954.1353572267882.JavaMail.root@redhat.com> Subject: Re: [pcp] Collateral damage in non-root changes MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.188] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353573937 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114920 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > ----- Original Message ----- > > On Wed, 2012-11-21 at 21:45 -0500, Nathan Scott wrote: > > ... > > > That doesn't make sense to me (nor do I see how chown on the > > > pmlogger directory changes this behaviour) - the permissions > > > of a symlink are irrelevant - as described here... > > > http://superuser.com/questions/303040/how-do-file-permissions-apply-to-symlinks > > > > > > Which suggests its the directory... hmmm... the only thing I > > > can think of is a kernel issue. ... > > > > Nod. > > > > Also "lsattr -d " might show some unexpected attribute? > Can't think what attribute might cause this behaviour though. > > Otherwise maybe some selinux or other security module coming > into play? (guessing wildly) And since its so reproducible - strace will probably show EPERM on a particular syscall, and if its still a mystery after that, systemtap traces in fs/namei.c::*permission() might be the go - starting to get in pretty deep though! cheers. -- Nathan From fche@redhat.com Thu Nov 22 06:16:03 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAMCG374198580 for ; Thu, 22 Nov 2012 06:16:03 -0600 X-ASG-Debug-ID: 1353586694-04cbb035a7715d0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id seJlZq9lghUiTyw8 for ; Thu, 22 Nov 2012 04:18:14 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAMCIDqi027548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 22 Nov 2012 07:18:14 -0500 Received: from fche.csb (vpn-8-35.rdu.redhat.com [10.11.8.35]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAMCIDQX029756; Thu, 22 Nov 2012 07:18:13 -0500 Received: by fche.csb (Postfix, from userid 2569) id 99D6B5810F; Thu, 22 Nov 2012 07:18:12 -0500 (EST) Date: Thu, 22 Nov 2012 07:18:12 -0500 From: "Frank Ch. Eigler" To: Nathan Scott Cc: pcp@oss.sgi.com Subject: Re: pmdasystemd review Message-ID: <20121122121812.GN8582@redhat.com> X-ASG-Orig-Subj: Re: pmdasystemd review References: <487934067.29863205.1353562538625.JavaMail.root@redhat.com> <1879723554.29864698.1353563463967.JavaMail.root@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1879723554.29864698.1353563463967.JavaMail.root@redhat.com> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1353586694 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Hi, Nathan - > Following on from our #pcp and other earlier discussion, I've > pulled pmdasystemd into the dev branch. I made a few tweaks, > all minor - build related, and typos. Great. > - Can this PMDA run as an unprivileged user? If the answer is > yes, the attached "unprivileged.patch" would suit. However if > the answer is no, then the DSO mode is not useful & we may as > well remove that code. The sytemd journal can be accessed by unprivileged users (and then the journals will be limited to one's own). The systemwide ones can be accessed by user 'adm', so that is what we should switch to in the daemon mode (and not leave it as root). > - There's an empty README file in src/pmdas/systemd - nuke it? > A man page might be handy to brain dump and issues or tidbits > for people trying it out - perhaps see pmdabash.1 as a sample. Will put something together. > - I noticed the metric names seemed to glop (to my eye) both > the event metrics and their parameters into one pmns subtree. Yeah, I was going along with the logger pattern, and couldn't think of a better bikeshed. > [...] it might be better to use the terminology in your comment, > which could result in systemd.journal.fields.*, for example. Yeah, it just gets long that way. - FChE From wwwrun@oss.sgi.com Thu Nov 22 13:18:10 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAMJIA46234646 for ; Thu, 22 Nov 2012 13:18:10 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qAMJIAm0234643; Thu, 22 Nov 2012 13:18:10 -0600 Date: Thu, 22 Nov 2012 13:18:10 -0600 From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 933] New: failed __pmSetProcessIdentity should be fatal error X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: fche@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: mort@sgi.com X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: Message-ID: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=933 Summary: failed __pmSetProcessIdentity should be fatal error Product: pcp Version: unspecified Platform: All OS/Version: Linux Status: NEW Severity: major Priority: P5 Component: pcp AssignedTo: mort@sgi.com ReportedBy: fche@redhat.com CC: pcp@oss.sgi.com Estimated Hours: 0.0 Classification: Unclassified Considering that setgid/setuid is a security-critical, their failure should result in more than a quietish LOG_WARNING message. Quite possibly, the daemon should quit - either from within the library function itself, or via a an __attribute__ ((warn_unused_result)) return value, and audited clients. -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From nscott@redhat.com Thu Nov 22 21:40:10 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_73 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAN3e8bo021264 for ; Thu, 22 Nov 2012 21:40:10 -0600 X-ASG-Debug-ID: 1353642139-04bdf005d39bac0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id uQAp0MnpzL7RclAS for ; Thu, 22 Nov 2012 19:42:19 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAN3gJ8h016861 for ; Thu, 22 Nov 2012 22:42:19 -0500 Date: Thu, 22 Nov 2012 22:42:19 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <724896410.30145936.1353642139289.JavaMail.root@redhat.com> Subject: pcp updates: setuid tweaks MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: setuid tweaks Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.153] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353642139 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114996 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev CHANGELOG | 5 + VERSION.pcp | 2 debian/changelog | 6 ++ man/man1/pmdabash.1 | 7 ++ man/man1/pmdacisco.1 | 9 ++- man/man1/pmdahotproc.1 | 6 ++ man/man1/pmdamailq.1 | 7 ++ man/man1/pmdasample.1 | 7 ++ man/man1/pmdasendmail.1 | 7 ++ man/man1/pmdasimple.1 | 7 ++ man/man1/pmdasummary.1 | 6 ++ man/man1/pmdatrace.1 | 7 ++ man/man1/pmdatrivial.1 | 7 ++ man/man1/pmdatxmon.1 | 7 ++ man/man1/pmdaweblog.1 | 9 ++- qa/653 | 103 ++++++++++++++++++++++++++++++++++++++ qa/653.out | 5 + qa/group | 2 qa/src/.gitignore | 1 qa/src/GNUlocaldefs | 3 - qa/src/username.c | 27 +++++++++ src/libpcp/src/util.c | 12 ++-- src/pmdas/aix/aix.c | 27 +++++---- src/pmdas/apache/apache.c | 13 +++- src/pmdas/bash/bash.c | 16 ++++- src/pmdas/cisco/pmda.c | 13 +++- src/pmdas/darwin/pmda.c | 25 +++++---- src/pmdas/freebsd/freebsd.c | 28 +++++----- src/pmdas/hotproc/src/hotproc.c | 11 +++- src/pmdas/linux/pmda.c | 23 +++++--- src/pmdas/lmsensors/lmsensors.c | 31 ++++++----- src/pmdas/logger/logger.c | 18 ++++-- src/pmdas/lustrecomm/lustrecomm.c | 34 +++++++----- src/pmdas/mailq/mailq.c | 16 +++-- src/pmdas/mmv/mmv.c | 28 +++++++--- src/pmdas/mounts/mounts.c | 37 +++++++------ src/pmdas/sendmail/sendmail.c | 25 +++++---- src/pmdas/simple/simple.c | 27 +++++---- src/pmdas/summary/pmda.c | 15 ++++- src/pmdas/systemd/README | 64 +++++++++++++++++++++++ src/pmdas/systemd/help | 17 +++--- src/pmdas/systemd/pmns | 12 ++-- src/pmdas/systemd/systemd.c | 34 +++++++----- src/pmdas/trace/src/pmda.c | 15 ++--- src/pmdas/trivial/trivial.c | 23 +++++--- src/pmdas/txmon/txmon.c | 28 +++++----- src/pmdas/weblog/pmda.c | 13 ++++ 47 files changed, 638 insertions(+), 207 deletions(-) commit 73c8a709c4a5bdbe6b299d3ed07a3ba80245c2d9 Author: Nathan Scott Date: Fri Nov 23 14:39:25 2012 +1100 Remove hard-coded username use throughout. Its been correctly pointed out that a site may have a pre-existing "pcp" user/group account, and they might not appreciate being forced to dedicate it to PCP. This set of changes pushes the -U command line option throughout the remaining PMDAs that were not doing that, providing a plan B for such sites. commit 6bd5af27a95ee4bf994ff7f1710a79a5435ce0d4 Author: Nathan Scott Date: Fri Nov 23 11:19:19 2012 +1100 Change __pmSetProcessIdentity to fail more resoundingly For good security reasons, if we cannot change to the intended user identity we should abort operation in preference to simply continuing on as we were. All callers need to fail hard in this scenario, so log a critical error and call exit. This is a bit like pmGetConfig in terms of level-of-trouble-that-you-are-in if it ever happens, so exiting seems an acceptable option. Adds a QA test (653) to exercise the good and bad cases. Resolves PCP bugzilla bug #933. commit 8ef74ab52556cefcee4624d7719c9f6973e61886 Author: Nathan Scott Date: Fri Nov 23 10:14:46 2012 +1100 Add a qa group file entry for systemd pmda test commit aed6c765a596f6ded3707464e39e3cc22e2309ce Author: Nathan Scott Date: Fri Nov 23 09:39:50 2012 +1100 Update version number for some future point release commit 0edf6714db2497f213266ebad3cb4b3abf6209d2 Merge: 4887bea d5fd3a3 Author: Nathan Scott Date: Fri Nov 23 07:37:22 2012 +1100 Merge branch 'fche/journald2' of git://sourceware.org/git/pcpfans into dev commit d5fd3a3014ae956910edbf737197bfb2253037a4 Author: Frank Ch. Eigler Date: Thu Nov 22 15:14:53 2012 -0500 systemd-journal: add a boilerplate README, with a bit of meat commit 0ad64d78053d68df9db5caa95ed9c73048f5bf16 Author: Frank Ch. Eigler Date: Thu Nov 22 14:27:40 2012 -0500 systemd-journal: rename event fields in pmns to under systemd.journal.field.* commit 2c168cd983d37240d219a4232b62c988036a03c6 Author: Frank Ch. Eigler Date: Thu Nov 22 08:42:25 2012 -0500 systemd-journal: use __pmSetProcessIdentity("adm") for daemon operation From nscott@redhat.com Thu Nov 22 21:54:37 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAN3sbLY022280 for ; Thu, 22 Nov 2012 21:54:37 -0600 X-ASG-Debug-ID: 1353643008-04cb6c7d7799370001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id NbCWjKfLnpPTVQ3k for ; Thu, 22 Nov 2012 19:56:48 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAN3umNL017374 for ; Thu, 22 Nov 2012 22:56:48 -0500 Date: Thu, 22 Nov 2012 22:56:48 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1294081627.30146600.1353643008215.JavaMail.root@redhat.com> Subject: pcp updates: nssmerge branch MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: nssmerge branch Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.153] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353643008 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114998 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge qa/041 | 9 -- qa/041.out | 6 - qa/444 | 3 qa/444.out | 204 +++++++++++++++++++++++++++---------------------------- qa/462 | 3 qa/462.out | 18 ++-- qa/common.filter | 10 ++ 7 files changed, 130 insertions(+), 123 deletions(-) commit a12bf456e5381ebabb5d579ebafe66ccee84471d Author: Dave Brolley Date: Wed Nov 21 12:08:36 2012 -0500 Filter fd numbers in the output, replacing them with . commit 425810f6ea30d162dfbdb2db5d6eb2e7b54df003 Author: Dave Brolley Date: Wed Nov 21 11:43:34 2012 -0500 Updated expected output of qa test case 041. Client now correctly reports a pmcd timeout rather than an IPC protocol failure. commit 51facf98fe8a8c742ead8f7255fc4efe796d0ed4 Author: Dave Brolley Date: Wed Nov 21 11:33:56 2012 -0500 A more general solution for filtering dots in "Waiting for pmcd" messages Filter strings of 3 or more dots in "Waiting for pmcd" messages in filter_pcp_start and filter_pcp_stop rather than in the individual tests. Replace strings of 3 or more dots with a string of 3 dots rather than with the string '[dots]'. This fixes many individual tests without editing them to expect '[dots]' commit ce7371d85868bd45b039d6c9f177a51b4b3b240c Merge: 25e6eae a12bf45 Author: Nathan Scott Date: Fri Nov 23 14:44:07 2012 +1100 Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into nssmerge commit 25e6eae63873dc6a8b0d778132f9e3e8e10dcdd5 Merge: abe384d 73c8a70 Author: Nathan Scott Date: Fri Nov 23 14:43:16 2012 +1100 Merge branch 'dev' into nssmerge From wwwrun@oss.sgi.com Thu Nov 22 21:55:37 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ALL_TRUSTED,BAYES_00, J_CHICKENPOX_63 autolearn=no version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAN3tb1Y022387 for ; Thu, 22 Nov 2012 21:55:37 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qAN3tbML022385; Thu, 22 Nov 2012 21:55:37 -0600 Date: Thu, 22 Nov 2012 21:55:37 -0600 Message-Id: <201211230355.qAN3tbML022385@oss.sgi.com> From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 933] failed __pmSetProcessIdentity should be fatal error X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: nathans@debian.org X-Bugzilla-Status: RESOLVED X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: mort@sgi.com X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: Status CC Resolution In-Reply-To: References: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=933 Nathan Scott changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |nathans@debian.org Resolution| |FIXED --- Comment #1 from Nathan Scott 2012-11-22 21:55:36 CST --- This is fixed in the dev branch now. -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From nscott@redhat.com Thu Nov 22 22:01:47 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAN41lTv022872 for ; Thu, 22 Nov 2012 22:01:47 -0600 X-ASG-Debug-ID: 1353643438-04cbb035a59a460001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id iSBSIMLABuMuZFam for ; Thu, 22 Nov 2012 20:03:59 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAN43wnH003119; Thu, 22 Nov 2012 23:03:58 -0500 Date: Thu, 22 Nov 2012 23:03:58 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <589641972.30147557.1353643438452.JavaMail.root@redhat.com> In-Reply-To: <1294081627.30146600.1353643008215.JavaMail.root@redhat.com> Subject: Re: pcp updates: nssmerge branch MIME-Version: 1.0 X-ASG-Orig-Subj: Re: pcp updates: nssmerge branch Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.153] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353643438 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.114998 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Hi Dave, ----- Original Message ----- > Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge > > qa/041 | 9 -- > qa/041.out | 6 - Ah. For this change (possibly one/two others), this makes the test dependent on the latest version of PCP. We endeavour to allow the latest tests to run on older PCP versions too - for this test (041), a similar trick as is done in e.g. test 703 should be used, with multiple .out files. I've updated the PCP_VER in the dev and nssmerge branches, so a test along the lines "$PCP_VER -ge 3611" would do the trick here, I think (we should aim for the initial NSS merge for this release if you think it is getting close? it seems to be, afaict). > ... > commit 425810f6ea30d162dfbdb2db5d6eb2e7b54df003 > Author: Dave Brolley > Date: Wed Nov 21 11:43:34 2012 -0500 > > Updated expected output of qa test case 041. > > Client now correctly reports a pmcd timeout rather than an IPC > protocol failure. > cheers. -- Nathan From nscott@redhat.com Thu Nov 22 23:10:44 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAN5AhTj028138 for ; Thu, 22 Nov 2012 23:10:43 -0600 X-ASG-Debug-ID: 1353647574-04cbb035a49d080001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id DgW77Qtr570XNpGw for ; Thu, 22 Nov 2012 21:12:55 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAN5Cpx6021279; Fri, 23 Nov 2012 00:12:51 -0500 Date: Fri, 23 Nov 2012 00:12:51 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <143590528.30155450.1353647571504.JavaMail.root@redhat.com> In-Reply-To: <1353538743.19208.50.camel@bozo.localdomain> Subject: pmlaunch-alike (was Re: [pcp] pcp updates) MIME-Version: 1.0 X-ASG-Orig-Subj: pmlaunch-alike (was Re: [pcp] pcp updates) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.153] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353647574 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115002 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Ah, I wanted to talk to this change a bit more, since the initial commit message (for c97946c9ed24ae6d71a271fab0495dbd9013f4fd) was a bit terse. ----- Original Message ----- > Changes committed to git://oss.sgi.com/kenj/pcp.git dev > ... > If we're going to change the arguments to pcp(1) as per commit > 741f7b6 (not sure why this was a good idea), then need this > change to make the usage message match the code. > The change referred to here is to remove one of two ways in which a hostname can be specified to the pcp(1) script. Its questionable because changing it means anyone/anything relying on old behaviour would regress. I've punted that's unlikely, but it could happen - I'd expect everyone would be using the widely known -h option, and not relying on this quirky alternate specification. Stepping back a bit, the missing link here is of course why do this at all. The context is around doing something like pmlaunch (for those who remember it! - it was basically a shell framework for one tool to launch another, with state, usually from the gui tools). What I've been considering is starting a layered package (similar to the pcp-gui model) of non-PCP tools that act like the original tool, but use PCP services. The plan being to provide functionality that people know how to interpret (e.g. iostat output) with the additional features that PCP provides (like archive mode). One difficulty I've seen in the pmcollectl tool is that new options need to be added to enable PCP features. Subtle issues like differences in command line syntax for time window specification are problematic there for example; and back to iostat - it has -h, -t, -z options already, again making life a bit more difficult as these conflict with the "standard" PCP options. So, I was thinking of extending the pcp(1) command to have additional capabilities around being able to run the pcp-variants of these other tools - something like the git(1) frontend wrapper command, e.g. $ pcp iostat -nh $ pcp -h foo.bar.com iostat -nh $ pcp -a /tmp/weekly iostat -nh Anyway, this'll require extending the command line of the pcp.sh script to cover the standard set, convert into env vars (ala pmlaunch) and run the wrapped commands - which then use the environment to enable PCP-fu. And the wrapped command ("iostat" above) conflicts with the alternate hostname specification, and hence this change. cheers. -- Nathan From kenj@internode.on.net Fri Nov 23 03:56:04 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAN9u4EU056175 for ; Fri, 23 Nov 2012 03:56:04 -0600 X-ASG-Debug-ID: 1353664694-04cbb035a7ab230001-S8gJnT Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id jy9qpu4Ge3Pr3oW8 for ; Fri, 23 Nov 2012 01:58:15 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.145 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBABVIr1BujLFf/2dsb2JhbAANN4YnuiKDEQEBAQQjVgwECw0LAgImAgJXBogsq01wkkqBIoswgxOBEwOXHYRxjTiBVA Received: from unknown (HELO [10.192.207.30]) ([110.140.177.95]) by ipmail06.adl6.internode.on.net with ESMTP; 23 Nov 2012 20:28:13 +1030 Message-ID: <1353664693.2573.8.camel@bozo-laptop.localdomain> Subject: Re: [pcp] Collateral damage in non-root changes From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes To: Nathan Scott Cc: pcp@oss.sgi.com Date: Fri, 23 Nov 2012 20:58:13 +1100 In-Reply-To: <1325320647.29899954.1353572267882.JavaMail.root@redhat.com> References: <1325320647.29899954.1353572267882.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl6.internode.on.net[150.101.137.145] X-Barracuda-Start-Time: 1353664694 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115021 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Thu, 2012-11-22 at 03:17 -0500, Nathan Scott wrote: > ----- Original Message ----- > > On Wed, 2012-11-21 at 21:45 -0500, Nathan Scott wrote: > > ... > > > That doesn't make sense to me (nor do I see how chown on the > > > pmlogger directory changes this behaviour) - the permissions > > > of a symlink are irrelevant - as described here... > > > http://superuser.com/questions/303040/how-do-file-permissions-apply-to-symlinks > > > > > > Which suggests its the directory... hmmm... the only thing I > > > can think of is a kernel issue. ... > > > > Nod. > > > > Also "lsattr -d " might show some unexpected attribute? > Can't think what attribute might cause this behaviour though. > > Otherwise maybe some selinux or other security module coming > into play? (guessing wildly) Explanation is here: http://lwn.net/Articles/390323/ Since the "primary" symlink can only ever be owned by "pcp", the fix is to make $PCP_TMP_DIR/pmlogger owned by "pcp". Not sure how this all works if the PCP user is something other than pcp, as per your mail on another topic ... I suspect this is outside the scope of what can be done in the packaging, so $PCP_TMP_DIR/pmlogger would have to be chown'd by a packing exitop or by the pmlogger control scripts. From kenj@internode.on.net Fri Nov 23 04:22:10 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_62 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qANAMAIQ058274 for ; Fri, 23 Nov 2012 04:22:10 -0600 X-ASG-Debug-ID: 1353666260-04cbb035a7ac4a0001-S8gJnT Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id NNafMvzNkrqv75fx for ; Fri, 23 Nov 2012 02:24:20 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.145 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAPJNr1BujLFf/2dsb2JhbAANN4YnuiKDO34HBgImAnKzUHCSR4EiixWBGoIUgRMDnA6NOIFNJA Received: from unknown (HELO [10.192.207.30]) ([110.140.177.95]) by ipmail06.adl6.internode.on.net with ESMTP; 23 Nov 2012 20:54:19 +1030 Message-ID: <1353666257.2573.9.camel@bozo-laptop.localdomain> Subject: pcp updates - assorted qa and pmie and Makepkgs From: Ken McDonell X-ASG-Orig-Subj: pcp updates - assorted qa and pmie and Makepkgs To: pcp@oss.sgi.com Date: Fri, 23 Nov 2012 21:24:17 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl6.internode.on.net[150.101.137.145] X-Barracuda-Start-Time: 1353666260 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115023 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/kenj/pcp.git dev Makepkgs | 4 man/man1/pmie.1 | 6 qa/514 | 165 ++++++++++ qa/514.out | 844 ++++++++++++++++++++++++++++++++++++++++++++++++++++ qa/583 | 6 qa/GNUmakefile | 2 qa/common.config | 6 qa/group | 1 qa/mk.qa_hosts | 15 src/pmie/src/act.sk | 2 src/pmie/src/pmie.c | 4 src/pmie/src/show.c | 104 ++++-- 12 files changed, 1115 insertions(+), 44 deletions(-) commit 8473e700053f04fb72b083cfb12f38246dd60160 Author: Ken McDonell Date: Fri Nov 23 21:19:43 2012 +1100 pmie - %h/%v/%i tweaks, -d fixes Update the man page to be more precise about how the bindings for %h, %v and %i are made in rules. Some cosmetic code changes to improve comments. Several fixups for -d (debug mode) where the code was just wrong and had regressed as changes had been made over the years in other parts of pmie. [this is an interim commit, I expect there will be more to come] commit 4bb4f65cf5a277b0c2242748648a993a036482d3 Author: Ken McDonell Date: Fri Nov 23 21:17:42 2012 +1100 qa/514 - new - exercise pmie -d As part of the validation of the %h, %i and %v selectors in pmie rules. commit dd8103eb6504ad879772a37b46e7ba2bb503b401 Author: Ken McDonell Date: Fri Nov 23 21:15:25 2012 +1100 qa/GNUmakefile - *.full files should not be included/packaged For both $(DOTOUTFILES) and the qa_outfiles file, files like 123.full should not be included. commit ff488b5a8be511ca21e395c795b932305ad6b1af Author: Ken McDonell Date: Fri Nov 23 21:04:25 2012 +1100 qa/common.config - tweak local settings for kenj commit 243fc1637c5fc1c37748f57cb7ca1a011609772e Author: Ken McDonell Date: Fri Nov 23 09:51:00 2012 +1100 Makepkgs - explicitly set --with-tmpdir Need to explicitly set --with-tmpdir=/var/lib/pcp/tmp to maintain consistency with configure options set elsewhere in the package builds. commit 3cbf241516631328943f1ce5a9d23e576e695159 Author: Ken McDonell Date: Fri Nov 23 07:01:25 2012 +1100 qa/583 - avoid grabbing syslog contents twice Besides being a "good thing", this makes lines in 583.out and 583.full consistent. commit 69febda46d3745331243a2fc1eec5179cebfeaa6 Author: Ken McDonell Date: Fri Nov 23 06:53:44 2012 +1100 qa/mk.qa_hosts - fix ugly failure mode Truly horrible interaction between the QA infrastructure (common* files), the mk.qa_hosts script and make. The symptom was that mk.qa_hosts worked alone and worked when run from make directly, but failed when run from make which was run from check when $PCP_AWK_PROG expanded to "/usr/bin/gawk (yep, bogus leading quote). Environment is setup in common.rc, is then _modified_ in make, and then the environment was not being setup again mk.qa_hosts in this case. Yuk. From kenj@internode.on.net Fri Nov 23 14:34:23 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qANKYNVw115800 for ; Fri, 23 Nov 2012 14:34:23 -0600 X-ASG-Debug-ID: 1353702994-04cbb035a6c8f60001-S8gJnT Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id e59A4GIq3VkkNso8 for ; Fri, 23 Nov 2012 12:36:35 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.129 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAIDbr1BujLFf/2dsb2JhbAANN4YnuimDO34HBgImAnKzXHCSVYEiixUJgRGCFIETA5wOjTiBSw Received: from unknown (HELO [10.192.207.30]) ([110.140.177.95]) by ipmail06.adl2.internode.on.net with ESMTP; 24 Nov 2012 07:06:33 +1030 Message-ID: <1353702995.2573.10.camel@bozo-laptop.localdomain> Subject: pcp updates - compilation warning and configuration files in packaging From: Ken McDonell X-ASG-Orig-Subj: pcp updates - compilation warning and configuration files in packaging To: pcp@oss.sgi.com Date: Sat, 24 Nov 2012 07:36:35 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl2.internode.on.net[150.101.137.129] X-Barracuda-Start-Time: 1353702994 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115063 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/kenj/pcp.git dev build/rpm/devtoolset.spec | 1 + build/rpm/fedora.spec | 1 + build/rpm/pcp.spec.in | 1 + debian/pcp.conffiles | 8 ++++++++ src/libpcp/src/util.c | 3 ++- 5 files changed, 13 insertions(+), 1 deletion(-) commit 5e80cc3195cd1afe236083331d72a11438865f81 Author: Ken McDonell Date: Sat Nov 24 07:30:20 2012 +1100 packaging and configuration files Recent relocation of some critical configuration files out of /etc and into /var/lib/pcp/config meant that the marking of these files in Debian packages was lost and they were being unconditionally overwritten during an upgrade. Reverted to the earlier behaviour so files like pmcd.conf, pmie and pmlogger control files, etc are not clobbered if they have been modified. At the same time, make the list of configuration files consistent between the Debian and (three) RedHat packaging specifications. commit d2f3340252b361d062d017f627e037a587197fed Author: Ken McDonell Date: Sat Nov 24 07:29:19 2012 +1100 libpcp/util.c - fix compilation warning and add more verbosity to error message if getpwnam_r() fails. From nscott@redhat.com Fri Nov 23 17:10:46 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qANNAjed129075 for ; Fri, 23 Nov 2012 17:10:46 -0600 X-ASG-Debug-ID: 1353712378-04cb6c7d77d1560001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id SpCBV8IV0AZLaLRF for ; Fri, 23 Nov 2012 15:12:58 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qANNCsQT026047; Fri, 23 Nov 2012 18:12:54 -0500 Date: Fri, 23 Nov 2012 18:12:54 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1624458126.30490689.1353712374797.JavaMail.root@redhat.com> In-Reply-To: <1353664693.2573.8.camel@bozo-laptop.localdomain> Subject: Re: [pcp] Collateral damage in non-root changes MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.50.153] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353712378 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115073 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > On Thu, 2012-11-22 at 03:17 -0500, Nathan Scott wrote: > > ... > > Otherwise maybe some selinux or other security module coming > > into play? (guessing wildly) > > Explanation is here: http://lwn.net/Articles/390323/ > > Since the "primary" symlink can only ever be owned by "pcp", the fix > is to make $PCP_TMP_DIR/pmlogger owned by "pcp". > Does this have to be a symlink? Would a hardlink do? It's in the same directory, so no cross-filesystem issues there... there'll be a few -L tests here and there, but perhaps they could be reworked? (symlink support lacking on Win32, generally, so others benefit as well, in theory). cheers. -- Nathan From kenj@internode.on.net Fri Nov 23 17:18:10 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qANNI96A129457 for ; Fri, 23 Nov 2012 17:18:10 -0600 X-ASG-Debug-ID: 1353712821-04bdf005d3d6210001-S8gJnT Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id O7dJIOCTLEVOhZZc for ; Fri, 23 Nov 2012 15:20:21 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.129 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAKMDsFBujLFf/2dsb2JhbAANN4YnuimDEQEBAQQjVgwECw0LAgImAgJXBrNLcJJcgSKOQ4ETA5wOjTg Received: from unknown (HELO [10.192.207.30]) ([110.140.177.95]) by ipmail06.adl2.internode.on.net with ESMTP; 24 Nov 2012 09:50:20 +1030 Message-ID: <1353712823.2573.11.camel@bozo-laptop.localdomain> Subject: Re: [pcp] Collateral damage in non-root changes From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] Collateral damage in non-root changes To: Nathan Scott Cc: pcp@oss.sgi.com Date: Sat, 24 Nov 2012 10:20:23 +1100 In-Reply-To: <1624458126.30490689.1353712374797.JavaMail.root@redhat.com> References: <1624458126.30490689.1353712374797.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl2.internode.on.net[150.101.137.129] X-Barracuda-Start-Time: 1353712821 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115075 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Fri, 2012-11-23 at 18:12 -0500, Nathan Scott wrote: > > ----- Original Message ----- > > On Thu, 2012-11-22 at 03:17 -0500, Nathan Scott wrote: > > > ... > > > Otherwise maybe some selinux or other security module coming > > > into play? (guessing wildly) > > > > Explanation is here: http://lwn.net/Articles/390323/ > > > > Since the "primary" symlink can only ever be owned by "pcp", the fix > > is to make $PCP_TMP_DIR/pmlogger owned by "pcp". > > > > Does this have to be a symlink? Would a hardlink do? It's in the > same directory, so no cross-filesystem issues there... there'll be > a few -L tests here and there, but perhaps they could be reworked? > (symlink support lacking on Win32, generally, so others benefit as > well, in theory). No reason for it to be a symlink that I can think of ... good suggestion. From fche@redhat.com Sat Nov 24 12:52:22 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAOIqMWQ216798 for ; Sat, 24 Nov 2012 12:52:22 -0600 X-ASG-Debug-ID: 1353783275-04cb6c7d76108590001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id P7UqVNXw5UfvZ8ZX for ; Sat, 24 Nov 2012 10:54:36 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAOIsW2R013568 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 24 Nov 2012 13:54:32 -0500 Received: from fche.csb (vpn-8-35.rdu.redhat.com [10.11.8.35]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAOIsVrg018514; Sat, 24 Nov 2012 13:54:32 -0500 Received: by fche.csb (Postfix, from userid 2569) id 19E2A58160; Sat, 24 Nov 2012 13:54:30 -0500 (EST) To: Ken McDonell Cc: pcp@oss.sgi.com Subject: Re: pcp updates - compilation warning and configuration files in packaging References: <1353702995.2573.10.camel@bozo-laptop.localdomain> X-ASG-Orig-Subj: Re: pcp updates - compilation warning and configuration files in packaging From: fche@redhat.com (Frank Ch. Eigler) Date: Sat, 24 Nov 2012 13:54:30 -0500 In-Reply-To: <1353702995.2573.10.camel@bozo-laptop.localdomain> (Ken McDonell's message of "Sat, 24 Nov 2012 07:36:35 +1100") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1353783275 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com kenj wrote: > [...] > Recent relocation of some critical configuration files out of /etc > and into /var/lib/pcp/config meant that the marking of these files > in Debian packages was lost and they were being unconditionally > overwritten during an upgrade. > [...] IMHO, it would be more proper to have all configuration files under $sysconfdir. - FChE From kenj@internode.on.net Sat Nov 24 14:10:44 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAOKAiIS224393 for ; Sat, 24 Nov 2012 14:10:44 -0600 X-ASG-Debug-ID: 1353787973-04cbb035a710a620001-S8gJnT Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id L5rfaNyWNItsABYX for ; Sat, 24 Nov 2012 12:12:54 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.145 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBANIpsVBujLFf/2dsb2JhbAANN4YouiuDEQEBAQQjVhALDQsCAiYCAlcGsxRwkXSBIo5DgRMDlx2EcY06 Received: from unknown (HELO [10.192.207.30]) ([110.140.177.95]) by ipmail06.adl6.internode.on.net with ESMTP; 25 Nov 2012 06:42:52 +1030 Message-ID: <1353787979.2573.43.camel@bozo-laptop.localdomain> Subject: Re: pcp updates - compilation warning and configuration files in packaging From: Ken McDonell X-ASG-Orig-Subj: Re: pcp updates - compilation warning and configuration files in packaging To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Date: Sun, 25 Nov 2012 07:12:59 +1100 In-Reply-To: References: <1353702995.2573.10.camel@bozo-laptop.localdomain> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl6.internode.on.net[150.101.137.145] X-Barracuda-Start-Time: 1353787973 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115151 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header G'day Frank. On Sat, 2012-11-24 at 13:54 -0500, Frank Ch. Eigler wrote: > kenj wrote: > > > [...] > > Recent relocation of some critical configuration files out of /etc > > and into /var/lib/pcp/config meant that the marking of these files > > in Debian packages was lost and they were being unconditionally > > overwritten during an upgrade. > > [...] > > IMHO, it would be more proper to have all configuration files under > $sysconfdir. Well some of them used to be in /etc/ for debian builds but were recently moved when configure.in was rearranged. I tend to agree in principle, but one could possibly argue either way ... the usage text from configure suggests --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --localstatedir=DIR modifiable single-machine data [PREFIX/var] Now the files that are explicitly marked as "configuration" files to the debian and rpm packaging are all ones we ship, expect they may well be modified by a sys admin and thereafter we treat them as read-only. To move them to $sysconfdir we'd have a little work to do. OPTION A Introduce $PCP_SYSCONF_DIR to expose $sysconfdir via pcp.conf and then move everything currently below $PCP_VAR_DIR/config/ to $PCP_SYSCONF_DIR/. This touches vastly more files than the ones in the current "configuration" files list, and would involve changes to 310 lines of code/script/qa, although the changes can largely be automated. OPTION B Keep the existing list of "configuration" files, and be more surgical. This will split PCP configuration data between $sysconfdir and $PCP_VAR_DIR/config. B.1. Simple cases where we have a dedicated variable in configure.in and parameterization in pcp.conf to drive symbolic reference and possible relocation. The change would be to configure.in and a makefile where the containing directory is created/installed. pmcd/pmcd.conf pmcd/pmcd.options pmcd/rc.local pmproxy/pmproxy.options pmie/control pmlogger/control Note that these will need multiple "pcp" directories below $sysconfdir, namely pmcd, pmlogger, pmie and pmproxy. B.2. Cases that _should_ be handled as in B.1. but we do not have dedicated configure.in variable to define the path, and so we'd need to do that to uncouple the symbolic reference from $PCP_VAR_DIR pmie/stomp B.3. Cases that are on the list and really are not configuration files in the sense of the ones above ... these are shipped and never expected to be changed locally. I don't know what to do about these ... if they are to be moved to $sysconfdir then we'll need treatment like B.2. else leave them where they are pmie/config.default pmie/crontab pmlogger/config.default pmlogger/crontab It would be nice to clean this up for once and for all ... let's see if we can reach consensus on what's the "right" thing to do. From fche@redhat.com Sat Nov 24 20:06:11 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAP26Age258021 for ; Sat, 24 Nov 2012 20:06:11 -0600 X-ASG-Debug-ID: 1353809304-04cbb035a51182d0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id WWUHvJNYc2JUxlUB for ; Sat, 24 Nov 2012 18:08:24 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAP28LL7023062 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 24 Nov 2012 21:08:21 -0500 Received: from fche.csb (vpn-8-35.rdu.redhat.com [10.11.8.35]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAP28Kfr005612; Sat, 24 Nov 2012 21:08:20 -0500 Received: by fche.csb (Postfix, from userid 2569) id C742C58160; Sat, 24 Nov 2012 21:08:18 -0500 (EST) Date: Sat, 24 Nov 2012 21:08:18 -0500 From: "Frank Ch. Eigler" To: Ken McDonell Cc: pcp@oss.sgi.com Subject: Re: pcp updates - compilation warning and configuration files in packaging Message-ID: <20121125020818.GC32625@redhat.com> X-ASG-Orig-Subj: Re: pcp updates - compilation warning and configuration files in packaging References: <1353702995.2573.10.camel@bozo-laptop.localdomain> <1353787979.2573.43.camel@bozo-laptop.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1353787979.2573.43.camel@bozo-laptop.localdomain> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1353809304 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Hi, Ken - > > IMHO, it would be more proper to have all configuration files under > > $sysconfdir. > > Well some of them used to be in /etc/ for debian builds > but were recently moved when configure.in was rearranged. (That was not intentional, and should be restoreable.) > I tend to agree in principle, but one could possibly argue either > way ... the usage text from configure suggests > --sysconfdir=DIR read-only single-machine data [PREFIX/etc] > --localstatedir=DIR modifiable single-machine data [PREFIX/var] (The brief help text is not the whole story.) > [...] > To move them to $sysconfdir we'd have a little work to do. > > OPTION A > > Introduce $PCP_SYSCONF_DIR to expose $sysconfdir via pcp.conf and then > move everything currently below $PCP_VAR_DIR/config/ to > $PCP_SYSCONF_DIR/. > > This touches vastly more files than the ones in the current > "configuration" files list, and would involve changes to 310 lines of > code/script/qa, although the changes can largely be automated. Yeah, cleaning it up fully is quite a bit of make-work. Another possible option could be to make $PCP_VAR_DIR/config a *symlink* into $PCP_SYSCONF_DIR/, where the real files would live. > OPTION B > > Keep the existing list of "configuration" files, and be more surgical. > This will split PCP configuration data between $sysconfdir and > $PCP_VAR_DIR/config. > > B.1. Simple cases where we have a dedicated variable in configure.in and > parameterization in pcp.conf to drive symbolic reference and possible > relocation. The change would be to configure.in and a makefile where > the containing directory is created/installed. ($PCP_SYSCONFIG_DIR is already defined, just not used, whoops.) > [...] > B.3. Cases that are on the list and really are not configuration files > in the sense of the ones above ... these are shipped and never expected > to be changed locally. I don't know what to do about these ... if they > are to be moved to $sysconfdir then we'll need treatment like B.2. else > leave them where they are > pmie/config.default > pmie/crontab > pmlogger/config.default > pmlogger/crontab Default/template configuration files are commonly shipped right alongside /etc, or under the documentation directories. Perhaps it would make sense to install the crontab entries by default (on modern linux under /etc/cron.d). - FChE From kenj@internode.on.net Sun Nov 25 14:02:28 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAPK2RJu084654 for ; Sun, 25 Nov 2012 14:02:27 -0600 X-ASG-Debug-ID: 1353873877-04bdf005d41535d0001-S8gJnT Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id MJQ6FHJvf2IRDbqQ for ; Sun, 25 Nov 2012 12:04:37 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.129 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Au8mAHt5slABm2q2PGdsb2JhbAANN4YohDq1dAMBAQEBOIJSAQEBAwEjVgULCw0LAgImAgJDFAaIGqpYcJFhgSKOQ4ETA5cdhHGNOg Received: from unknown (HELO [10.96.37.191]) ([1.155.106.182]) by ipmail06.adl2.internode.on.net with ESMTP; 26 Nov 2012 06:34:36 +1030 Message-ID: <1353873879.2573.65.camel@bozo-laptop.localdomain> Subject: Re: pcp updates - compilation warning and configuration files in packaging From: Ken McDonell X-ASG-Orig-Subj: Re: pcp updates - compilation warning and configuration files in packaging To: "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Date: Mon, 26 Nov 2012 07:04:39 +1100 In-Reply-To: <20121125020818.GC32625@redhat.com> References: <1353702995.2573.10.camel@bozo-laptop.localdomain> <1353787979.2573.43.camel@bozo-laptop.localdomain> <20121125020818.GC32625@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl2.internode.on.net[150.101.137.129] X-Barracuda-Start-Time: 1353873877 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115244 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header On Sat, 2012-11-24 at 21:08 -0500, Frank Ch. Eigler wrote: > Hi, Ken - > > > > IMHO, it would be more proper to have all configuration files under > > > $sysconfdir. > > > > Well some of them used to be in /etc/ for debian builds > > but were recently moved when configure.in was rearranged. > > (That was not intentional, and should be restoreable.) It is not that simple. These configuration files were special cases where the setting depended on the distro ... since there is no distro-specific logic in configure.in any more they cannot simply be moved by command-line options to configure without moving a whole lot of other stuff. It needs to be fixed properly. > > OPTION A > > > > Introduce $PCP_SYSCONF_DIR to expose $sysconfdir via pcp.conf and then > > move everything currently below $PCP_VAR_DIR/config/ to > > $PCP_SYSCONF_DIR/. > > > > This touches vastly more files than the ones in the current > > "configuration" files list, and would involve changes to 310 lines of > > code/script/qa, although the changes can largely be automated. > > Yeah, cleaning it up fully is quite a bit of make-work. I favour this approach. The work is boring, but low risk ... just the sort of thing we could assign to a retired person ... 8^)> > ($PCP_SYSCONFIG_DIR is already defined, just not used, whoops.) This defaults to /etc/sysconfig ... which smells like something Redhat specific ... although as it is not used, perhaps it should be culled. It appears that autoconf provides $sysconfdir [default $prefix/etc] and --sysconfdir= which becomes $PCP_ETC_DIR while we've added $pcp_sysconfig_dir [default $prefix/etc/sysconfig] and --with-sysconfigdir= which becomes $PCP_SYSCONFIG_DIR. My vote would be for changing all references in the code from $PCP_VAR_DIR/config to $PCP_ETC_DIR or better, introducing $PCP_SYSCONF_DIR which would have the same value is $PCP_ETC_DIR but would allow the uses in the code base to remain identifiable if we need to revisit this at a later date. > Default/template configuration files are commonly shipped right > alongside /etc, or under the documentation directories. Perhaps > it would make sense to install the crontab entries by default > (on modern linux under /etc/cron.d). The crontab enties really should only be installed if one is running the system versions of pmlogger or pmie ... I'd prefer we do not do this automatically ... although now we'd be pretty close to having them run from a new crontab for the user "pcp" ... which is much better than dinking with root's crontab entries. From fche@redhat.com Sun Nov 25 16:03:52 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAPM3qBl117973 for ; Sun, 25 Nov 2012 16:03:52 -0600 X-ASG-Debug-ID: 1353881167-04cbb035a514dd50001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id YP145DQj6pKB7I8B for ; Sun, 25 Nov 2012 14:06:07 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAPM63AK012505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 25 Nov 2012 17:06:03 -0500 Received: from fche.csb (vpn-8-35.rdu.redhat.com [10.11.8.35]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAPM62mf019663; Sun, 25 Nov 2012 17:06:03 -0500 Received: by fche.csb (Postfix, from userid 2569) id 432015815C; Sun, 25 Nov 2012 17:06:02 -0500 (EST) Date: Sun, 25 Nov 2012 17:06:02 -0500 From: "Frank Ch. Eigler" To: Ken McDonell Cc: pcp@oss.sgi.com Subject: Re: pcp updates - compilation warning and configuration files in packaging Message-ID: <20121125220602.GE32625@redhat.com> X-ASG-Orig-Subj: Re: pcp updates - compilation warning and configuration files in packaging References: <1353702995.2573.10.camel@bozo-laptop.localdomain> <1353787979.2573.43.camel@bozo-laptop.localdomain> <20121125020818.GC32625@redhat.com> <1353873879.2573.65.camel@bozo-laptop.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1353873879.2573.65.camel@bozo-laptop.localdomain> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1353881167 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Hi, Ken - > It is not that simple. These configuration files were special cases > where the setting depended on the distro ... since there is no > distro-specific logic in configure.in any more they cannot simply be > moved by command-line options to configure without moving a whole lot of > other stuff. Right; the idea was that distro-specific stuff would be in Makepkgs or other such wrapper scripts, which would invoke .../configure with the distro-favoured --foodir=BARPATH options. > > Yeah, cleaning it up fully is quite a bit of make-work. > > I favour this approach. The work is boring, but low risk ... just the > sort of thing we could assign to a retired person ... 8^)> You won't find me discouraging a volunteer! :-) One tricky aspect could require some packaging scripting, that being the migration of config files from the old to the new locations. > > ($PCP_SYSCONFIG_DIR is already defined, just not used, whoops.) > > This defaults to /etc/sysconfig ... which smells like something Redhat > specific ... although as it is not used, perhaps it should be culled. Right; probably redefined as /etc/pcp by default (and if any RH directory purist speaks up, they can use --with-pcp-sysconfig-dir=/etc/sysconfig/foobar). > [...] > My vote would be for changing all references in the code from > $PCP_VAR_DIR/config to $PCP_ETC_DIR or better, introducing > $PCP_SYSCONF_DIR which would have the same value is $PCP_ETC_DIR but > would allow the uses in the code base to remain identifiable if we need > to revisit this at a later date. Makes sense. (Or just use $PCP_ETC_DIR throughout.) > [...] The crontab enties really should only be installed if one is > running the system versions of pmlogger or pmie [...] (I assume you mean their configurations rather than code.) Perhaps we could provide a pmlogger-setup subpackage that activates the default logs & rotation crontabs. - FChE From nscott@redhat.com Sun Nov 25 16:17:36 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAPMHZ85118785 for ; Sun, 25 Nov 2012 16:17:35 -0600 X-ASG-Debug-ID: 1353881989-04cb6c7d791509a0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 2sCfhgF1H1oyrfWK for ; Sun, 25 Nov 2012 14:19:49 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAPMJneO015422 for ; Sun, 25 Nov 2012 17:19:49 -0500 Date: Sun, 25 Nov 2012 17:19:49 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <900601820.32629004.1353881989117.JavaMail.root@redhat.com> Subject: pcp updates: nssmerge branch MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: nssmerge branch Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.15] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353881989 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115254 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge qa/.gitignore | 1 + qa/041 | 16 ++++++++++------ qa/041.out | 36 ------------------------------------ qa/041.out.1 | 36 ++++++++++++++++++++++++++++++++++++ qa/041.out.2 | 36 ++++++++++++++++++++++++++++++++++++ src/libpcp/src/logconnect.c | 35 ++++++++++++++++++++++++++++++----- src/pmcd/src/config.c | 10 +++++----- 7 files changed, 118 insertions(+), 52 deletions(-) commit 5d976a7ad4c84ee86df1b88bde63d4ecaf3bc7a1 Author: Nathan Scott Date: Mon Nov 26 09:18:36 2012 +1100 Compat output for test 041, timeout error not overridden in libpcp now commit 5e89bd5bfb4cce799bb31aff4be69ffa0fe3d520 Merge: ce7371d 3ea1db6 Author: Nathan Scott Date: Mon Nov 26 08:57:03 2012 +1100 Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into nssmerge commit 3ea1db6d154187318a2be9a94f6e13896bc5b0a3 Author: Dave Brolley Date: Fri Nov 23 14:28:57 2012 -0500 Handle EINPROGRESS status from PR_Connect. NSPR manages all file descriptors in nonblocking mode, so it is possible to get PR_FAILURE from PR_Connect when connecting to a socket with oserror() returning EINPROGRESS. In this case, the client must wait for the socket using __pmSelect{Read,WRite} and then call __pmConnectCheckError in order to determine whether the connection was successful. This fixes qa test case 439 for NSS/NSPR enabled builds. commit ed3fc6cc8b043a896146b1e6466f060dceaacc7a Author: Dave Brolley Date: Thu Nov 22 15:20:41 2012 -0500 Fix pmcd crash in ParseRestartAgents with NSS/NSPR enabled. The function was not using the __pm* socket I/O api. Fixes qa test case failures for 067, 110 and 156 with NSS enabled. From nscott@redhat.com Sun Nov 25 22:37:29 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQ4bTx5149398 for ; Sun, 25 Nov 2012 22:37:29 -0600 X-ASG-Debug-ID: 1353904783-04cb6c7d79162880001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id WMj8CCuT6JEZLrRD for ; Sun, 25 Nov 2012 20:39:43 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQ4dhLA016303 for ; Sun, 25 Nov 2012 23:39:43 -0500 Date: Sun, 25 Nov 2012 23:39:43 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <878787328.32712001.1353904783114.JavaMail.root@redhat.com> Subject: pcp updates: qa, pmdanamed MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa, pmdanamed Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.15] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353904783 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115278 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/583 | 4 - qa/602 | 14 +++- src/libpcp/src/util.c | 24 +++++-- src/pmdas/named/Install | 12 ++- src/pmdas/named/pmdanamed.pl | 139 +++++++++++++++++++++++++++---------------- 5 files changed, 125 insertions(+), 68 deletions(-) commit f8b7e20cd616cee750adf11d39a01d53ccb9ca12 Author: Nathan Scott Date: Mon Nov 26 15:38:04 2012 +1100 Fix the getpwnam compile warnings which I just reintroduced commit c5b72bd20efd73dafd81ce1e8e25b1b0af5e12d9 Author: Nathan Scott Date: Mon Nov 26 15:32:28 2012 +1100 Fix spurious trace pmda usage difference in qa/602 commit 0b63a9110c986e65087fb395078b40cb1821588a Author: Nathan Scott Date: Mon Nov 26 15:32:02 2012 +1100 Test qa/583 refers to a non-existant file (via cat) and fails I think the intention was to add the tail ($tmp.tmp) to the full file, and also a mention of which syslog was chosen, which this change now implements (Ken please double check though - thanks!) commit 09d52f480976e3d022f354bfa560d9bd54145b3a Author: Nathan Scott Date: Mon Nov 26 15:29:06 2012 +1100 Another stab at error handling in getpwnam routines, qa/653 passes commit d4b1473378cea45139180d0a686e5844dc1cb915 Author: Nathan Scott Date: Mon Nov 26 15:11:08 2012 +1100 Update the named (name server) PMDA This updates the bind named agent so that it exports metric values from more recent versions of bind. In particular, the format of the statistics file has changed significantly. Also, the PMDA now switches from 'root' to the 'named' user, to drop privileges. Currently this exports just the global "Name Server" statistics, there is scope for adding a number of new metric subtrees with the newer versions of named - currently we ignore these sections: Incoming Requests Incoming Queries Outgoing Queries Zone Maintenance Statistics Resolver Statistics Cache DB RRsets Socket I/O Statistics Per Zone Query Statistics Adding these would be relatively straightforward now, should some punter be interested in any of these areas. Many would be trivial and done exactly as the existing code is, others would warrant the addition of an indom (e.g. per-zone stats) - trickier but could be done using the recently added indom-cache hashing PCP::PMDA code. Backward compatibility for older bind variants is still present in the PMDA, so it should work on all RHEL variants (I've only tested RHEL6 though). From nscott@redhat.com Mon Nov 26 02:24:25 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQ8OPIU167169 for ; Mon, 26 Nov 2012 02:24:25 -0600 X-ASG-Debug-ID: 1353918399-04cb6c7d7616c2f0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id U9nDFQXElatvR1FF for ; Mon, 26 Nov 2012 00:26:40 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQ8Qa5B016138; Mon, 26 Nov 2012 03:26:36 -0500 Date: Mon, 26 Nov 2012 03:26:36 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1938121937.32747770.1353918396194.JavaMail.root@redhat.com> In-Reply-To: <1353666257.2573.9.camel@bozo-laptop.localdomain> Subject: Re: [pcp] pcp updates - assorted qa and pmie and Makepkgs MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] pcp updates - assorted qa and pmie and Makepkgs Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.15] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353918399 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115294 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- FYI - I'm seeing this qa issue, I guess as a result of these commits... ----- Original Message ----- > > commit 8473e700053f04fb72b083cfb12f38246dd60160 > Author: Ken McDonell > Date: Fri Nov 23 21:19:43 2012 +1100 > > pmie - %h/%v/%i tweaks, -d fixes > > Update the man page to be more precise about how the bindings for > %h, %v and %i are made in rules. > > Some cosmetic code changes to improve comments. > > Several fixups for -d (debug mode) where the code was just wrong > and had regressed as changes had been made over the years in > other > parts of pmie. > > [this is an interim commit, I expect there will be more to come] > > commit 4bb4f65cf5a277b0c2242748648a993a036482d3 > Author: Ken McDonell > Date: Fri Nov 23 21:17:42 2012 +1100 > > qa/514 - new - exercise pmie -d > > As part of the validation of the %h, %i and %v selectors in pmie > rules. > [85%] 514 - output mismatch (see 514.out.bad) 798a799 > DATE: (null) 802a804 > DATE: (null) 806a809 > DATE: (null) 810a814 > DATE: (null) 814a819 > DATE: (null) 840c845 < min_inst sample.part.bin :LOCALHOST --- > min_inst sample_part.bin :LOCALHOST cheers. -- Nathan From kenj@internode.on.net Mon Nov 26 03:57:09 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQ9v9tV180652 for ; Mon, 26 Nov 2012 03:57:09 -0600 X-ASG-Debug-ID: 1353923962-04cb6c7d77171400001-S8gJnT Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id vM3pCr9MJe9F03ya for ; Mon, 26 Nov 2012 01:59:23 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.143 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAEo8s1B20f8g/2dsb2JhbAANN4Youg+DEQEBAQQjVhALFAQCAiYCAlcGE7QCcJIUgSKLFYMugRMDlgGTRw Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail05.adl6.internode.on.net with ESMTP; 26 Nov 2012 20:29:22 +1030 Message-ID: <1353924029.3886.1.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates: qa, pmdanamed From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] pcp updates: qa, pmdanamed To: Nathan Scott Cc: pcp@oss.sgi.com Date: Mon, 26 Nov 2012 21:00:29 +1100 In-Reply-To: <878787328.32712001.1353904783114.JavaMail.root@redhat.com> References: <878787328.32712001.1353904783114.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail05.adl6.internode.on.net[150.101.137.143] X-Barracuda-Start-Time: 1353923962 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115300 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Sun, 2012-11-25 at 23:39 -0500, Nathan Scott wrote: > Changes committed to git://oss.sgi.com/pcp/pcp.git dev > > qa/583 | 4 - > ... > commit 0b63a9110c986e65087fb395078b40cb1821588a > Author: Nathan Scott > Date: Mon Nov 26 15:32:02 2012 +1100 > > Test qa/583 refers to a non-existant file (via cat) and fails > > I think the intention was to add the tail ($tmp.tmp) to the full > file, and also a mention of which syslog was chosen, which this > change now implements (Ken please double check though - thanks!) Apologies for botching this. Your fix looks good to me. From kenj@internode.on.net Mon Nov 26 03:58:27 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQ9wRLa180833 for ; Mon, 26 Nov 2012 03:58:27 -0600 X-ASG-Debug-ID: 1353924040-04cbb035a716cc10001-S8gJnT Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id n1ucvbHTFBGcVE8U for ; Mon, 26 Nov 2012 02:00:41 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.143 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAFo9s1B20f8g/2dsb2JhbAANN4Youg+DEQEBAQQjVgwECxQEAgImAgJXBhOze3CSFIEiixWDLoETA5YBk0eBTSQ Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail05.adl6.internode.on.net with ESMTP; 26 Nov 2012 20:30:33 +1030 Message-ID: <1353924101.3886.2.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates - assorted qa and pmie and Makepkgs From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] pcp updates - assorted qa and pmie and Makepkgs To: Nathan Scott Cc: pcp@oss.sgi.com Date: Mon, 26 Nov 2012 21:01:41 +1100 In-Reply-To: <1938121937.32747770.1353918396194.JavaMail.root@redhat.com> References: <1938121937.32747770.1353918396194.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail05.adl6.internode.on.net[150.101.137.143] X-Barracuda-Start-Time: 1353924041 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115300 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Can you just ignore 514 for a while? It and the pmie changes are still in a bit of a state of flux. On Mon, 2012-11-26 at 03:26 -0500, Nathan Scott wrote: > FYI - I'm seeing this qa issue, I guess as a result of these > commits... > > ----- Original Message ----- > > > > commit 8473e700053f04fb72b083cfb12f38246dd60160 > > Author: Ken McDonell > > Date: Fri Nov 23 21:19:43 2012 +1100 > > > > pmie - %h/%v/%i tweaks, -d fixes > > > > Update the man page to be more precise about how the bindings for > > %h, %v and %i are made in rules. > > > > Some cosmetic code changes to improve comments. > > > > Several fixups for -d (debug mode) where the code was just wrong > > and had regressed as changes had been made over the years in > > other > > parts of pmie. > > > > [this is an interim commit, I expect there will be more to come] > > > > commit 4bb4f65cf5a277b0c2242748648a993a036482d3 > > Author: Ken McDonell > > Date: Fri Nov 23 21:17:42 2012 +1100 > > > > qa/514 - new - exercise pmie -d > > > > As part of the validation of the %h, %i and %v selectors in pmie > > rules. > > > > [85%] 514 - output mismatch (see 514.out.bad) > 798a799 > > DATE: (null) > 802a804 > > DATE: (null) > 806a809 > > DATE: (null) > 810a814 > > DATE: (null) > 814a819 > > DATE: (null) > 840c845 > < min_inst sample.part.bin :LOCALHOST > --- > > min_inst sample_part.bin :LOCALHOST > > > cheers. > > -- > Nathan From kenj@internode.on.net Mon Nov 26 04:31:21 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,J_CHICKENPOX_33, J_CHICKENPOX_43 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQAVL5p182798 for ; Mon, 26 Nov 2012 04:31:21 -0600 X-ASG-Debug-ID: 1353926014-04cbb035a416eef0001-S8gJnT Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id sqB1a47e27Fpsvej for ; Mon, 26 Nov 2012 02:33:34 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.143 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAI9Es1B20f8g/2dsb2JhbAANN4YouhCDOwSBBwImArRxcJIegSKML4IUgRMDlgGBHJIr Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail05.adl6.internode.on.net with ESMTP; 26 Nov 2012 21:03:33 +1030 Message-ID: <1353926081.3886.4.camel@bozo.localdomain> Subject: PCP python build failing on Fedora15 From: Ken McDonell X-ASG-Orig-Subj: PCP python build failing on Fedora15 To: pcp@oss.sgi.com Date: Mon, 26 Nov 2012 21:34:41 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail05.adl6.internode.on.net[150.101.137.143] X-Barracuda-Start-Time: 1353926014 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115302 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- I'm seeing this from Makepkgs RPM build errors: File not found: /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcp.pyo File not found: /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcpi.pyo and earlier in Logs/pcp for the python directory (in case this is part is odd) === python === python setup.py install --skip-build --root=${DIST_ROOT-/} --record=../../python-pcp.list running install running install_lib creating /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7 creating /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages copying build/lib.linux-x86_64-2.7/pmapi.so -> /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages copying build/lib.linux-x86_64-2.7/pcpi.py -> /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages copying build/lib.linux-x86_64-2.7/pcp.py -> /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages byte-compiling /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcpi.py to pcpi.pyc byte-compiling /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcp.py to pcp.pyc running install_egg_info Writing /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcp-0.2-py2.7.egg-info writing list of installed files to '../../python-pcp.list' /bin/gawk --posix '{print} /.pyc$/ {sub(/.pyc$/,".pyo"); print}' < ../../python-pcp.list > ../../python-pcp.list.rpm Any clues? From kenj@internode.on.net Mon Nov 26 14:15:52 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQKFq1Y222888 for ; Mon, 26 Nov 2012 14:15:52 -0600 X-ASG-Debug-ID: 1353961086-04cb6c7d7a1a4db0001-S8gJnT Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id 1FmvE9GcgvTRuAtt for ; Mon, 26 Nov 2012 12:18:06 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.143 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjcDAB3Os1B20f8g/2dsb2JhbAANN4YouHEEA4EagxEBAQEEI2YLGAICJgICV7UkcII9kDqBIowvghSBEwOWAZNH Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail05.adl6.internode.on.net with ESMTP; 27 Nov 2012 06:48:02 +1030 Message-ID: <1353961150.3886.5.camel@bozo.localdomain> Subject: Re: [pcp] PCP python build failing on Fedora15 From: Ken McDonell X-ASG-Orig-Subj: Re: [pcp] PCP python build failing on Fedora15 To: pcp@oss.sgi.com Date: Tue, 27 Nov 2012 07:19:10 +1100 In-Reply-To: <1353926081.3886.4.camel@bozo.localdomain> References: <1353926081.3886.4.camel@bozo.localdomain> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail05.adl6.internode.on.net[150.101.137.143] X-Barracuda-Start-Time: 1353961086 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115342 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Mon, 2012-11-26 at 21:34 +1100, Ken McDonell wrote: > I'm seeing this from Makepkgs > > RPM build errors: > File not > found: /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcp.pyo > File not > found: /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcpi.pyo Same problem on SuSE ... so this looks like an RPM-specific issue, not a Fedora-specific issue. From kenj@internode.on.net Mon Nov 26 14:22:29 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_63 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQKMTxR223301 for ; Mon, 26 Nov 2012 14:22:29 -0600 X-ASG-Debug-ID: 1353961483-04bdf005d31aee70001-S8gJnT Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id 370iZoV7dUu6e92V for ; Mon, 26 Nov 2012 12:24:43 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.143 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAA7Ps1B20f8g/2dsb2JhbAANN4YouhKDO1Y1AiYCX7UhcII9kDqBIo5DgRMDlgGTRw Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.100]) ([118.209.255.32]) by ipmail05.adl6.internode.on.net with ESMTP; 27 Nov 2012 06:54:43 +1030 Message-ID: <1353961551.3886.8.camel@bozo.localdomain> Subject: pcp-gui build failing From: Ken McDonell X-ASG-Orig-Subj: pcp-gui build failing To: Nathan Scott Cc: pcp@oss.sgi.com Date: Tue, 27 Nov 2012 07:25:51 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail05.adl6.internode.on.net[150.101.137.143] X-Barracuda-Start-Time: 1353961483 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115342 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Nathan, I am seeing this ... == dpkg-buildpackage: binary-arch cp: cannot stat `debian/pcp-gui/usr/share/doc/pcp-doc/html/pcpdoc.adp': No such file or directory dh_install: cp -a debian/pcp-gui/usr/share/doc/pcp-doc/html/pcpdoc.adp debian/pcp-doc//usr/share/doc/pcp-doc/html/ returned exit code 1 make: *** [binary-arch] Error 2 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 and the file in question is no where to be found ... kenj@bozo:~/src/pcp-gui-dev$ find . -name pcpdoc.adp kenj@bozo:~/src/pcp-gui-dev$ From pcp-announce-bounces@oss.sgi.com Mon Nov 26 16:18:10 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=ALL_TRUSTED,BAYES_20, J_CHICKENPOX_25 autolearn=no version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQMHW80235477 for ; Mon, 26 Nov 2012 16:17:32 -0600 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Subject: pcp-announce@oss.sgi.com mailing list reminder From: pcp-announce-bounces@oss.sgi.com To: pcp@oss.sgi.com X-No-Archive: yes Message-ID: Date: Mon, 26 Nov 2012 16:17:31 -0600 Precedence: bulk X-BeenThere: pcp-announce@oss.sgi.com X-Mailman-Version: 2.1.11 List-Id: pcp announcements X-List-Administrivia: yes Sender: pcp-announce-bounces@oss.sgi.com Errors-To: pcp-announce-bounces@oss.sgi.com You, or someone posing as you, has requested a password reminder for your membership on the mailing list pcp-announce@oss.sgi.com. You will need this password in order to change your membership options (e.g. do you want regular delivery or digest delivery), and having this password makes it easier for you to unsubscribe from the mailing list. You are subscribed with the address: pcp@oss.sgi.com Your pcp-announce password is: xE+IBctR To make changes to your membership options, log in and visit your options web page: http://oss.sgi.com/mailman/options/pcp-announce/pcp%40oss.sgi.com You can also make such changes via email by sending a message to: pcp-announce-request@oss.sgi.com with the text "help" in the subject or body. The automatic reply will contain more detailed instructions. Questions or comments? Please send them to the pcp-announce mailing list administrator at pcp-announce-owner@oss.sgi.com. From nscott@redhat.com Mon Nov 26 16:27:29 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,J_CHICKENPOX_47, J_CHICKENPOX_63 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQMRTod236268 for ; Mon, 26 Nov 2012 16:27:29 -0600 X-ASG-Debug-ID: 1353968984-04cbb035a61a90f0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id akGwIoEFeBwseC1r for ; Mon, 26 Nov 2012 14:29:44 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQMTe78014787; Mon, 26 Nov 2012 17:29:40 -0500 Date: Mon, 26 Nov 2012 17:29:40 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1802805894.33989058.1353968980825.JavaMail.root@redhat.com> In-Reply-To: <1353961551.3886.8.camel@bozo.localdomain> Subject: Re: pcp-gui build failing MIME-Version: 1.0 X-ASG-Orig-Subj: Re: pcp-gui build failing Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353968984 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115350 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > Nathan, > > I am seeing this ... > > == dpkg-buildpackage: binary-arch > cp: cannot stat > `debian/pcp-gui/usr/share/doc/pcp-doc/html/pcpdoc.adp': > No such file or directory > dh_install: cp -a > debian/pcp-gui/usr/share/doc/pcp-doc/html/pcpdoc.adp > debian/pcp-doc//usr/share/doc/pcp-doc/html/ returned exit code 1 > make: *** [binary-arch] Error 2 > dpkg-buildpackage: error: fakeroot debian/rules binary gave error > exit > status 2 > > and the file in question is no where to be found ... > > kenj@bozo:~/src/pcp-gui-dev$ find . -name pcpdoc.adp > kenj@bozo:~/src/pcp-gui-dev$ > There should be no reference to that file anymore ... probably a leftover Makefile snippet somewhere - will seek+destroy shortly. thanks. -- Nathan From nscott@redhat.com Mon Nov 26 16:37:26 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQMbPHo237049 for ; Mon, 26 Nov 2012 16:37:26 -0600 X-ASG-Debug-ID: 1353969580-04bdf005d31b9950001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id v7OrRh67LJhzCmsf for ; Mon, 26 Nov 2012 14:39:41 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQMddK4015977; Mon, 26 Nov 2012 17:39:39 -0500 Date: Mon, 26 Nov 2012 17:39:39 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <866278966.33993389.1353969579180.JavaMail.root@redhat.com> In-Reply-To: <1850552485.33992234.1353969274677.JavaMail.root@redhat.com> Subject: Makepkgs fallout MIME-Version: 1.0 X-ASG-Orig-Subj: Makepkgs fallout Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353969581 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115350 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Hi Ken, This commit is causing problems for RPM builds... libexecdir no longer points where it was intended. I don't follow the reason for the change though, since debian/rules already has a setting for libexecdir: git show f0bf4abe6b5ffff814c5f63105610efec622768d commit f0bf4abe6b5ffff814c5f63105610efec622768d Author: Ken McDonell Date: Tue Nov 20 07:00:39 2012 +1100 Makepkgs - explicitly set --libexecdir for configure For the non-RPM builds (especially the Debian-based ones) need to explicitly set --libexecdir=/usr/lib to retain historical path settings for pmlogger and friends in $PCP_BINADM_DIR diff --git a/Makepkgs b/Makepkgs index 51b35dd..15dbeb8 100755 --- a/Makepkgs +++ b/Makepkgs @@ -161,9 +161,9 @@ echo "== Building pcp, log is in $LOGF" if [ "$VERS" = MINGW ] then - configured="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --disable-ssp" + configured="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --disable-ssp" else - configured="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d" + configured="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d" fi grep libexecdir debian/rules configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-tmpdir=/var/lib/pcp/tmp I'm confused. Was the debian/rules setting somehow not being used? cheers. -- Nathan From mgoodwin@redhat.com Mon Nov 26 16:40:49 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQMenA1237242 for ; Mon, 26 Nov 2012 16:40:49 -0600 X-ASG-Debug-ID: 1353969784-04cb6c7d771b07c0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id b5vQ2hc0GLeALdOF for ; Mon, 26 Nov 2012 14:43:05 -0800 (PST) X-Barracuda-Envelope-From: mgoodwin@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAQMh2iB015011 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Nov 2012 17:43:02 -0500 Received: from fletch.usersys.redhat.com (vpn1-51-18.bne.redhat.com [10.64.51.18]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQMh0rL026404; Mon, 26 Nov 2012 17:43:01 -0500 Message-ID: <50B3F073.3040406@redhat.com> Date: Tue, 27 Nov 2012 09:42:59 +1100 From: Mark Goodwin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120605 Thunderbird/13.0 MIME-Version: 1.0 To: Ken McDonell CC: pcp@oss.sgi.com Subject: Re: [pcp] PCP python build failing on Fedora15 References: <1353926081.3886.4.camel@bozo.localdomain> <1353961150.3886.5.camel@bozo.localdomain> X-ASG-Orig-Subj: Re: [pcp] PCP python build failing on Fedora15 In-Reply-To: <1353961150.3886.5.camel@bozo.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1353969784 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com On 11/27/2012 07:19 AM, Ken McDonell wrote: > On Mon, 2012-11-26 at 21:34 +1100, Ken McDonell wrote: >> I'm seeing this from Makepkgs >> >> RPM build errors: >> File not >> found: /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcp.pyo >> File not >> found: /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcpi.pyo > > Same problem on SuSE ... so this looks like an RPM-specific issue, not a > Fedora-specific issue. Makepkgs top-of-tree build worked for me on my f15 system. Do you have python-2.7 installed? python-2.7.1-7.fc15.x86_64 python-devel-2.7.1-7.fc15.x86_64 python-libs-2.7.1-7.fc15.x86_64 maybe the rpm spec needs a version specific BuildRequires python-devel-2.7 or later? From nscott@redhat.com Mon Nov 26 16:51:27 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQMpQdd237835 for ; Mon, 26 Nov 2012 16:51:27 -0600 X-ASG-Debug-ID: 1353970421-04bdf005d31ba8b0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id F8LF5HdGF1fcovfj for ; Mon, 26 Nov 2012 14:53:41 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQMrbth030820; Mon, 26 Nov 2012 17:53:37 -0500 Date: Mon, 26 Nov 2012 17:53:37 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Mark Goodwin , Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <133492938.33997303.1353970417738.JavaMail.root@redhat.com> In-Reply-To: <50B3F073.3040406@redhat.com> Subject: Re: [pcp] PCP python build failing on Fedora15 MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] PCP python build failing on Fedora15 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353970421 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115352 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > On 11/27/2012 07:19 AM, Ken McDonell wrote: > > On Mon, 2012-11-26 at 21:34 +1100, Ken McDonell wrote: > >> I'm seeing this from Makepkgs > >> > >> RPM build errors: > >> File not > >> found: > >> /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcp.pyo > >> File not > >> found: > >> /home/kenj/src/pcp/BUILDROOT/pcp-3.6.11-1.x86_64/usr/lib64/python2.7/site-packages/pcpi.pyo > > > > Same problem on SuSE ... so this looks like an RPM-specific issue, > > not a Fedora-specific issue. > > Makepkgs top-of-tree build worked for me on my f15 system. Do you > have > python-2.7 installed? > IIRC, its rpm/rpmbuild that is/isnt generating those pyo files. There's some funky logic in the python build, for when rpm is driving the build, to keep track of these pyo files (refer to PYTHON_INSTALL in builddefs). This bit Chandana on RHEL4 too recently ... we don't really know yet which situations these .pyo's are generated/not (all/ most modern rpm setups seem to create them). May even be some specific python/rpm/rpmbuild combos that don't do it? Ugh. cheers. -- Nathan From nscott@redhat.com Mon Nov 26 17:31:45 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQNVjrk241098 for ; Mon, 26 Nov 2012 17:31:45 -0600 X-ASG-Debug-ID: 1353972840-04cbb035a61ae230001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id hp637DjifMlhENP9 for ; Mon, 26 Nov 2012 15:34:00 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAQNXvKS001768; Mon, 26 Nov 2012 18:33:57 -0500 Date: Mon, 26 Nov 2012 18:33:57 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1728227655.34005625.1353972837144.JavaMail.root@redhat.com> In-Reply-To: <866278966.33993389.1353969579180.JavaMail.root@redhat.com> Subject: Re: Makepkgs fallout MIME-Version: 1.0 X-ASG-Orig-Subj: Re: Makepkgs fallout Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353972840 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115354 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- BTW, I've reverted this change for now - we think it may be the cause of some confusing test results here. There's also some evidence that running tests from in a workarea (ie below qa/) is using pcp.conf from the build rather than the root. Which seems odd & unexpected to me, but I havent found the source of that yet. cheers. -- Nathan From junwang123@gmail.com Mon Nov 26 17:51:34 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: ** X-Spam-Status: No, score=2.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,T_TO_NO_BRKTS_FREEMAIL autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAQNpYok242632 for ; Mon, 26 Nov 2012 17:51:34 -0600 X-ASG-Debug-ID: 1353974027-04cbb035a51af2f0001-S8gJnT Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by cuda.sgi.com with ESMTP id gZ05P6XAUVLxbQDY (version=TLSv1 cipher=RC4-SHA bits=128 verify=NO) for ; Mon, 26 Nov 2012 15:53:48 -0800 (PST) X-Barracuda-Envelope-From: junwang123@gmail.com X-Barracuda-Apparent-Source-IP: 209.85.215.53 X-Barracuda-IPDD: Level1 [gmail.com/209.85.215.53] Received: by mail-la0-f53.google.com with SMTP id w12so9814829lag.26 for ; Mon, 26 Nov 2012 15:53:47 -0800 (PST) X-Barracuda-IPDD: Level1 [gmail.com/209.85.215.53] X-Barracuda-IPDD: Level1 [gmail.com/209.85.215.53] DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=jw+DH/KypzkWCiEia4mR0y94fLCsU9ikvJRFN0O+jCw=; b=CA8/b3SdtzGevXXGzjDC2vXqDXVSVyCAiujULayboA4s6qN6AzFwunstPNS5Nm6aHX ujACPGFntjS1DRnpQPsufYXRtTUyuHk3tUWzDqGwje78uIKTbCX/9jRpLqwLglSgWpj1 8dAf6l3pwSBOaCFqhop0wKIF3mPn32fd9lrZjPAmPNtrGfp2WrN24GnLI5Mf9u4jiRNC sFPnNVpQltT/1BYtSkMtrlYUR8ePNkDu0KeK60nVSVeR1y3Ju30dlKnyLpLIQ8hGq2v8 6BvNPwlrwpx67dd3C2kdBMeOYui1+WTdYzCG3fizZxzQ4fv4Kn4aWsSEEtSE/j+bYMIf oMyQ== MIME-Version: 1.0 Received: by 10.112.10.3 with SMTP id e3mr5890277lbb.33.1353974026989; Mon, 26 Nov 2012 15:53:46 -0800 (PST) Received: by 10.112.84.73 with HTTP; Mon, 26 Nov 2012 15:53:46 -0800 (PST) Date: Mon, 26 Nov 2012 15:53:46 -0800 Message-ID: Subject: pcp cluster support From: Jun Wang X-ASG-Orig-Subj: pcp cluster support To: pcp@oss.sgi.com Content-Type: multipart/alternative; boundary=e0cb4efe2f5ae9f03c04cf6ea462 X-Barracuda-Connect: mail-la0-f53.google.com[209.85.215.53] X-Barracuda-Start-Time: 1353974028 X-Barracuda-Encrypted: RC4-SHA X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=DKIM_SIGNED, DKIM_VERIFIED, HTML_MESSAGE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115356 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- -0.00 DKIM_VERIFIED Domain Keys Identified Mail: signature passes verification 0.00 DKIM_SIGNED Domain Keys Identified Mail: message has a signature 0.00 HTML_MESSAGE BODY: HTML included in message --e0cb4efe2f5ae9f03c04cf6ea462 Content-Type: text/plain; charset=UTF-8 Folks, I'm looking for a PCP package with cluster support for Linux systems. The following information is found with Google search, but there isn't a complete story. Can someone help? 1. Documents: There were two write-ups, not sure whether any of them got actually implemented or landed in any pcp-* rpm package. PCP Dynamic PMDA cluster proposal http://oss.sgi.com/archives/pcp/2010-06/msg00009.html PCP with Hadoop http://oss.sgi.com/archives/pcp/2011-01/msg00023.html http://oss.sgi.com/archives/pcp/2011-01/msg00028.html Open Sourced code: Did this land in any pcp-* release/package? http://oss.sgi.com/cgi-bin/gitweb.cgi?p=pcp/pcp-pmda-cluster.git;a=summary 2. There was an old user guide on PCP in cluster with SGI ACE, but pcp-pro/pcp-ace were obsoleted by pcp-sgi. Where can one find or buy pcp-sgi software/package? Does it support cluster functionality? http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=linux&db=bks&srch=sgi&fname=/SGI_Admin/LACE_AG/sgi_html/ch10.html There appears to be PCP cluster tools, such as clustervis(1), mpivis(1), and pmgcluster,what package provide those tools? There appears to be a PCP cluster domain in PMDNs, which version of pcp package supports it? http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi/linux/bks/SGI_Admin/books/ClusterMan_AG/sgi_html/ch05.html#Z1210619170tls Thanks, Jun --e0cb4efe2f5ae9f03c04cf6ea462 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Folks,

I'm looking for a PCP package with cluster support for Li= nux systems. The following information is found with Google search, but the= re isn't a complete story. Can someone help?

1. Documents:

There were two write-ups, not sure whether any of them got actually imp= lemented or landed in any pcp-* rpm package.

PCP Dynamic PMDA cluster proposal

Open Sourced code: Did this land in any pcp-* release/package?
http://oss.sgi= .com/cgi-bin/gitweb.cgi?p=3Dpcp/pcp-pmda-cluster.git;a=3Dsummary

2. There was an old user guide on PCP in cluster with SGI ACE, but pcp-= pro/pcp-ace were obsoleted by pcp-sgi. Where can one find or buy pcp-sgi so= ftware/package? Does it support cluster functionality?
http://techpubs.sg= i.com/library/tpl/cgi-bin/getdoc.cgi?coll=3Dlinux&db=3Dbks&srch=3Ds= gi&fname=3D/SGI_Admin/LACE_AG/sgi_html/ch10.html

There appears to be=C2=A0 PCP cluster tools, such as=C2=A0 clustervis(1),=C2=A0mpivis(1), and=C2=A0pmgcluster,= what package provide those tools?
There appears to be a PCP cluster domain in PMDNs, which version of pcp pac= kage supports it?
http://techpubs.sgi.com/library/tpl/cgi-bin/getdo= c.cgi/linux/bks/SGI_Admin/books/ClusterMan_AG/sgi_html/ch05.html#Z121061917= 0tls


Thanks,
Jun
--e0cb4efe2f5ae9f03c04cf6ea462-- From nscott@redhat.com Mon Nov 26 19:01:50 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAR11owQ247414 for ; Mon, 26 Nov 2012 19:01:50 -0600 X-ASG-Debug-ID: 1353978245-04bdf005d21c6760001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id ZBw90HZTOKCgXjLX for ; Mon, 26 Nov 2012 17:04:05 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAR142Xp026242; Mon, 26 Nov 2012 20:04:02 -0500 Date: Mon, 26 Nov 2012 20:04:02 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell , Dave Brolley Cc: pcp@oss.sgi.com Message-ID: <859718762.34023625.1353978242514.JavaMail.root@redhat.com> In-Reply-To: <1353924101.3886.2.camel@bozo.localdomain> Subject: Re: [pcp] pcp updates - assorted qa and pmie and Makepkgs MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] pcp updates - assorted qa and pmie and Makepkgs Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1353978245 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115360 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > Can you just ignore 514 for a while? > > It and the pmie changes are still in a bit of a state of flux. > Yep, no problem. Just FYI - looks like 191 is also affected. Meanwhile, looks like I've introduced several test regressions with the addition of more widespread -U option use in the PMDAs. I'm working through those now, will commit once fixed (today). cheers. -- Nathan From jhanson@sgi.com Mon Nov 26 21:24:07 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAR3O7fA258501 for ; Mon, 26 Nov 2012 21:24:07 -0600 Received: from xmail.sgi.com (pv-excas3-dc21-nlb.corp.sgi.com [137.38.102.207]) by relay1.corp.sgi.com (Postfix) with ESMTP id 3735E8F8039; Mon, 26 Nov 2012 19:26:20 -0800 (PST) Received: from carenath.corp.sgi.com (134.15.95.84) by xmail.sgi.com (137.38.102.30) with Microsoft SMTP Server (TLS) id 14.2.318.1; Mon, 26 Nov 2012 21:26:19 -0600 Message-ID: <50B432DB.7090801@sgi.com> Date: Mon, 26 Nov 2012 22:26:19 -0500 From: Jeff Hanson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.11) Gecko/20121116 Thunderbird/10.0.11 MIME-Version: 1.0 To: Jun Wang CC: Subject: Re: [pcp] pcp cluster support References: In-Reply-To: X-Enigmail-Version: 1.4 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [134.15.95.84] On 11/26/2012 06:53 PM, Jun Wang wrote: > Folks, > > I'm looking for a PCP package with cluster support for Linux systems. The following information is found with Google search, but there isn't a complete story. Can someone help? > What metrics do you want to collect? How do you want to analyze? > 1. Documents: > > There were two write-ups, not sure whether any of them got actually implemented or landed in any pcp-* rpm package. > > PCP Dynamic PMDA cluster proposal > http://oss.sgi.com/archives/pcp/2010-06/msg00009.html > > PCP with Hadoop > http://oss.sgi.com/archives/pcp/2011-01/msg00023.html > http://oss.sgi.com/archives/pcp/2011-01/msg00028.html > > Open Sourced code: Did this land in any pcp-* release/package? > http://oss.sgi.com/cgi-bin/gitweb.cgi?p=pcp/pcp-pmda-cluster.git;a=summary > > 2. There was an old user guide on PCP in cluster with SGI ACE, but pcp-pro/pcp-ace were obsoleted by pcp-sgi. Where can one find or buy pcp-sgi software/package? Does it support cluster functionality? > http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=linux&db=bks&srch=sgi&fname=/SGI_Admin/LACE_AG/sgi_html/ch10.html > > There appears to be PCP cluster tools, such as clustervis(1), mpivis(1), and pmgcluster,what package provide those tools? > There appears to be a PCP cluster domain in PMDNs, which version of pcp package supports it? > http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi/linux/bks/SGI_Admin/books/ClusterMan_AG/sgi_html/ch05.html#Z1210619170tls > The pmgadgets like pmgsys, pmgcluster, ... are still SGI closed source. SGI's pmda for clusters is open source but it is tied rather strongly to our ICE architecture. > > Thanks, > Jun > > > _______________________________________________ > pcp mailing list > pcp@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/pcp -- ----------------------------------------------------------------------- Jeff Hanson - jhanson@sgi.com - Field Technical Analyst You can choose a ready guide in some celestial voice. If you choose not to decide, you still have made a choice. You can choose from phantom fears and kindness that can kill; I will choose a path that's clear I will choose freewill. - Lee/Lifeson/Peart From nscott@redhat.com Mon Nov 26 22:14:41 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAR4EeXu262005 for ; Mon, 26 Nov 2012 22:14:41 -0600 X-ASG-Debug-ID: 1353989815-04bdf005d31d3bd0001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id SHz01QjYAEKogdy6 for ; Mon, 26 Nov 2012 20:16:55 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAR4GtjL019057 for ; Mon, 26 Nov 2012 23:16:55 -0500 Date: Mon, 26 Nov 2012 23:16:55 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <349386975.34083704.1353989815026.JavaMail.root@redhat.com> Subject: pcp updates: qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1353989815 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115372 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev Makepkgs | 4 ++-- man/man1/dbpmda.1 | 10 +++++++--- man/man1/pmcd.1 | 7 +++++++ qa/174 | 6 +++++- qa/191 | 3 +++ qa/213 | 8 ++++++-- qa/244 | 15 ++++++++++++--- qa/283 | 19 +++++++++++++++---- qa/285 | 9 +++++++-- qa/292 | 25 ++++++++++++++++++------- qa/342 | 6 +++++- qa/430 | 19 ++++++++----------- qa/509 | 7 ++++++- qa/514 | 2 ++ src/dbpmda/src/dbpmda.c | 37 ++++++++++++++++++------------------- 15 files changed, 121 insertions(+), 56 deletions(-) commit c549026e0791b5a4e92669333a128dc9472d9813 Author: Nathan Scott Date: Tue Nov 27 15:15:04 2012 +1100 Fix QA fallout from making __pmSetProcessIdentity exit(1) Previous to this change, a number of QA tests were passing because the user running QA was still able to exercise the dbpmda/pmcd/pmlogger_check code as themselves. This was as a result of __pmSetProcessIdentity being permissive of any failed attempt to change user (just logging a warning and continuing on, which was fine for QA). Now, we jump through hoops in order to either ensure these tests are started by a user with sufficient privileges that they can successfully change user, or to use the -U options to override the default preference of changing to the "pcp" user. commit 7accb95ea6e9506aeff3e47227bdc146c47b4829 Author: Nathan Scott Date: Tue Nov 27 15:08:26 2012 +1100 Document the -U options to pmcd and dbpmda commit 2b4e79de1634875f6e19ea5af53d6883e07bac2c Author: Nathan Scott Date: Tue Nov 27 15:08:07 2012 +1100 Add dbpmda -U option to mirror the equivalent pmcd functionality commit b154fb84396d5b2b61418dfad2d51582ef5d45df Author: Nathan Scott Date: Tue Nov 27 15:07:09 2012 +1100 Temporarily disable some pmie tests - currently under development commit cecf46d2683b38042dee06985c63f0d7f8f9059b Author: Nathan Scott Date: Tue Nov 27 10:16:16 2012 +1100 Revert "Makepkgs - explicitly set --libexecdir for configure" This reverts commit f0bf4abe6b5ffff814c5f63105610efec622768d. (breaks RPM builds and Debian builds already set --libexecdir) From john.hearns@mclaren.com Tue Nov 27 03:48:24 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: *** X-Spam-Status: No, score=3.8 required=5.0 tests=BAYES_50,HTML_MESSAGE, UNPARSEABLE_RELAY autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAR9mNec033370 for ; Tue, 27 Nov 2012 03:48:24 -0600 X-ASG-Debug-ID: 1354009838-04cbb035a51d8dc0001-S8gJnT Received: from mail1.bemta5.messagelabs.com (mail1.bemta5.messagelabs.com [195.245.231.130]) by cuda.sgi.com with ESMTP id HM0DQXTLjBuV8sLI for ; Tue, 27 Nov 2012 01:50:38 -0800 (PST) X-Barracuda-Envelope-From: john.hearns@mclaren.com X-Barracuda-Apparent-Source-IP: 195.245.231.130 Received: from [85.158.139.35:45628] by server-12.bemta-5.messagelabs.com id 05/BD-02886-EEC84B05; Tue, 27 Nov 2012 09:50:38 +0000 X-Env-Sender: john.hearns@mclaren.com X-Msg-Ref: server-4.tower-179.messagelabs.com!1354009837!29552155!1 X-Originating-IP: [195.130.210.135] X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19857 invoked from network); 27 Nov 2012 09:50:38 -0000 Received: from 195.130.210.135.mclaren.com (HELO mgsweep03.tagmclarengroup.com) (195.130.210.135) by server-4.tower-179.messagelabs.com with SMTP; 27 Nov 2012 09:50:38 -0000 Received: from MGL-PWEXCH02.mgl.tagmclarengroup.com (mgl-pwexch02.mgl.tagmclarengroup.com) by mgsweep03.tagmclarengroup.com (Clearswift SMTPRS 5.3.4) with ESMTP id for ; Tue, 27 Nov 2012 09:50:38 +0000 Received: from MGL-PWEXCH01.mgl.tagmclarengroup.com ([fe80::39a4:7314:9c0a:2bba]) by MGL-PWEXCH02.mgl.tagmclarengroup.com ([fe80::fc10:39c5:3375:eb33%18]) with mapi id 14.02.0318.001; Tue, 27 Nov 2012 09:51:09 +0000 From: "Hearns, John" To: "pcp@oss.sgi.com" Subject: RE: [pcp] pcp cluster support Thread-Topic: [pcp] pcp cluster support X-ASG-Orig-Subj: RE: [pcp] pcp cluster support Thread-Index: AQHNzDF0/y1a35IgfUmvfjmYksp4Qpf9b2eQ Date: Tue, 27 Nov 2012 09:51:08 +0000 Message-ID: <2791E54A864A8C4482B3F5F80EC59DF0087F5E@MGL-PWEXCH01.mgl.tagmclarengroup.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.1.142.10] Content-Type: multipart/alternative; boundary="_000_2791E54A864A8C4482B3F5F80EC59DF0087F5EMGLPWEXCH01mgltag_" MIME-Version: 1.0 X-Barracuda-Connect: mail1.bemta5.messagelabs.com[195.245.231.130] X-Barracuda-Start-Time: 1354009838 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.02 X-Barracuda-Spam-Status: No, SCORE=0.02 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=HTML_MESSAGE, THREAD_INDEX, THREAD_TOPIC, UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115396 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 THREAD_INDEX thread-index: AcO7Y8iR61tzADqsRmmc5wNiFHEOig== 0.01 THREAD_TOPIC Thread-Topic: ...(Japanese Subject)... 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 0.00 HTML_MESSAGE BODY: HTML included in message --_000_2791E54A864A8C4482B3F5F80EC59DF0087F5EMGLPWEXCH01mgltag_ Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 DQoyLiBUaGVyZSB3YXMgYW4gb2xkIHVzZXIgZ3VpZGUgb24gUENQIGluIGNsdXN0ZXIgd2l0aCBT R0kgQUNFLCBidXQgcGNwLXByby9wY3AtYWNlIHdlcmUgb2Jzb2xldGVkIGJ5IHBjcC1zZ2kuIFdo ZXJlIGNhbiBvbmUgZmluZCBvciBidXkgcGNwLXNnaSBzb2Z0d2FyZS9wYWNrYWdlPyBEb2VzIGl0 IHN1cHBvcnQgY2x1c3RlciBmdW5jdGlvbmFsaXR5Pw0KDQpUaGlzIGlzIHByb3ZpZGVkIGJ5IFNH SSwgYXMgcGFydCBvZiB3aGF0IHdhcyBjYWxsZWQgUHJvUGFjaywgbm93IGNhbGxlZCBQZXJmb3Jt YW5jZXN1aXRlIGlmIEnigJltIG5vdCB3cm9uZy4NCllvdSBjYW4gZ2V0IHRoaXMgZnJvbSBTR0ku DQoNCg0KDQpUaGVyZSBhcHBlYXJzIHRvIGJlICBQQ1AgY2x1c3RlciB0b29scywgc3VjaCBhcyAg Y2x1c3RlcnZpcygxKSwgbXBpdmlzKDEpLCBhbmQgcG1nY2x1c3Rlcix3aGF0IHBhY2thZ2UgcHJv dmlkZSB0aG9zZSB0b29scz8NCg0KVGhlc2UgYXJlIGluY2x1ZGVkIGluIHRoZSAgcGNwLXNnaSBS UE0NCg0KDQoNCg0KDQoNClRoZSBjb250ZW50cyBvZiB0aGlzIGVtYWlsIGFyZSBjb25maWRlbnRp YWwgYW5kIGZvciB0aGUgZXhjbHVzaXZlIHVzZSBvZiB0aGUgaW50ZW5kZWQgcmVjaXBpZW50LiAg SWYgeW91IHJlY2VpdmUgdGhpcyBlbWFpbCBpbiBlcnJvciB5b3Ugc2hvdWxkIG5vdCBjb3B5IGl0 LCByZXRyYW5zbWl0IGl0LCB1c2UgaXQgb3IgZGlzY2xvc2UgaXRzIGNvbnRlbnRzIGJ1dCBzaG91 bGQgcmV0dXJuIGl0IHRvIHRoZSBzZW5kZXIgaW1tZWRpYXRlbHkgYW5kIGRlbGV0ZSB5b3VyIGNv cHkuDQo= --_000_2791E54A864A8C4482B3F5F80EC59DF0087F5EMGLPWEXCH01mgltag_ Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: base64 PGh0bWwgeG1sbnM6dj0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp2bWwiIHhtbG5zOm89InVy bjpzY2hlbWFzLW1pY3Jvc29mdC1jb206b2ZmaWNlOm9mZmljZSIgeG1sbnM6dz0idXJuOnNjaGVt YXMtbWljcm9zb2Z0LWNvbTpvZmZpY2U6d29yZCIgeG1sbnM6bT0iaHR0cDovL3NjaGVtYXMubWlj cm9zb2Z0LmNvbS9vZmZpY2UvMjAwNC8xMi9vbW1sIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv VFIvUkVDLWh0bWw0MCI+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIg Y29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxtZXRhIG5hbWU9IkdlbmVyYXRv ciIgY29udGVudD0iTWljcm9zb2Z0IFdvcmQgMTIgKGZpbHRlcmVkIG1lZGl1bSkiPg0KPHN0eWxl PjwhLS0NCi8qIEZvbnQgRGVmaW5pdGlvbnMgKi8NCkBmb250LWZhY2UNCgl7Zm9udC1mYW1pbHk6 IkNhbWJyaWEgTWF0aCI7DQoJcGFub3NlLTE6MiA0IDUgMyA1IDQgNiAzIDIgNDt9DQpAZm9udC1m YWNlDQoJe2ZvbnQtZmFtaWx5OkNhbGlicmk7DQoJcGFub3NlLTE6MiAxNSA1IDIgMiAyIDQgMyAy IDQ7fQ0KQGZvbnQtZmFjZQ0KCXtmb250LWZhbWlseTpWZXJkYW5hOw0KCXBhbm9zZS0xOjIgMTEg NiA0IDMgNSA0IDQgMiA0O30NCi8qIFN0eWxlIERlZmluaXRpb25zICovDQpwLk1zb05vcm1hbCwg bGkuTXNvTm9ybWFsLCBkaXYuTXNvTm9ybWFsDQoJe21hcmdpbjowY207DQoJbWFyZ2luLWJvdHRv bTouMDAwMXB0Ow0KCWZvbnQtc2l6ZToxMi4wcHQ7DQoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS b21hbiIsInNlcmlmIjt9DQphOmxpbmssIHNwYW4uTXNvSHlwZXJsaW5rDQoJe21zby1zdHlsZS1w cmlvcml0eTo5OTsNCgljb2xvcjpibHVlOw0KCXRleHQtZGVjb3JhdGlvbjp1bmRlcmxpbmU7fQ0K YTp2aXNpdGVkLCBzcGFuLk1zb0h5cGVybGlua0ZvbGxvd2VkDQoJe21zby1zdHlsZS1wcmlvcml0 eTo5OTsNCgljb2xvcjpwdXJwbGU7DQoJdGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTt9DQp0dA0K CXttc28tc3R5bGUtcHJpb3JpdHk6OTk7DQoJZm9udC1mYW1pbHk6IkNvdXJpZXIgTmV3Ijt9DQpz cGFuLkVtYWlsU3R5bGUxOA0KCXttc28tc3R5bGUtdHlwZTpwZXJzb25hbC1yZXBseTsNCglmb250 LWZhbWlseToiQ2FsaWJyaSIsInNhbnMtc2VyaWYiOw0KCWNvbG9yOiMxRjQ5N0Q7fQ0KLk1zb0No cERlZmF1bHQNCgl7bXNvLXN0eWxlLXR5cGU6ZXhwb3J0LW9ubHk7fQ0KQHBhZ2UgV29yZFNlY3Rp b24xDQoJe3NpemU6NjEyLjBwdCA3OTIuMHB0Ow0KCW1hcmdpbjo3Mi4wcHQgNzIuMHB0IDcyLjBw dCA3Mi4wcHQ7fQ0KZGl2LldvcmRTZWN0aW9uMQ0KCXtwYWdlOldvcmRTZWN0aW9uMTt9DQotLT48 L3N0eWxlPjwhLS1baWYgZ3RlIG1zbyA5XT48eG1sPg0KPG86c2hhcGVkZWZhdWx0cyB2OmV4dD0i ZWRpdCIgc3BpZG1heD0iMTAyNiIgLz4NCjwveG1sPjwhW2VuZGlmXS0tPjwhLS1baWYgZ3RlIG1z byA5XT48eG1sPg0KPG86c2hhcGVsYXlvdXQgdjpleHQ9ImVkaXQiPg0KPG86aWRtYXAgdjpleHQ9 ImVkaXQiIGRhdGE9IjEiIC8+DQo8L286c2hhcGVsYXlvdXQ+PC94bWw+PCFbZW5kaWZdLS0+DQo8 L2hlYWQ+DQo8Ym9keSBsYW5nPSJFTi1HQiIgbGluaz0iYmx1ZSIgdmxpbms9InB1cnBsZSI+DQo8 ZGl2IGNsYXNzPSJXb3JkU2VjdGlvbjEiPg0KPGRpdj4NCjxkaXY+DQo8cCBjbGFzcz0iTXNvTm9y bWFsIiBzdHlsZT0iYmFja2dyb3VuZDp3aGl0ZSI+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMC4w cHQ7Zm9udC1mYW1pbHk6JnF1b3Q7QXJpYWwmcXVvdDssJnF1b3Q7c2Fucy1zZXJpZiZxdW90Oztj b2xvcjojMjIyMjIyIj48YnI+DQoyLiBUaGVyZSB3YXMgYW4gb2xkIHVzZXIgZ3VpZGUgb24gUENQ IGluIGNsdXN0ZXIgd2l0aCBTR0kgQUNFLCBidXQgcGNwLXByby9wY3AtYWNlIHdlcmUgb2Jzb2xl dGVkIGJ5IHBjcC1zZ2kuIFdoZXJlIGNhbiBvbmUgZmluZCBvciBidXkgcGNwLXNnaSBzb2Z0d2Fy ZS9wYWNrYWdlPyBEb2VzIGl0IHN1cHBvcnQgY2x1c3RlciBmdW5jdGlvbmFsaXR5Pw0KPG86cD48 L286cD48L3NwYW4+PC9wPg0KPC9kaXY+DQo8L2Rpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxz cGFuIHN0eWxlPSJjb2xvcjojMUY0OTdEIj48bzpwPiZuYnNwOzwvbzpwPjwvc3Bhbj48L3A+DQo8 cCBjbGFzcz0iTXNvTm9ybWFsIj48c3BhbiBzdHlsZT0iZm9udC1zaXplOjExLjBwdDtmb250LWZh bWlseTomcXVvdDtDYWxpYnJpJnF1b3Q7LCZxdW90O3NhbnMtc2VyaWYmcXVvdDs7Y29sb3I6IzFG NDk3RCI+VGhpcyBpcyBwcm92aWRlZCBieSBTR0ksIGFzIHBhcnQgb2Ygd2hhdCB3YXMgY2FsbGVk IFByb1BhY2ssIG5vdyBjYWxsZWQgUGVyZm9ybWFuY2VzdWl0ZSBpZiBJ4oCZbSBub3Qgd3Jvbmcu PG86cD48L286cD48L3NwYW4+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PHNwYW4gc3R5bGU9 ImZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6JnF1b3Q7Q2FsaWJyaSZxdW90OywmcXVvdDtz YW5zLXNlcmlmJnF1b3Q7O2NvbG9yOiMxRjQ5N0QiPllvdSBjYW4gZ2V0IHRoaXMgZnJvbSBTR0ku PG86cD48L286cD48L3NwYW4+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PHNwYW4gc3R5bGU9 ImZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6JnF1b3Q7Q2FsaWJyaSZxdW90OywmcXVvdDtz YW5zLXNlcmlmJnF1b3Q7O2NvbG9yOiMxRjQ5N0QiPjxvOnA+Jm5ic3A7PC9vOnA+PC9zcGFuPjwv cD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTEuMHB0O2Zv bnQtZmFtaWx5OiZxdW90O0NhbGlicmkmcXVvdDssJnF1b3Q7c2Fucy1zZXJpZiZxdW90Oztjb2xv cjojMUY0OTdEIj48bzpwPiZuYnNwOzwvbzpwPjwvc3Bhbj48L3A+DQo8cCBjbGFzcz0iTXNvTm9y bWFsIj48c3BhbiBzdHlsZT0iZm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseTomcXVvdDtDYWxp YnJpJnF1b3Q7LCZxdW90O3NhbnMtc2VyaWYmcXVvdDs7Y29sb3I6IzFGNDk3RCI+PG86cD4mbmJz cDs8L286cD48L3NwYW4+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+VGhlcmUgYXBwZWFycyB0 byBiZSZuYnNwOyBQQ1AgY2x1c3RlciB0b29scywgc3VjaCBhcyZuYnNwOyA8dHQ+PHNwYW4gc3R5 bGU9ImZvbnQtc2l6ZToxMC4wcHQiPmNsdXN0ZXJ2aXMoMSk8L3NwYW4+PC90dD48c3BhbiBzdHls ZT0iZm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseTomcXVvdDtWZXJkYW5hJnF1b3Q7LCZxdW90 O3NhbnMtc2VyaWYmcXVvdDsiPiwmbmJzcDs8L3NwYW4+PHR0PjxzcGFuIHN0eWxlPSJmb250LXNp emU6MTAuMHB0Ij5tcGl2aXMoMSk8L3NwYW4+PC90dD48c3BhbiBzdHlsZT0iZm9udC1zaXplOjEw LjBwdDtmb250LWZhbWlseTomcXVvdDtWZXJkYW5hJnF1b3Q7LCZxdW90O3NhbnMtc2VyaWYmcXVv dDsiPiwNCiBhbmQmbmJzcDs8L3NwYW4+PHR0PjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTAuMHB0 Ij5wbWdjbHVzdGVyLHdoYXQgcGFja2FnZSBwcm92aWRlIHRob3NlIHRvb2xzPzwvc3Bhbj48L3R0 Pjxicj4NCjxicj4NCjxzcGFuIHN0eWxlPSJjb2xvcjojMUY0OTdEIj48bzpwPjwvbzpwPjwvc3Bh bj48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48c3BhbiBzdHlsZT0iZm9udC1zaXplOjExLjBw dDtmb250LWZhbWlseTomcXVvdDtDYWxpYnJpJnF1b3Q7LCZxdW90O3NhbnMtc2VyaWYmcXVvdDs7 Y29sb3I6IzFGNDk3RCI+VGhlc2UgYXJlIGluY2x1ZGVkIGluIHRoZSAmbmJzcDtwY3Atc2dpIFJQ TTxvOnA+PC9vOnA+PC9zcGFuPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxzcGFuIHN0eWxl PSJmb250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiZxdW90O0NhbGlicmkmcXVvdDssJnF1b3Q7 c2Fucy1zZXJpZiZxdW90Oztjb2xvcjojMUY0OTdEIj48bzpwPiZuYnNwOzwvbzpwPjwvc3Bhbj48 L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48c3BhbiBzdHlsZT0iZm9udC1zaXplOjExLjBwdDtm b250LWZhbWlseTomcXVvdDtDYWxpYnJpJnF1b3Q7LCZxdW90O3NhbnMtc2VyaWYmcXVvdDs7Y29s b3I6IzFGNDk3RCI+PG86cD4mbmJzcDs8L286cD48L3NwYW4+PC9wPg0KPHAgY2xhc3M9Ik1zb05v cm1hbCI+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6JnF1b3Q7Q2Fs aWJyaSZxdW90OywmcXVvdDtzYW5zLXNlcmlmJnF1b3Q7O2NvbG9yOiMxRjQ5N0QiPjxvOnA+Jm5i c3A7PC9vOnA+PC9zcGFuPjwvcD4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxicj4NCjxicj4NCjxv OnA+PC9vOnA+PC9wPg0KPC9kaXY+DQoNCjxwPjxzcGFuIHN0eWxlPSJmb250LWZhbWlseTonQXJp YWwnO2ZvbnQtc2l6ZTo4cHQ7Ij5UaGUgY29udGVudHMgb2YgdGhpcyBlbWFpbCBhcmUgY29uZmlk ZW50aWFsIGFuZCBmb3IgdGhlIGV4Y2x1c2l2ZSB1c2Ugb2YgdGhlIGludGVuZGVkIHJlY2lwaWVu dC4gIElmIHlvdSByZWNlaXZlIHRoaXMgZW1haWwgaW4gZXJyb3IgeW91IHNob3VsZCBub3QgY29w eSBpdCwgcmV0cmFuc21pdCBpdCwgdXNlIGl0IG9yIGRpc2Nsb3NlIGl0cyBjb250ZW50cyBidXQg c2hvdWxkIHJldHVybiBpdCB0byB0aGUgc2VuZGVyIGltbWVkaWF0ZWx5IGFuZCBkZWxldGUgeW91 ciBjb3B5Ljwvc3Bhbj48L3A+PC9ib2R5Pg0KPC9odG1sPg0K --_000_2791E54A864A8C4482B3F5F80EC59DF0087F5EMGLPWEXCH01mgltag_-- From wwwrun@oss.sgi.com Tue Nov 27 08:53:13 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qARErDAS056203 for ; Tue, 27 Nov 2012 08:53:13 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qARErD5s056202; Tue, 27 Nov 2012 08:53:13 -0600 Date: Tue, 27 Nov 2012 08:53:13 -0600 From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 934] New: drop make src-lnk-pcp etc. mechanism to create source tarball X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: fche@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: mort@sgi.com X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: Message-ID: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=934 Summary: drop make src-lnk-pcp etc. mechanism to create source tarball Product: pcp Version: unspecified Platform: All OS/Version: Linux Status: NEW Severity: major Priority: P5 Component: pcp AssignedTo: mort@sgi.com ReportedBy: fche@redhat.com CC: pcp@oss.sgi.com Estimated Hours: 0.0 Classification: Unclassified Makepkgs should use "git archive" instead of a dummy-configured build tree's make src-link-pcp etc. to create the tarball. It should endavour not to modify the source tree at all. (Even the build/rpm/pcp.spec.in need not be expanded by running configure; it could be simplified to hard-code things like package-name ("pcp"), and the leftovers could be hand-substituted by Makepkgs.) -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From wwwrun@oss.sgi.com Tue Nov 27 09:31:55 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qARFVtOl058962 for ; Tue, 27 Nov 2012 09:31:55 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qARFVtMb058961; Tue, 27 Nov 2012 09:31:55 -0600 Date: Tue, 27 Nov 2012 09:31:55 -0600 Message-Id: <201211271531.qARFVtMb058961@oss.sgi.com> From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 934] drop make src-lnk-pcp etc. mechanism to create source tarball X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: fche@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: mort@sgi.com X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: In-Reply-To: References: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=934 --- Comment #1 from Frank Ch. Eigler 2012-11-27 09:31:55 CST --- (The pack_pcp target should also go away as a part of this.) -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From wwwrun@oss.sgi.com Tue Nov 27 18:08:08 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from oss.sgi.com (localhost [127.0.0.1]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAS088hP113315 for ; Tue, 27 Nov 2012 18:08:08 -0600 Received: (from wwwrun@localhost) by oss.sgi.com (8.14.3/8.14.3/Submit) id qAS088bI113314; Tue, 27 Nov 2012 18:08:08 -0600 Date: Tue, 27 Nov 2012 18:08:08 -0600 Message-Id: <201211280008.qAS088bI113314@oss.sgi.com> From: bugzilla-daemon@oss.sgi.com To: pcp@oss.sgi.com Subject: [Bug 934] drop make src-lnk-pcp etc. mechanism to create source tarball X-Bugzilla-Reason: CC X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Classification: Unclassified X-Bugzilla-Product: pcp X-Bugzilla-Component: pcp X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: mgoodwin@redhat.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P5 X-Bugzilla-Assigned-To: mort@sgi.com X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: CC In-Reply-To: References: Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 http://oss.sgi.com/bugzilla/show_bug.cgi?id=934 Mark Goodwin changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mgoodwin@redhat.com --- Comment #2 from Mark Goodwin 2012-11-27 18:08:07 CST --- (In reply to comment #1) > (The pack_pcp target should also go away as a part of this.) ... and the build runs considerably faster too. git-archive honours .gitignore and seems to do exactly what we need. Frank, did you already make a start on this or will I take it? Also, do we anticipate any issues with an additional BuildRequires: git (I assume not, since we're now pretty entrenched with git as the scs). -- Mark -- Configure bugmail: http://oss.sgi.com/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From kenj@internode.on.net Tue Nov 27 18:56:03 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAS0u3qM117256 for ; Tue, 27 Nov 2012 18:56:03 -0600 X-ASG-Debug-ID: 1354064297-04bdf005d322f190001-S8gJnT Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id 17uonIGjOe6LOfUy for ; Tue, 27 Nov 2012 16:58:17 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.141 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqYnAAFhtVABmqVhPGdsb2JhbAANOIYphDq1VQMBAQEBOIJSAQEBBCNWEAsNCwICJgICQxQGtDBwkmSBIo5GgRMDnA6NOw Received: from unknown (HELO [10.96.12.66]) ([1.154.165.97]) by ipmail04.adl6.internode.on.net with ESMTP; 28 Nov 2012 11:28:17 +1030 Message-ID: <1354064294.28451.16.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout From: Ken McDonell X-ASG-Orig-Subj: Re: Makepkgs fallout To: Nathan Scott Cc: pcp@oss.sgi.com Date: Wed, 28 Nov 2012 11:58:14 +1100 In-Reply-To: <1728227655.34005625.1353972837144.JavaMail.root@redhat.com> References: <1728227655.34005625.1353972837144.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail04.adl6.internode.on.net[150.101.137.141] X-Barracuda-Start-Time: 1354064297 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115456 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Mon, 2012-11-26 at 18:33 -0500, Nathan Scott wrote: > BTW, I've reverted this change for now - we think it may be the > cause of some confusing test results here. There's also some > evidence that running tests from in a workarea (ie below qa/) > is using pcp.conf from the build rather than the root. Which > seems odd & unexpected to me, but I havent found the source of > that yet. I don't see how the Makepkgs change can be breaking things for QA. I do think we have a big problem associated with moving QA into the PCP tree, namely that we descend into qa and qa/src _both_ in the build and when running QA from a workarea (the latter being a non-negotiable requirement IMHO for on-going QA maintenance and development). In one case (the build) you _want_ to use include files and pcp.conf from ../src/include ... in the other case (running QA) you _want_ to use the installed versions of the include files and pcp.conf (from a packages build). Seems like we need to back QA out the PCP tree _or_ find some clever way of making the makefiles schizophrenic. From nscott@redhat.com Tue Nov 27 21:30:58 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00,URIBL_RHS_DOB autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAS3Uwuu128214 for ; Tue, 27 Nov 2012 21:30:58 -0600 X-ASG-Debug-ID: 1354073592-04cb6c7d7a22f7e0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id Im1Z8bnBOCTVHz7F for ; Tue, 27 Nov 2012 19:33:13 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAS3XCnP013381 for ; Tue, 27 Nov 2012 22:33:12 -0500 Date: Tue, 27 Nov 2012 22:33:12 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <216532629.34739275.1354073592447.JavaMail.root@redhat.com> Subject: pcp updates: qa, init scripts MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa, init scripts Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1354073593 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115466 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/115 | 18 ------------------ qa/115.out | 2 ++ qa/381 | 12 ++++-------- qa/504 | 14 -------------- qa/575 | 18 ++++++++++++------ qa/575.out | 1 + qa/622 | 12 +++++++++--- qa/common.config | 9 +++++++-- qa/common.filter | 26 ++++++++++++++++++++++++++ src/pmie/rc_pmie | 30 +++++++++++++++++++++--------- src/pmlogger/rc_pmlogger | 26 +++++++++++++++++--------- 11 files changed, 99 insertions(+), 69 deletions(-) commit 26129ab3fc91a77aefa3c2807c2b49dec4631036 Author: Nathan Scott Date: Wed Nov 28 14:30:31 2012 +1100 Fix race conditions in pmie and pmlogger startup scripts Recent changes to tempfile handling has regressed the pmie and pmlogger startup scripts. Errors of the form: /etc/rc.d/init.d/pmlogger: line 100: /var/tmp/pcp.5vfQsSHKo/pmcheck: No such file or directory are now produced. Because sections of these two scripts are run in parallel with the original script, we are open to race conditions where the main script exits and removes the temporary directory before the co-process has an opportunity to create its temporary file. We can resolve this using separate temporary dirs and trap handling which thus no longer race. Worse still, QA failed to detect the problem. At least one test that should have found the problem trivially (575) failed to, as a result of aggressively discarding stderr and stdout instead of using filtering. This has been rectified and common pmie filter routines abstracted (from tests 115, 504 and 575) to simplify the task for all current and future tests. commit 5a973fe036eccbe0683f4445cc8c3ca056d6a9c9 Author: Nathan Scott Date: Wed Nov 28 14:14:06 2012 +1100 Test 381 needs to check the remote host has pmdasample commit dce7241598ab02a672aff35520a7c551fc326a85 Author: Nathan Scott Date: Wed Nov 28 14:13:05 2012 +1100 Remove a couple of accidental QA test/config changes commit 803a18eebbb8607670801bd597276ca8056d5d86 Author: Nathan Scott Date: Wed Nov 28 09:39:59 2012 +1100 Add my local test domain into the qa mix From nscott@redhat.com Wed Nov 28 00:07:34 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAS67YSf139114 for ; Wed, 28 Nov 2012 00:07:34 -0600 X-ASG-Debug-ID: 1354082990-04cbb035a5235b30001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id rweHtqseknGY7FGt for ; Tue, 27 Nov 2012 22:09:51 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAS69k6g003661; Wed, 28 Nov 2012 01:09:47 -0500 Date: Wed, 28 Nov 2012 01:09:46 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1897726209.34780775.1354082986838.JavaMail.root@redhat.com> In-Reply-To: <1354064294.28451.16.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout MIME-Version: 1.0 X-ASG-Orig-Subj: Re: Makepkgs fallout Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1354082990 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115475 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Hi Ken, ----- Original Message ----- > On Mon, 2012-11-26 at 18:33 -0500, Nathan Scott wrote: > > BTW, I've reverted this change for now - we think it may be the > > cause of some confusing test results here. There's also some > > evidence that running tests from in a workarea (ie below qa/) > > is using pcp.conf from the build rather than the root. Which > > seems odd & unexpected to me, but I havent found the source of > > that yet. > > I don't see how the Makepkgs change can be breaking things for QA. > "confusing test results" != "breaking QA". I don't really fully understand what happened (didn't happen to me & it was difficult to debug remotely). > I do think we have a big problem associated with moving QA into the > PCP > tree, namely that we descend into qa and qa/src _both_ in the build > and > when running QA from a workarea (the latter being a non-negotiable > requirement IMHO for on-going QA maintenance and development). *nod* to the last bit, unconvinced there's a big problem related to QA-in-tree though. Also overlooks the good aspects of keeping fixes with their associated QA test updates, and the way that all builds now must have a successful QA build too. Let me distract you ;) by saying there is more of a problem around not needing any mechanism for conditional code building in qa/src/. e.g. qa/src/unpack.c uses pmEventRecord, which is post-3.5.0 only. This should be a problem no matter where qa lives - yet noone reports it, making me wonder just how important all the back-compat goop we keep in the QA tests really is? Once there, that goop has a non-zero maintenance cost, yet after a relatively short time, it seems to be unnecessary baggage. A possible approach would be to invent a mechanism for using PCP_VER in the source makefile too (?) and having a policy of culling compat macros after N new releases have been made. > In one case (the build) you _want_ to use include files and pcp.conf > from ../src/include ... in the other case (running QA) you _want_ to > use > the installed versions of the include files and pcp.conf (from a > packages build). This is the same issue that several PMDAs have (with the GNUmakefile and GNUmakefile.install split) ... > Seems like we need to back QA out the PCP tree _or_ find some clever > way of making the makefiles schizophrenic. That is how the QA source makefiles operate (schizo - using the usual split between GNUmakefile and GNUmakefile.install that we do elsewhere and a GNUlocaldefs for all the common/shared make goop). cheers. ps: lets also not forget there was a problem that the change I had to backout was fixing ... not clear to me what that was, still, esp how it related to the deb packaging that already had the configure flag. -- Nathan From brolley@redhat.com Wed Nov 28 08:56:17 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: ** X-Spam-Status: No, score=2.1 required=5.0 tests=BAYES_00,HTML_MESSAGE, SUBJ_FORWARDED autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASEuHuI187268 for ; Wed, 28 Nov 2012 08:56:17 -0600 X-ASG-Debug-ID: 1354114714-04cbb035a6254910001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id YTrMa2TnlMN2EQn2 for ; Wed, 28 Nov 2012 06:58:34 -0800 (PST) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qASEwXVL019115 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Nov 2012 09:58:34 -0500 Received: from [10.11.10.13] (vpn-10-13.rdu.redhat.com [10.11.10.13]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qASEwWEE026868 for ; Wed, 28 Nov 2012 09:58:33 -0500 Message-ID: <50B62698.4080501@redhat.com> Date: Wed, 28 Nov 2012 09:58:32 -0500 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: pcp@oss.sgi.com Subject: Fwd: NSS/NSPR Testing Status References: <50B54199.3070709@rogers.com> X-ASG-Orig-Subj: Fwd: NSS/NSPR Testing Status In-Reply-To: <50B54199.3070709@rogers.com> X-Forwarded-Message-Id: <50B54199.3070709@rogers.com> Content-Type: multipart/alternative; boundary="------------010307070804020601060801" X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1354114714 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com This is a multi-part message in MIME format. --------------010307070804020601060801 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Nathan has rightly pointed out that I should have sent this to the list .... Dave -------- Original Message -------- Subject: NSS/NSPR Testing Status Date: Tue, 27 Nov 2012 17:41:29 -0500 From: Dave Brolley To: Nathan Scott CC: Frank Eigler Hi Nathan, As of commit e110b05e44b0678d9ba632ab5896ccc7e50c3cf6 (pcpfans brolley/nssmerge), I am down to two differences in the qa test results when running with NSS/NSPR enabled as opposed to without. They are: 387 -- pmnsunload: memory leak in NSPR found by valgrind As we have discussed, this is memory being allocated by PR_Socket (from within __pmCreateSocket). It is memory within NSPR's file descriptor cache which is used by NSPR to recycle old file descriptors. This would likely be solved by a call to PR_Cleanup, but the question is, from where? We call PR_Init from within __pmCreateSocket, as needed (modern versions of NSPR are self initializing on the first API call). Any program which calls __pmCreateSocket would need to eventually call PR_Cleanup before exiting in order to be leak-free, according to valgrind. It may be a bit pedantic to explicitly clean up just before exiting, but we could provide a __pmCleanup function which programs could call before exiting. With NSS/NSPR enabled, it would call PR_Cleanup and it would do nothing otherwise. I supposed there is the possibility that libpcp could need a cleanup function for non-NSS/NSPR purposes someday. 578 -- test harness expects monotonically increasing fd numbers The openfds metric of pmcd is a bit misleading. It implies the number of currently open file descriptors, but it is reported based on the value of pmcd_hi_openfds (src/pmcd/src/pmcd.h) which is actually a high water mark of the highest ever open fd number. It is perhaps coincidentally true that native fd numbers are monotonically increasing and that, after installation, the number of open file descriptors is also the number of the highest fd number as the test expects. However, with NSS/NSPR enabled, while the native fd numbers are still in the range 0-1023, the NSPR ones are in the range 1024-2047 and so this assumption is no longer true. I'm thinking that we should fix the metric to actually count the number of open fds (in the IPC table?). Can you see another solution? Dave --------------010307070804020601060801 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Nathan has rightly pointed out that I should have sent this to the list ....

Dave

-------- Original Message --------
Subject: NSS/NSPR Testing Status
Date: Tue, 27 Nov 2012 17:41:29 -0500
From: Dave Brolley <dave.brolley@rogers.com>
To: Nathan Scott <nathans@redhat.com>
CC: Frank Eigler <fche@redhat.com> 


Hi Nathan,

As of commit e110b05e44b0678d9ba632ab5896ccc7e50c3cf6 (pcpfans 
brolley/nssmerge), I am down to two differences in the qa test results 
when running with NSS/NSPR enabled as opposed to without.

They are:

387 -- pmnsunload: memory leak in NSPR found by valgrind

As we have discussed, this is memory being allocated by PR_Socket (from 
within __pmCreateSocket). It is memory within NSPR's file descriptor 
cache which is used by NSPR to recycle old file descriptors. This would 
likely be solved by a call to PR_Cleanup, but the question is,  from 
where? We call PR_Init from within __pmCreateSocket, as needed (modern 
versions of NSPR are self initializing on the first API call). Any 
program which calls __pmCreateSocket would need to eventually call 
PR_Cleanup before exiting in order to be leak-free, according to 
valgrind. It may be a bit pedantic to explicitly clean up just before 
exiting, but we could provide a __pmCleanup function which programs 
could call before exiting. With NSS/NSPR enabled, it would call 
PR_Cleanup and it would do nothing otherwise. I supposed there is the 
possibility that libpcp could need a cleanup function for non-NSS/NSPR 
purposes someday.

578 -- test harness expects monotonically increasing fd numbers

The openfds metric of pmcd is a bit misleading. It implies the number of 
currently open file descriptors, but it is reported based on the value 
of pmcd_hi_openfds (src/pmcd/src/pmcd.h) which is actually a high water 
mark of the highest ever open fd number. It is perhaps coincidentally 
true that native fd numbers are monotonically increasing and that, after 
installation, the number of open file descriptors is also the number of 
the highest fd number as the test expects. However, with NSS/NSPR 
enabled, while the native fd numbers are still in the range 0-1023, the 
NSPR ones are in the range 1024-2047 and so this assumption is no longer 
true.

I'm thinking that we should fix the metric to actually count the number 
of open fds (in the IPC table?). Can you see another solution?

Dave


--------------010307070804020601060801-- From fche@redhat.com Wed Nov 28 13:25:06 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASJP6Fk203976 for ; Wed, 28 Nov 2012 13:25:06 -0600 X-ASG-Debug-ID: 1354130843-04bdf059fa02cc0001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id W5VJgCxeA5EDBvVq for ; Wed, 28 Nov 2012 11:27:23 -0800 (PST) X-Barracuda-Envelope-From: fche@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qASJRKiN032028 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 Nov 2012 14:27:20 -0500 Received: from fche.csb (vpn-8-35.rdu.redhat.com [10.11.8.35]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qASJRJab013437; Wed, 28 Nov 2012 14:27:20 -0500 Received: by fche.csb (Postfix, from userid 2569) id 1F78F5815C; Wed, 28 Nov 2012 14:27:19 -0500 (EST) To: Ken McDonell Cc: Nathan Scott , pcp@oss.sgi.com Subject: Re: Makepkgs fallout References: <1728227655.34005625.1353972837144.JavaMail.root@redhat.com> <1354064294.28451.16.camel@bozo-laptop.localdomain> X-ASG-Orig-Subj: Re: Makepkgs fallout From: fche@redhat.com (Frank Ch. Eigler) Date: Wed, 28 Nov 2012 14:27:18 -0500 In-Reply-To: <1354064294.28451.16.camel@bozo-laptop.localdomain> (Ken McDonell's message of "Wed, 28 Nov 2012 11:58:14 +1100") Message-ID: User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1354130843 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com Ken McDonell writes: > I don't see how the Makepkgs change can be breaking things for QA. > [...] I believe the problem arose from the Makepkgs run building an RPM with a different --libexecdir than the src tree left over after Makepkgs' own invocation of ../configure. The RPM and the src/include files did not match in terms of pcp.conf etc. So when qa scripts started running, intended to target the installed RPMs, they instead pulled in the src/include stuff, and materialized the conflict into errors. > I do think we have a big problem associated with moving QA into the PCP > tree, namely that we descend into qa and qa/src _both_ in the build and > when running QA from a workarea (the latter being a non-negotiable > requirement IMHO for on-going QA maintenance and development). > > Seems like we need to back QA out the PCP tree _or_ find some clever way > of making the makefiles schizophrenic. I think this is a special case of not fully supporting --prefix yet in our development workflow. If we get a % configure --prefix=/developer/tree ; make ; make install installation working as the main way to do development, and then have the qa testsuite, configured with the same prefix, should be able to run against the --prefix tree. Then testing the installed system version is just a special case, of --prefix=/usr --FOODIR=/bar etc, as per Makepkgs. The benefit is that there'd be no need to run pcpqa directly against the build accidentally left behind in the source tree. - FChE From kenj@internode.on.net Wed Nov 28 14:10:29 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASKATq2207430 for ; Wed, 28 Nov 2012 14:10:29 -0600 X-ASG-Debug-ID: 1354133565-04cbb0642106a40001-S8gJnT Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id CWeJ8rmmPQ4n4ebV for ; Wed, 28 Nov 2012 12:12:45 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.141 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBAP1utlB20f8g/2dsb2JhbAANOIYqug6DEQEBAQMBI1YFCwsaAiYCAlcGiB2rM3CSfIEiiziDE4ETA6lLgVg Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.101]) ([118.209.255.32]) by ipmail04.adl6.internode.on.net with ESMTP; 29 Nov 2012 06:42:43 +1030 Message-ID: <1354133548.1662.12.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout From: Ken McDonell X-ASG-Orig-Subj: Re: Makepkgs fallout To: Nathan Scott Cc: pcp@oss.sgi.com Date: Thu, 29 Nov 2012 07:12:28 +1100 In-Reply-To: <1897726209.34780775.1354082986838.JavaMail.root@redhat.com> References: <1897726209.34780775.1354082986838.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail04.adl6.internode.on.net[150.101.137.141] X-Barracuda-Start-Time: 1354133565 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115531 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Nathan, On Wed, 2012-11-28 at 01:09 -0500, Nathan Scott wrote: > > I do think we have a big problem associated with moving QA into the > > PCP > > tree, namely that we descend into qa and qa/src _both_ in the build > > and > > when running QA from a workarea (the latter being a non-negotiable > > requirement IMHO for on-going QA maintenance and development). > > *nod* to the last bit, unconvinced there's a big problem related to > QA-in-tree though. Also overlooks the good aspects of keeping fixes > with their associated QA test updates, and the way that all builds > now must have a successful QA build too. I don't think we have a major disagreement here. > Let me distract you ;) by saying there is more of a problem around > not needing any mechanism for conditional code building in qa/src/. > e.g. qa/src/unpack.c uses pmEventRecord, which is post-3.5.0 only. > This should be a problem no matter where qa lives ... I believe the problem is that I failed to build/design unpack.c properly ... if I'd done a better job here, you would not have had the anguish you had. > - yet noone reports > it, ... I did not report it because I just worked around it with an out of tree script that remade the binary if I was unsure if the library/headers and QA binary were not consistent ... 8^(> > making me wonder just how important all the back-compat goop we > keep in the QA tests really is? Once there, that goop has a non-zero > maintenance cost, yet after a relatively short time, it seems to be > unnecessary baggage. > > A possible approach would be to invent a mechanism for using PCP_VER > in the source makefile too (?) and having a policy of culling compat > macros after N new releases have been made. I would support this approach, although I am not sure how we'd enforce the annotation in the first place. Is this the sort of thing you had in mind? #include #include #include "./localconfig.h" int main() { #if PCP_VER < 3611 printf("nothing to do\n"); #elif PCP_VER >= 3611 printf("first attempt in 3.6.11\n"); #else printf("really working in 3.6.12 and later\n"); #endif // stuff exit(0); } > > In one case (the build) you _want_ to use include files and pcp.conf > > from ../src/include ... in the other case (running QA) you _want_ to > > use > > the installed versions of the include files and pcp.conf (from a > > packages build). > > This is the same issue that several PMDAs have (with the GNUmakefile > and GNUmakefile.install split) ... I don't agree ... this is not a GNUmakefile vs GNUmakefile.install issue. The build does make which ends up descending into qa and qa/src When running QA I want to cd qa ./check something which runs make in the qa and qa/src directories ... we need "make" to be including different builddefs in the two cases because divergence in the arguments passed to configure between the individual package build recipes and Makepkgs means that the installed builddefs may not be the same as the one in the workarea ... which is what my patch was trying to address. [more on the topic in my response to Frank's later mail] From kenj@internode.on.net Wed Nov 28 14:22:05 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASKM5lt208164 for ; Wed, 28 Nov 2012 14:22:05 -0600 X-ASG-Debug-ID: 1354134260-04cbb0642207ce0001-S8gJnT Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id iFzVbfQEl5TBhrhL for ; Wed, 28 Nov 2012 12:24:21 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.141 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApMBALtytlB20f8g/2dsb2JhbAANOIYqug6DEQEBAQQjVhALGAICJgICVwYTszVwknyBIo5LgRMDqUs Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.101]) ([118.209.255.32]) by ipmail04.adl6.internode.on.net with ESMTP; 29 Nov 2012 06:54:04 +1030 Message-ID: <1354134229.1662.22.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout From: Ken McDonell X-ASG-Orig-Subj: Re: Makepkgs fallout To: "Frank Ch. Eigler" Cc: Nathan Scott , pcp@oss.sgi.com Date: Thu, 29 Nov 2012 07:23:49 +1100 In-Reply-To: References: <1728227655.34005625.1353972837144.JavaMail.root@redhat.com> <1354064294.28451.16.camel@bozo-laptop.localdomain> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail04.adl6.internode.on.net[150.101.137.141] X-Barracuda-Start-Time: 1354134260 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115533 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header On Wed, 2012-11-28 at 14:27 -0500, Frank Ch. Eigler wrote: > Ken McDonell writes: > > > I don't see how the Makepkgs change can be breaking things for QA. > > [...] > > I believe the problem arose from the Makepkgs run building an RPM with > a different --libexecdir than the src tree left over after Makepkgs' > own invocation of ../configure. ... Correct. And it is not just RPM builds ... any packaging run that passes arguments to configure is likely to produce this outcome. > ... > I think this is a special case of not fully supporting --prefix yet in our > development workflow. If we get a > > % configure --prefix=/developer/tree ; make ; make install > > installation working as the main way to do development, and then have the > qa testsuite, configured with the same prefix, should be able to run against > the --prefix tree. Then testing the installed system version is just a > special case, of --prefix=/usr --FOODIR=/bar etc, as per Makepkgs. > > The benefit is that there'd be no need to run pcpqa directly against > the build accidentally left behind in the source tree. But I never have (in the history of PCP) needed to do anything special in the QA tree to run QA ... I'm not planning on any additional configure, make, make install steps for me (although I agree it is a perfectly acceptable way to proceed for others). The following patch snippet is from a modified qa/src/GNUmakefile: +ifeq ($(QA_IN_TREE),'') include $(TOPDIR)/src/include/builddefs +else +include /usr/include/pcp/builddefs +endif applying the same change to the parent qa/GNUmakefile and then invoking make as $ QA_IN_TREE=yes make in the handful of places we run make from the QA scripts (not the build) will fix the problem for everyone I believe. If we can get consensus on this I'll make the changes. From nscott@redhat.com Wed Nov 28 16:02:03 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASM23IJ217256 for ; Wed, 28 Nov 2012 16:02:03 -0600 X-ASG-Debug-ID: 1354140260-04bdf02d4a02270001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id QyUTTR2n6EhZUXQl for ; Wed, 28 Nov 2012 14:04:20 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qASM4G60032397; Wed, 28 Nov 2012 17:04:16 -0500 Date: Wed, 28 Nov 2012 17:04:16 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell , "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <2116001670.35346168.1354140256515.JavaMail.root@redhat.com> In-Reply-To: <1354134229.1662.22.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout MIME-Version: 1.0 X-ASG-Orig-Subj: Re: Makepkgs fallout Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1354140260 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115539 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > > ... > > I think this is a special case of not fully supporting --prefix yet > > in our > > development workflow. If we get a > > > > % configure --prefix=/developer/tree ; make ; make install > > > > installation working as the main way to do development, and then > > have the > > qa testsuite, configured with the same prefix, should be able to > > run against > > the --prefix tree. Then testing the installed system version is > > just a > > special case, of --prefix=/usr --FOODIR=/bar etc, as per Makepkgs. > > BTW, we'll need an orthogonal plan for the full-remote testing, where pcpqa at times ssh's into remote machines and bounces requests to/from client/server ... I don't think that will be practical with anything other than a packaged install (cos keeping track of whats installed on remote machines too becomes important there). > The following patch snippet is from a modified qa/src/GNUmakefile: > > +ifeq ($(QA_IN_TREE),'') > include $(TOPDIR)/src/include/builddefs > +else > +include /usr/include/pcp/builddefs > +endif > > applying the same change to the parent qa/GNUmakefile and then > invoking > make as > $ QA_IN_TREE=yes make > in the handful of places we run make from the QA scripts (not the > build) > will fix the problem for everyone I believe. > > If we can get consensus on this I'll make the changes. Could this be replaced with "make -f GNUmakefile.install"? Perhaps check could check for a (checked-in) GNUmakefile.install, use that if found, else continue on with GNUmakefile? No additional variables or state would need to be remembered then & both cases get exercised at the appropriate times. I think. cheers. -- Nathan From nscott@redhat.com Wed Nov 28 16:12:01 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASMC0Qt217847 for ; Wed, 28 Nov 2012 16:12:01 -0600 X-ASG-Debug-ID: 1354140858-04bdf02d4902e00001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id NqB7zsqe0DwIIIRJ for ; Wed, 28 Nov 2012 14:14:18 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qASMEFD0014488; Wed, 28 Nov 2012 17:14:15 -0500 Date: Wed, 28 Nov 2012 17:14:15 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <212327607.35348926.1354140855005.JavaMail.root@redhat.com> In-Reply-To: <1354133548.1662.12.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout MIME-Version: 1.0 X-ASG-Orig-Subj: Re: Makepkgs fallout Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1354140858 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115539 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- ----- Original Message ----- > > Let me distract you ;) by saying there is more of a problem around > > not needing any mechanism for conditional code building in qa/src/. > > e.g. qa/src/unpack.c uses pmEventRecord, which is post-3.5.0 only. > > This should be a problem no matter where qa lives ... > > I believe the problem is that I failed to build/design unpack.c > properly ... if I'd done a better job here, you would not have had > the anguish you had. > No anguish - that was just a simple example to show how (I thought) the compat macros were not applied to sources (and hence not useful in general after a short time). I'm certain there are many cases of this. But, if you are having to work around it, we need to address it properly, as below. > > A possible approach would be to invent a mechanism for using > > PCP_VER > > in the source makefile too (?) and having a policy of culling > > compat > > macros after N new releases have been made. > > I would support this approach, although I am not sure how we'd > enforce > the annotation in the first place. Is this the sort of thing you had > in > mind? Yep, either in the code (probably most flexible) or in the makefile to avoid building the affected binary altogether (probably easier to trigger a test _notrun when no binary found). > > > > In one case (the build) you _want_ to use include files and > > > pcp.conf > > > from ../src/include ... in the other case (running QA) you _want_ > > > to > > > use > > > the installed versions of the include files and pcp.conf (from a > > > packages build). > > > > This is the same issue that several PMDAs have (with the > > GNUmakefile > > and GNUmakefile.install split) ... > > I don't agree ... this is not a GNUmakefile vs GNUmakefile.install > issue. > > The build does > make > which ends up descending into qa and qa/src > > When running QA I want to > cd qa > ./check something Oh now I understand. Perhaps the suggestion to have check respect GNUmakefile.install if present will help though, and gets us back to our familiar pattern of what those two makefiles represent? cheers. -- Nathan From nscott@redhat.com Wed Nov 28 17:06:25 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qASN6PgE223282 for ; Wed, 28 Nov 2012 17:06:25 -0600 X-ASG-Debug-ID: 1354144121-04cb6c05a607400001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id OqPnQG207OWci2FC for ; Wed, 28 Nov 2012 15:08:42 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qASN8fvv005894 for ; Wed, 28 Nov 2012 18:08:41 -0500 Date: Wed, 28 Nov 2012 18:08:41 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <651486852.35376518.1354144121634.JavaMail.root@redhat.com> Subject: pcp updates: qa docs MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: qa docs Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1354144121 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115543 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev qa/README | 67 +++++++++++++++-------------------------------------------- qa/chk.setup | 4 --- 2 files changed, 19 insertions(+), 52 deletions(-) commit 78157c44fa16064ce6c00d17778b5dd329e7fbf2 Author: Nathan Scott Date: Thu Nov 29 10:07:00 2012 +1100 Update some atrophied text in the QA README file. From kenj@internode.on.net Wed Nov 28 18:04:46 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAT04k9Y229765 for ; Wed, 28 Nov 2012 18:04:46 -0600 X-ASG-Debug-ID: 1354147622-04cb6c05a80a3e0001-S8gJnT Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id 3meuP7WbLWmbobob for ; Wed, 28 Nov 2012 16:07:02 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.141 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvgCABCmtlB20f8g/2dsb2JhbAANOIYquHIEBIEUgxEBAQEEI1YQCxgCAiYCAlcGs2RwkneBIo5LgRMDqUs Received: from ppp118-209-255-32.lns20.mel6.internode.on.net (HELO [192.168.1.101]) ([118.209.255.32]) by ipmail04.adl6.internode.on.net with ESMTP; 29 Nov 2012 10:37:00 +1030 Message-ID: <1354147605.1662.30.camel@bozo-laptop.localdomain> Subject: Re: Makepkgs fallout From: Ken McDonell X-ASG-Orig-Subj: Re: Makepkgs fallout To: Nathan Scott Cc: "Frank Ch. Eigler" , pcp@oss.sgi.com Date: Thu, 29 Nov 2012 11:06:45 +1100 In-Reply-To: <2116001670.35346168.1354140256515.JavaMail.root@redhat.com> References: <2116001670.35346168.1354140256515.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail04.adl6.internode.on.net[150.101.137.141] X-Barracuda-Start-Time: 1354147622 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115547 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Wed, 2012-11-28 at 17:04 -0500, Nathan Scott wrote: > ... > Could this be replaced with "make -f GNUmakefile.install"? Perhaps > check could check for a (checked-in) GNUmakefile.install, use that > if found, else continue on with GNUmakefile? No additional variables > or state would need to be remembered then & both cases get exercised > at the appropriate times. I think. Just noticed there is a qa/GNUmakefile.install and qa/src/GNUmakefile.install already so I'll try changing the qa run scripts to use the GNUmakefile.install version if found, else use GNUmakefile I think this will keep everyone happy and allow changes to be made to GNUmakefile for build issues and GNUmakefile.install for QA execution issues. From nscott@redhat.com Wed Nov 28 19:09:23 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_47 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAT19NZq234911 for ; Wed, 28 Nov 2012 19:09:23 -0600 X-ASG-Debug-ID: 1354151500-04cb6c05a70dc30001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id CwRwStc5THVCO7GV for ; Wed, 28 Nov 2012 17:11:40 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAT1BbcA003272; Wed, 28 Nov 2012 20:11:37 -0500 Date: Wed, 28 Nov 2012 20:11:37 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley , Ken McDonell , "Frank Ch. Eigler" Cc: pcp@oss.sgi.com Message-ID: <591870624.35407484.1354151497586.JavaMail.root@redhat.com> In-Reply-To: <50B62698.4080501@redhat.com> Subject: Re: [pcp] NSS/NSPR Testing Status MIME-Version: 1.0 X-ASG-Orig-Subj: Re: [pcp] NSS/NSPR Testing Status Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1354151500 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115551 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain Hi Dave, > -------- Original Message -------- > ... > As of commit e110b05e44b0678d9ba632ab5896ccc7e50c3cf6 (pcpfans > brolley/nssmerge), I am down to two differences in the qa test > results when running with NSS/NSPR enabled as opposed to without. > (great to hear!) > They are: > > 387 -- pmnsunload: memory leak in NSPR found by valgrind > > As we have discussed, this is memory being allocated by PR_Socket > (from > within __pmCreateSocket). It is memory within NSPR's file descriptor > cache which is used by NSPR to recycle old file descriptors. This > would > likely be solved by a call to PR_Cleanup, but the question is, from > where? We call PR_Init from within __pmCreateSocket, as needed > (modern > versions of NSPR are self initializing on the first API call). Any > program which calls __pmCreateSocket would need to eventually call > PR_Cleanup before exiting in order to be leak-free, according to > valgrind. It may be a bit pedantic to explicitly clean up just before > exiting, but we could provide a __pmCleanup function which programs > could call before exiting. With NSS/NSPR enabled, it would call > PR_Cleanup and it would do nothing otherwise. I supposed there is the > possibility that libpcp could need a cleanup function for > non-NSS/NSPR > purposes someday. I think its worth considering doing this cleanup. While we could guard against it in the QA test (adding valgrind filters), which is fine for us, its not really "nice" for someone using the PMAPI and valgrind outside the PCP tree. An alternative to a new cleanup routine would be to add (another) atexit handler in libpcp. I'm not a huge fan of that, but would be very interested in other opinions. This mechanism is how the local context endCallBack hook is implemented (connectlocal.c). There's only a limited number of guaranteed atexit slots, so we shouldn't really go eating them all up without the caller knowing about it. Maybe a single atexit handler which handles all libpcp's atexit needs (and this could call the new __pmCleanup/__pmShutdown/ ... routine, which could be exposed so clients can opt-in as well). Thread-safety is all interweaved in this so be good to garner Kens thoughts on this one. Also, I think only on Linux does the atexit handler run during shared library unload, so MacOSX/Solaris/... may be exposed to subtle bugs when libpcp is explicitly loaded/unloaded. An explicit shutdown interface could provide opportunity to avoid that. > 578 -- test harness expects monotonically increasing fd numbers > > The openfds metric of pmcd is a bit misleading. It implies the number > of > currently open file descriptors, but it is reported based on the > value > of pmcd_hi_openfds (src/pmcd/src/pmcd.h) which is actually a high > water > mark of the highest ever open fd number. It is perhaps coincidentally > true that native fd numbers are monotonically increasing and that, > after > installation, the number of open file descriptors is also the number > of > the highest fd number as the test expects. However, with NSS/NSPR > enabled, while the native fd numbers are still in the range 0-1023, > the > NSPR ones are in the range 1024-2047 and so this assumption is no > longer > true. > > I'm thinking that we should fix the metric to actually count the > number > of open fds (in the IPC table?). Can you see another solution? Not really, as mentioned this metric is defined as follows: $ pminfo -Tt pmcd.openfds pmcd.openfds [highest PMCD file descriptor] Help: The highest file descriptor index used by PMCD for a Client or PMDA connection. So its name is a little misleading. I liked Franks suggestion though, which was: | Counting actual open fd's is not that hard even in general POSIX - | iterate over the valid fd range, calling dup(i); if it returns >=0, | close it and increment the openfds counter. With the IPC table, it | sounds even easier and sounds like the way to go. Its more expensive during the fetch method, but more accurate. I think Ken may have written this code originally though, so be good to again seek his thoughts before reimplementing it. cheers. -- Nathan From nscott@redhat.com Wed Nov 28 20:32:20 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_23 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAT2WJ5v246622 for ; Wed, 28 Nov 2012 20:32:19 -0600 X-ASG-Debug-ID: 1354156476-04cb6c05a812bd0001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id 19DhhzSqcnBWGHDh for ; Wed, 28 Nov 2012 18:34:37 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAT2YX9b001823; Wed, 28 Nov 2012 21:34:34 -0500 Date: Wed, 28 Nov 2012 21:34:33 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley , Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1030669710.35428511.1354156473966.JavaMail.root@redhat.com> In-Reply-To: <591870624.35407484.1354151497586.JavaMail.root@redhat.com> Subject: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) MIME-Version: 1.0 X-ASG-Orig-Subj: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.26] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1354156476 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115557 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > Hi Dave, > > > -------- Original Message -------- > > ... > > As of commit e110b05e44b0678d9ba632ab5896ccc7e50c3cf6 (pcpfans > > brolley/nssmerge), I am down to two differences in the qa test > > results when running with NSS/NSPR enabled as opposed to without. > > Also, are you seeing this one fail Dave ... (nssmerge branch)? [4%] 024 4s ... - output mismatch (see 024.out.bad) 2a3,4 > __pmSetDataIPC: fd= data=0xf83890 > IPC table fd(PDU version): 21a24,25 > __pmSetDataIPC: fd= data=0x164c890 > IPC table fd(PDU version): 40a45,46 > __pmSetDataIPC: fd= data=0x944890 > IPC table fd(PDU version): 51a58,59 > __pmSetDataIPC: fd= data=0x944410 > IPC table fd(PDU version): (2,1) 66a75,76 > __pmSetDataIPC: fd= data=0xbed890 > IPC table fd(PDU version): 77a88,89 > __pmSetDataIPC: fd= data=0xbed410 > IPC table fd(PDU version): (2,1) 94a107,108 > __pmSetDataIPC: fd= data=0x1b655f0 > IPC table fd(PDU version): I'd expect that to be on a new-fail list? Needs treatment like 041 got recently. This actually raises another interesting twist on the QA config issue - this passes for me with some PCP_VER_3611 variants (ie. built --without-secure-sockets) but fails otherwise. Suggests we need to consider doing something more sophisticated for the QA tests with NSS/NSPR dependencies - pkg-config(1) for PCP? cheers. -- Nathan From brolley@redhat.com Thu Nov 29 10:33:21 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_23 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qATGXLat053685 for ; Thu, 29 Nov 2012 10:33:21 -0600 X-ASG-Debug-ID: 1354206938-04cbb035a74d170001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id N0CgtzHDVdMbevr0 for ; Thu, 29 Nov 2012 08:35:39 -0800 (PST) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qATGZZC6023678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 29 Nov 2012 11:35:35 -0500 Received: from [10.15.16.135] (dhcp-10-15-16-135.yyz.redhat.com [10.15.16.135]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qATGZYOl020348; Thu, 29 Nov 2012 11:35:35 -0500 Message-ID: <50B78ED6.3040009@redhat.com> Date: Thu, 29 Nov 2012 11:35:34 -0500 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Nathan Scott CC: Ken McDonell , pcp@oss.sgi.com Subject: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) References: <1030669710.35428511.1354156473966.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) In-Reply-To: <1030669710.35428511.1354156473966.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1354206938 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com On 11/28/2012 09:34 PM, Nathan Scott wrote: > Also, are you seeing this one fail Dave ... (nssmerge branch)? [4%] > 024 4s ... - output mismatch (see 024.out.bad) 2a3,4 >> __pmSetDataIPC: fd= data=0xf83890 >> IPC table fd(PDU version): [ ... ] > I'd expect that to be on a new-fail list? Needs treatment like > 041 got recently. I get 024 [not run] ./getpmcdhosts: unable to get 1 host(s) with options: "-L -n 1 -a sample" for that one. However based on how similar tests were fixed, I have pushed a fix to brolley/nssmerge in the pcpfans repository. > > This actually raises another interesting twist on the QA config > issue - this passes for me with some PCP_VER_3611 variants (ie. > built --without-secure-sockets) but fails otherwise. Yeah. __pmSetDataIPC is currently only used by the secure sockets implementation. > Suggests > we need to consider doing something more sophisticated for the > QA tests with NSS/NSPR dependencies - pkg-config(1) for PCP? Can you elaborate? I'm not sure what you're getting at. Dave From kenj@internode.on.net Thu Nov 29 13:31:15 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qATJVE0h071584 for ; Thu, 29 Nov 2012 13:31:15 -0600 X-ASG-Debug-ID: 1354217611-04bdf02d4a65600001-S8gJnT Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id py4KO5g9NvdENDww for ; Thu, 29 Nov 2012 11:33:32 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.143 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AkQoAO+3t1B8sEe7PGdsb2JhbAANN4YrhDq1NgMBAQEBOIJSAQEBBCNWEAsYAgImAgJDFAazYnCSaIEijkyBEwOpSw Received: from cpe-124-176-71-187.lns6.cht.bigpond.net.au (HELO [192.168.5.53]) ([124.176.71.187]) by ipmail05.adl6.internode.on.net with ESMTP; 30 Nov 2012 06:03:24 +1030 Message-ID: <1354217602.1662.33.camel@bozo-laptop.localdomain> Subject: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) From: Ken McDonell X-ASG-Orig-Subj: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) To: Nathan Scott Cc: Dave Brolley , pcp@oss.sgi.com Date: Fri, 30 Nov 2012 06:33:22 +1100 In-Reply-To: <1030669710.35428511.1354156473966.JavaMail.root@redhat.com> References: <1030669710.35428511.1354156473966.JavaMail.root@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail05.adl6.internode.on.net[150.101.137.143] X-Barracuda-Start-Time: 1354217611 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115625 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- On Wed, 2012-11-28 at 21:34 -0500, Nathan Scott wrote: > ... > This actually raises another interesting twist on the QA config > issue - this passes for me with some PCP_VER_3611 variants (ie. > built --without-secure-sockets) but fails otherwise. Suggests > we need to consider doing something more sophisticated for the > QA tests with NSS/NSPR dependencies - pkg-config(1) for PCP? Check src/check_fault_injection.c ... I think this demonstrates a precedent for checking on the fly if a particular flavour of libpcp is installed, and this is used as a guard in the scripts that want to exercise that feature, e.g. 476. This could be also used to choose between alternate expected output files, possibly in combination with PCP_VER checking. From nscott@redhat.com Thu Nov 29 17:33:49 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qATNXnEt095151 for ; Thu, 29 Nov 2012 17:33:49 -0600 X-ASG-Debug-ID: 1354232166-04cb6c05a581b90001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id KpB24o9Ll37uOHJq for ; Thu, 29 Nov 2012 15:36:07 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qATNV5da030682; Thu, 29 Nov 2012 18:31:05 -0500 Date: Thu, 29 Nov 2012 18:31:05 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley , Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <350054433.36044453.1354231865714.JavaMail.root@redhat.com> In-Reply-To: <50B78ED6.3040009@redhat.com> Subject: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) MIME-Version: 1.0 X-ASG-Orig-Subj: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.125] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1354232166 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115640 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ----- Original Message ----- > On 11/28/2012 09:34 PM, Nathan Scott wrote: > > This actually raises another interesting twist on the QA config > > issue - this passes for me with some PCP_VER_3611 variants (ie. > > built --without-secure-sockets) but fails otherwise. > Yeah. __pmSetDataIPC is currently only used by the secure sockets > implementation. > > Suggests > > we need to consider doing something more sophisticated for the > > QA tests with NSS/NSPR dependencies - pkg-config(1) for PCP? > Can you elaborate? I'm not sure what you're getting at. Oh I just meant that the way we're using "if [ $PCP_VER -lt 3611 ]" is not good enough to figure out what the expected output of the test should be. Kens suggested looking at the fault injection stuff, which does this: - conditionally builds QA sources if found - tests check for the presence of a QA binary, _notrun if not found - the QA source also makes a call to __pmFaultInject, which is setup in libpcp (if built-in) to exit(1) if not enabled in the build (keyed on #ifdef PM_FAULT_INJECTION). Noticed theres a second similar case which is even more like the NSS case in some ways - the multi-threading support. It has a configure option too and is transparent in libpcp to the caller. The approach here is similar to NSS currently - e.g. in the qa/src/GNUlocaldefs "ifeq ($(shell test $(PCP_VER) -ge 3600 && echo 1), 1)" ... so, only build the test source if we know the new code is there. The source also has a runtime test though - __pmMultiThreaded() in this case, which returns zero if PM_MULTI_THREAD was not set during the build of libpcp. So, approach used so far is to add the sort of tests we have now (PCP version based) as an initial "will this compile at all" check, then a subsequent "dynamic" check is done via a call into a libpcp routine that was added at the time of the initial feature commit. There's pros and cons. NSS doesn't actually have a routine like this and we'd have to add something. Need to think further on the best option I think - maybe adding in a feature-test interface to libpcp (analogous to sysconf(3), but less int-based) and also a helper tool (something like getconf(1), for QA)? Another option would be to use the pkg-config tool I guess. Or we continue on the query-interface-per-feature path, which works too. Does anyone have any other suggestions or strong preferences? In terms of features coming up ... Dave's mentioned IPv6 is next on his hit list (building on NSS), and there's per-user auth pending (also building on NSS). Thats the short term stuff anyway that I think will have to do similar version querying from QA tests. cheers. -- Nathan From nscott@redhat.com Thu Nov 29 17:49:01 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qATNn1Aj096260 for ; Thu, 29 Nov 2012 17:49:01 -0600 X-ASG-Debug-ID: 1354233079-04bdf02d4985890001-S8gJnT Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by cuda.sgi.com with ESMTP id BwczvL3aetwzhTMz for ; Thu, 29 Nov 2012 15:51:19 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.25 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qATNpJle031974 for ; Thu, 29 Nov 2012 18:51:19 -0500 Date: Thu, 29 Nov 2012 18:51:19 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <1619714717.36052434.1354233079347.JavaMail.root@redhat.com> Subject: pcp updates: doc, qa build MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: doc, qa build Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.125] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx4-phx2.redhat.com[209.132.183.25] X-Barracuda-Start-Time: 1354233079 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115643 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git dev INSTALL | 2 +- qa/src/GNUlocaldefs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) commit ee0dcc30791b102862904c5739283321794292a9 Author: Nathan Scott Date: Fri Nov 30 10:47:57 2012 +1100 Add fault injection test sources into additional makefile macros The fault injection test sources need to be handled like the multi-thread cases for inclusion in source tarball and installation, when not enabled. commit 32a5712f02381625964df2b196054496955661fc Author: Nathan Scott Date: Thu Nov 29 11:40:36 2012 +1100 Fix typo in INSTALL doc expanding "pmie" Inference engine, not interfence engine! Although interference engine might sometimes be more apt. ;-) Thanks Josh Stone for pointing it out. From nscott@redhat.com Fri Nov 30 02:16:17 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,J_CHICKENPOX_43, J_CHICKENPOX_64 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAU8GHF2138426 for ; Fri, 30 Nov 2012 02:16:17 -0600 X-ASG-Debug-ID: 1354263515-04cbb035a59a340001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id JOwpBMDkUlcu7nOK for ; Fri, 30 Nov 2012 00:18:35 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAU8IVhi015467; Fri, 30 Nov 2012 03:18:31 -0500 Date: Fri, 30 Nov 2012 03:18:31 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: Dave Brolley , Ken McDonell Cc: pcp@oss.sgi.com Message-ID: <1855860738.36149046.1354263511386.JavaMail.root@redhat.com> In-Reply-To: <350054433.36044453.1354231865714.JavaMail.root@redhat.com> Subject: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) MIME-Version: 1.0 X-ASG-Orig-Subj: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) Content-Type: multipart/mixed; boundary="----=_Part_36149044_1850744621.1354263511384" X-Originating-IP: [10.64.51.125] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1354263515 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.01 X-Barracuda-Spam-Status: No, SCORE=0.01 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_SA_TO_FROM_DOMAIN_MATCH X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115677 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.01 BSF_SC0_SA_TO_FROM_DOMAIN_MATCH Sender Domain Matches Recipient Domain ------=_Part_36149044_1850744621.1354263511384 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit ----- Original Message ----- > ... > So, approach used so far is to add the sort of tests we have now > (PCP version based) as an initial "will this compile at all" check, > then a subsequent "dynamic" check is done via a call into a libpcp > routine that was added at the time of the initial feature commit. > > There's pros and cons. NSS doesn't actually have a routine like > this and we'd have to add something. Need to think further on the > best option I think - maybe adding in a feature-test interface to > libpcp (analogous to sysconf(3), but less int-based) and also a > helper tool (something like getconf(1), for QA)? > > Another option would be to use the pkg-config tool I guess. Or we > continue on the query-interface-per-feature path, which works too. Attached patch is an initial pass (untested) at approach #1 for your consideration & amusement. I came across the existing pmconfig(1) & made this fit into that tool, with similar APIs. Thoughts? cheers. -- Nathan ------=_Part_36149044_1850744621.1354263511384 Content-Type: text/x-patch; name=libpcp-config.patch Content-Disposition: attachment; filename=libpcp-config.patch Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3BjcC9pbXBsLmggYi9zcmMvaW5jbHVkZS9wY3AvaW1w bC5oCmluZGV4IGFkMDNkM2YuLmM0ZTJiMDEgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3BjcC9p bXBsLmgKKysrIGIvc3JjL2luY2x1ZGUvcGNwL2ltcGwuaApAQCAtMTE4Niw2ICsxMTg2LDEzIEBA IGV4dGVybiBpbnQgX19wbUFic29sdXRlUGF0aChjaGFyICopOwogZXh0ZXJuIGludCBfX3BtUGF0 aFNlcGFyYXRvcigpOwogCiAvKgorICogZGlzY292ZXIgY29uZmlndXJhYmxlIGZlYXR1cmVzIG9m IHRoZSBzaGFyZWQgbGlicmFyaWVzCisgKi8KK3R5cGVkZWYgdm9pZCAoKl9fcG1BUElDb25maWdD YWxsYmFjaykoY29uc3QgY2hhciAqLCBjb25zdCBjaGFyICopOworZXh0ZXJuIHZvaWQgX19wbUFQ SUNvbmZpZyhfX3BtQVBJQ29uZmlnQ2FsbGJhY2spOworZXh0ZXJuIGNvbnN0IGNoYXIgKl9fcG1H ZXRBUElDb25maWcoY29uc3QgY2hhciAqKTsKKworLyoKICAqIEFGIC0gZ2VuZXJhbCBwdXJwb3Nl IGFzeW5jaHJvbm91cyBldmVudCBtYW5hZ2VtZW50IHJvdXRpbmVzCiAgKi8KIGV4dGVybiBpbnQg X19wbUFGcmVnaXN0ZXIoY29uc3Qgc3RydWN0IHRpbWV2YWwgKiwgdm9pZCAqLCB2b2lkICgqKShp bnQsIHZvaWQgKikpOwpkaWZmIC0tZ2l0IGEvc3JjL2xpYnBjcC9zcmMvY2hlY2stc3RhdGljcyBi L3NyYy9saWJwY3Avc3JjL2NoZWNrLXN0YXRpY3MKaW5kZXggZTUzZGE4Ni4uYmRkNmUwNCAxMDA3 NTUKLS0tIGEvc3JjL2xpYnBjcC9zcmMvY2hlY2stc3RhdGljcworKysgYi9zcmMvbGlicGNwL3Ny Yy9jaGVjay1zdGF0aWNzCkBAIC03OCw2ICs3OCw3IEBAIGNoZWNrc3VtLm8KIGNvbmZpZy5vCiAg ICAgW1NEUl0gP19fcG1OYXRpdmVDb25maWcJIyBjb25zdAogICAgIGIgc3RhdGUuWzAtOV0qCQkj IGd1YXJkZWQgYnkgX19wbUxvY2tfbGlicGNwIG11dGV4CisgICAgZCBmZWF0dXJlcwkJCSMgY29u c3QKIGNvbm5lY3Rsb2NhbC5vCiAgICAgYiBhdGV4aXRfaW5zdGFsbGVkLlswLTldKgkjIGd1YXJk ZWQgYnkgX19wbUxvY2tfbGlicGNwIG11dGV4CiAgICAgYiBidWZmZXIuWzAtOV0qCQkjIGFzc2Vy dCBzYWZlLCBzZWUgbm90ZXMgaW4gY29ubmVjdGxvY2FsLmMKZGlmZiAtLWdpdCBhL3NyYy9saWJw Y3Avc3JjL2NvbmZpZy5jIGIvc3JjL2xpYnBjcC9zcmMvY29uZmlnLmMKaW5kZXggYjM3YmViMi4u NTA0Y2M3NSAxMDA2NDQKLS0tIGEvc3JjL2xpYnBjcC9zcmMvY29uZmlnLmMKKysrIGIvc3JjL2xp YnBjcC9zcmMvY29uZmlnLmMKQEAgLTI2MiwzICsyNjIsNDkgQEAgcG1HZXRDb25maWcoY29uc3Qg Y2hhciAqbmFtZSkKICAgICBQTV9VTkxPQ0soX19wbUxvY2tfbGlicGNwKTsKICAgICByZXR1cm4g dmFsOwogfQorCisvKgorICogRGV0YWlscyBvZiBydW50aW1lIGZlYXR1cmVzIGF2YWlsYWJsZSBp biB0aGUgYnVpbHQgbGlicGNwCisgKi8KKworI2lmIGRlZmluZWQoSEFWRV9TRUNVUkVfU09DS0VU UykKKyNkZWZpbmUgUE1fU0VDVVJFX1NPQ0tFVFMJMQorI2Vsc2UKKyNkZWZpbmUgUE1fU0VDVVJF X1NPQ0tFVFMJMAorI2VuZGlmCisjZGVmaW5lIFNUUklOR0lGWShzKQkJI3MKKyNkZWZpbmUgVE9f U1RSSU5HKHMpCQlTVFJJTkdJRlkocykKKworc3RhdGljIGNvbnN0IHN0cnVjdCB7CisJY29uc3Qg Y2hhciAqCQlmZWF0dXJlOworCWNvbnN0IGNoYXIgKgkJc3RhdGU7Cit9IGZlYXR1cmVzW10gPSB7 CisJeyAicG1hcGlfdmVyc2lvbiIsCVRPX1NUUklORyhQTUFQSV9WRVJTSU9OKSB9LAorCXsgIm11 bHRpX3RocmVhZGVkIiwJVE9fU1RSSU5HKFBNX01VTFRJX1RIUkVBREVEKSB9LAorCXsgImZhdWx0 X2luamVjdGlvbiIsCVRPX1NUUklORyhQTV9GQVVMVF9JTkpFQ1RJT04pIH0sCisJeyAic2VjdXJl X3NvY2tldHMiLAlUT19TVFJJTkcoUE1fU0VDVVJFX1NPQ0tFVFMpIH0sCit9OworCit2b2lkCitf X3BtQVBJQ29uZmlnKF9fcG1BUElDb25maWdDYWxsYmFjayBmb3JtYXR0ZXIpCit7CisgICAgaW50 IGk7CisKKyAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9mKGZlYXR1cmVzKS9zaXplb2YoZmVhdHVy ZXNbMF0pOyBpKyspIHsKKwlpZiAocG1EZWJ1ZyAmIERCR19UUkFDRV9DT05GSUcpCisJICAgIGZw cmludGYoc3RkZXJyLCAiX19wbUFQSUNvbmZpZzogJXM9JXNcbiIsCisJCSAgZmVhdHVyZXNbaV0u ZmVhdHVyZSwgZmVhdHVyZXNbaV0uc3RhdGUpOworCWZvcm1hdHRlcihmZWF0dXJlc1tpXS5mZWF0 dXJlLCBmZWF0dXJlc1tpXS5zdGF0ZSk7CisgICAgfQorfQorCitjb25zdCBjaGFyICoKK19fcG1H ZXRBUElDb25maWcoY29uc3QgY2hhciAqbmFtZSkKK3sKKyAgICBpbnQgaTsKKworICAgIGZvciAo aSA9IDA7IGkgPCBzaXplb2YoZmVhdHVyZXMpL3NpemVvZihmZWF0dXJlc1swXSk7IGkrKykKKyAg ICAgICAgaWYgKHN0cmNhc2VjbXAobmFtZSwgZmVhdHVyZXNbaV0uZmVhdHVyZSkgPT0gMCkKKwkg ICAgcmV0dXJuIGZlYXR1cmVzW2ldLnN0YXRlOworICAgIHJldHVybiBOVUxMOworfQpkaWZmIC0t Z2l0IGEvc3JjL3BtY29uZmlnL3BtY29uZmlnLmMgYi9zcmMvcG1jb25maWcvcG1jb25maWcuYwpp bmRleCBkZjViMTU4Li41NjVhOTAxIDEwMDY0NAotLS0gYS9zcmMvcG1jb25maWcvcG1jb25maWcu YworKysgYi9zcmMvcG1jb25maWcvcG1jb25maWcuYwpAQCAtMTYsNyArMTYsNyBAQAogI2luY2x1 ZGUgImltcGwuaCIKIAogdm9pZAotZm9ybWF0dGVyKGNoYXIgKnZhciwgY2hhciAqcHJlZml4LCBj aGFyICp2YWwpCitlbnZfZm9ybWF0dGVyKGNoYXIgKnZhciwgY2hhciAqcHJlZml4LCBjaGFyICp2 YWwpCiB7CiAgICAgY2hhciAqdjsKIApAQCAtMjgsMjQgKzI4LDM3IEBAIGZvcm1hdHRlcihjaGFy ICp2YXIsIGNoYXIgKnByZWZpeCwgY2hhciAqdmFsKQogCXByaW50ZigiJXM9JXNcbiIsIHZhciwg dik7CiB9CiAKK3ZvaWQKK2FwaV9mb3JtYXR0ZXIoY29uc3QgY2hhciAqdmFyLCBjb25zdCBjaGFy ICp2YWwpCit7CisgICAgaWYgKCF2YWwgfHwgdmFsWzBdID09ICdcMCcpCisJcHJpbnRmKCIlcz1m YWxzZVxuIiwgdmFyKTsKKyAgICBlbHNlCisJcHJpbnRmKCIlcz0lc1xuIiwgdmFyLCB2YWwpOwor fQorCiBpbnQKIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogewogICAgIGludAkJYzsKICAg ICBpbnQJCWVycmZsYWcgPSAwOwogICAgIGludAkJc2ZsYWcgPSAwOworICAgIGludAkJTGZsYWcg PSAwOwogCiAgICAgX19wbVNldFByb2duYW1lKGFyZ3ZbMF0pOwogCi0gICAgd2hpbGUgKChjID0g Z2V0b3B0KGFyZ2MsIGFyZ3YsICJhbHMiKSkgIT0gRU9GKSB7CisgICAgd2hpbGUgKChjID0gZ2V0 b3B0KGFyZ2MsIGFyZ3YsICJhbExzIikpICE9IEVPRikgewogICAgICAgICBzd2l0Y2ggKGMpIHsK LSAgICAgICAgY2FzZSAnYSc6ICAgICAgIC8qIHNob3cgYWxsLCBkZWZ1YWx0ICh1bm1vZGlmaWVk KSBkdW1wIGZvcm1hdCAqLworCWNhc2UgJ2EnOiAgICAgICAvKiBzaG93IGFsbCwgZGVmYXVsdCAo dW5tb2RpZmllZCkgbGlzdCBmb3JtYXQgKi8KIAljYXNlICdsJzoKIAkgICAgc2ZsYWcgPSAwOwog CSAgICBicmVhazsKLSAgICAgICAgY2FzZSAncyc6ICAgICAgIC8qIHNob3cgYWxsLCBndWFyZGVk IGZvcm1hdCBmb3Igc2hlbGwgZXhwYW5zaW9uICovCisJY2FzZSAncyc6ICAgICAgIC8qIHNob3cg YWxsLCBndWFyZGVkIGZvcm1hdCBmb3Igc2hlbGwgZXhwYW5zaW9uICovCiAJICAgIHNmbGFnID0g MTsKIAkgICAgYnJlYWs7CisJY2FzZSAnTCc6CisJICAgIExmbGFnID0gMTsKKwkgICAgYnJlYWs7 CiAJY2FzZSAnPyc6CiAJZGVmYXVsdDoKIAkgICAgZXJyZmxhZysrOwpAQCAtNTksNiArNzIsNyBA QCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIFxuXAogT3B0aW9uczpcblwKICAgLWEgfCAt bCAgICAgIHNob3cgYWxsLCB1bm1vZGlmaWVkIGZvcm1hdCAoZGVmYXVsdClcblwKKyAgLUwgICAg ICAgICAgIHNob3cgbGlicmFyeSBmZWF0dXJlcyBpbnN0ZWFkIG9mIGVudmlyb25tZW50XG5cCiAg IC1zICAgICAgICAgICBzaG93IGFsbCwgcXVvdGVkIGZvcm1hdCBmb3Igc2hlbGwgZXhwYW5zaW9u XG4iLAogCQlwbVByb2duYW1lKTsKIAlleGl0KDEpOwpAQCAtNjcsMTcgKzgxLDI4IEBAIE9wdGlv bnM6XG5cCiAgICAgaWYgKG9wdGluZCA+PSBhcmdjKSB7CiAJaWYgKHNmbGFnKQogCSAgICBwdXRl bnYoIlNIRUxMPS9iaW4vc2giKTsKLQlfX3BtQ29uZmlnKGZvcm1hdHRlcik7CisJaWYgKExmbGFn KQorCSAgICBfX3BtQVBJQ29uZmlnKGFwaV9mb3JtYXR0ZXIpOworCWVsc2UKKwkgICAgX19wbUNv bmZpZyhlbnZfZm9ybWF0dGVyKTsKICAgICB9CiAgICAgZWxzZSBpZiAoc2ZsYWcpIHsKIAlwdXRl bnYoIlNIRUxMPS9iaW4vc2giKTsKLQlmb3IgKGMgPSBvcHRpbmQ7IGMgPCBhcmdjOyBjKyspCi0J ICAgIHByaW50ZigiZXhwb3J0ICVzPSR7JXM6LVwiJXNcIn1cbiIsIGFyZ3ZbY10sIGFyZ3ZbY10s CisJaWYgKExmbGFnKQorCSAgICBmb3IgKGMgPSBvcHRpbmQ7IGMgPCBhcmdjOyBjKyspCisJCXBy aW50ZigiZXhwb3J0ICVzPSR7JXM6LVwiJXNcIn1cbiIsIGFyZ3ZbY10sIGFyZ3ZbY10sCisJCQlf X3BtR2V0QVBJQ29uZmlnKGFyZ3ZbY10pKTsKKwllbHNlCisJICAgIGZvciAoYyA9IG9wdGluZDsg YyA8IGFyZ2M7IGMrKykKKwkJcHJpbnRmKCJleHBvcnQgJXM9JHslczotXCIlc1wifVxuIiwgYXJn dltjXSwgYXJndltjXSwKIAkJCXBtR2V0Q29uZmlnKGFyZ3ZbY10pKTsKICAgICB9Ci0gICAgZWxz ZSB7CisgICAgZWxzZSBpZiAoTGZsYWcpCisJZm9yIChjID0gb3B0aW5kOyBjIDwgYXJnYzsgYysr KQorCSAgICBwcmludGYoIiVzPSVzXG4iLCBhcmd2W2NdLCBfX3BtR2V0QVBJQ29uZmlnKGFyZ3Zb Y10pKTsKKyAgICBlbHNlCiAJZm9yIChjID0gb3B0aW5kOyBjIDwgYXJnYzsgYysrKQogCSAgICBw cmludGYoIiVzPSVzXG4iLCBhcmd2W2NdLCBwbUdldENvbmZpZyhhcmd2W2NdKSk7Ci0gICAgfQor ICAgCiAgICAgZXhpdCgwKTsKIH0K ------=_Part_36149044_1850744621.1354263511384-- From nscott@redhat.com Fri Nov 30 02:25:18 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAU8PIts139334 for ; Fri, 30 Nov 2012 02:25:18 -0600 X-ASG-Debug-ID: 1354264056-04bdf02d4ba2210001-S8gJnT Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by cuda.sgi.com with ESMTP id SqEwFlcFOODpOj9V for ; Fri, 30 Nov 2012 00:27:36 -0800 (PST) X-Barracuda-Envelope-From: nscott@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.24 Received: from zmail20.collab.prod.int.phx2.redhat.com (zmail20.collab.prod.int.phx2.redhat.com [10.5.83.23]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAU8RaV6015935 for ; Fri, 30 Nov 2012 03:27:36 -0500 Date: Fri, 30 Nov 2012 03:27:36 -0500 (EST) From: Nathan Scott Reply-To: Nathan Scott To: pcp@oss.sgi.com Message-ID: <380439881.36150975.1354264056285.JavaMail.root@redhat.com> Subject: pcp updates: nssmerge qa MIME-Version: 1.0 X-ASG-Orig-Subj: pcp updates: nssmerge qa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.64.51.125] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) X-Barracuda-Connect: mx3-phx2.redhat.com[209.132.183.24] X-Barracuda-Start-Time: 1354264056 X-Barracuda-URL: http://192.48.157.11:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115677 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge debian/control | 2 qa/024 | 3 qa/344 | 5 qa/344.out.3 | 686 ++++++++++++++++++++++++++++++++++++++++++ qa/src/pmnsunload.c | 14 src/include/pcp/impl.h | 24 + src/libpcp/src/auxconnect.c | 28 + src/libpcp/src/connectlocal.c | 46 ++ src/libpcp/src/util.c | 28 + 9 files changed, 820 insertions(+), 16 deletions(-) commit 04d152b2f233ce1ef6c2652445b07d1ca7dff04f Author: Nathan Scott Date: Fri Nov 30 14:51:41 2012 +1100 Add qualified qa/344 output for local context change in 3.6.11 commit 856862b14c6842d13a399cf01ba9b11d4438b250 Author: Nathan Scott Date: Fri Nov 30 14:34:27 2012 +1100 Fix filtering in test qa/024 Two parts of the sed pattern matching space were trying to deal with filtering 'IPC table fd' bits; implement what Dave was really after here I think - cull this line iff the new __pmSetDataIPC is immediately preceding. commit bd20480b1e73b25ab5594a59d8158874d3d69ef9 Author: Nathan Scott Date: Fri Nov 30 14:20:55 2012 +1100 Add dependencies for NSS/NSPR packages into Debian builds commit 4173e468941c9a4b1f905e77c2a5a7cc5d81d7fa Author: Nathan Scott Date: Fri Nov 30 12:24:53 2012 +1100 Fix typo in recent qa/024 sed filter change commit fd552c841ccbdc4fdf0ccc1137bc3a16c33b6e1d Author: Nathan Scott Date: Fri Nov 30 12:17:46 2012 +1100 Add an interface allowing PMAPI clients to explicitly cleanup Introduce a new __pmShutdown routine which wraps up all needed teardown of resources allocated in libpcp. It initially covers the NSS cleanup and DSO PMDA end-callback / dlclose() for any local context PMDAs the client opened. Takes care of ordering concerns in shutdown between different areas, and works nicely with the existing atexit handler for local context teardown. Conditionally uses it in qa/src, and valgrind is now content with the workings of test 387 (with NSS enabled). From kenj@internode.on.net Fri Nov 30 04:27:49 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAUARnBc151034 for ; Fri, 30 Nov 2012 04:27:49 -0600 X-ASG-Debug-ID: 1354271406-04cbb035a4a2b10001-S8gJnT Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id 2aGAOxquScikOu68 for ; Fri, 30 Nov 2012 02:30:06 -0800 (PST) X-Barracuda-Envelope-From: kenj@internode.on.net X-Barracuda-Apparent-Source-IP: 150.101.137.145 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArIpAGKKuFB52raBPGdsb2JhbAANN4YshDq1PQMBAQEBOIJ8gQUGAiYCRS2zeXCSfoEiix4LgQ+CFIETA6lKgVg Received: from cpe-121-218-182-129.lnse4.cht.bigpond.net.au (HELO [192.168.5.50]) ([121.218.182.129]) by ipmail06.adl6.internode.on.net with ESMTP; 30 Nov 2012 21:00:02 +1030 Message-ID: <1354271401.15639.2.camel@bozo-laptop.localdomain> Subject: pcp updates - fix for Makepkgs fallout From: Ken McDonell X-ASG-Orig-Subj: pcp updates - fix for Makepkgs fallout To: pcp@oss.sgi.com Date: Fri, 30 Nov 2012 21:30:01 +1100 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.2- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Barracuda-Connect: ipmail06.adl6.internode.on.net[150.101.137.145] X-Barracuda-Start-Time: 1354271406 X-Barracuda-URL: http://192.48.176.25:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.115684 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- As discussed on the email list, these changes demonstrably allow QA to be run from either the packaged/installed directories or from within the git tree. Changes committed to git://oss.sgi.com/kenj/pcp.git dev qa/GNUmakefile.install | 14 ++++++++++++++ qa/changeversion | 8 +++++++- qa/check | 8 +------- qa/chk.setup | 16 ++++++++++++++-- qa/common | 22 +++++++++++++++++++--- qa/getpmcdhosts | 9 ++++++++- qa/new | 9 +++++++-- 7 files changed, 70 insertions(+), 16 deletions(-) commit a44e787bcd918ed5fd3092618e1cf862d19ad444 Author: Ken McDonell Date: Fri Nov 30 21:24:47 2012 +1100 qa - use GNUmakefile.install when running QA in the tree These changes allow QA to be run _either_ from the installed pcp-testsuite package or from within a PCP git tree. commit 9ff8756785a5883b8430ee88d397929bd4b2fe9d Author: Ken McDonell Date: Fri Nov 30 11:01:38 2012 +1100 qa/check - bogus awk removed Not sure what this syntactically and semantically incorrect awk script fragment was trying to achieve ... it has been broken since the start of the git history, so culling it can't be too bad ... 8^)> From brolley@redhat.com Fri Nov 30 10:11:58 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,J_CHICKENPOX_47 autolearn=no version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAUGBvHR190219 for ; Fri, 30 Nov 2012 10:11:57 -0600 X-ASG-Debug-ID: 1354292056-04cb6c05a6c8260001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id IhB3oZZFqnrFChP1 for ; Fri, 30 Nov 2012 08:14:16 -0800 (PST) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAUGEDj4015402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Nov 2012 11:14:14 -0500 Received: from [10.11.11.114] (vpn-11-114.rdu.redhat.com [10.11.11.114]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAUGEBIw026686; Fri, 30 Nov 2012 11:14:12 -0500 Message-ID: <50B8DB53.20500@redhat.com> Date: Fri, 30 Nov 2012 11:14:11 -0500 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Nathan Scott CC: Ken McDonell , "Frank Ch. Eigler" , pcp@oss.sgi.com Subject: pmcd.openfds Metric (was: [pcp] NSS/NSPR Testing Status) References: <591870624.35407484.1354151497586.JavaMail.root@redhat.com> X-ASG-Orig-Subj: pmcd.openfds Metric (was: [pcp] NSS/NSPR Testing Status) In-Reply-To: <591870624.35407484.1354151497586.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1354292056 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com On 11/28/2012 08:11 PM, Nathan Scott wrote: >> 578 -- test harness expects monotonically increasing fd numbers >> >> The openfds metric of pmcd is a bit misleading. It implies the number >> of >> currently open file descriptors, but it is reported based on the >> value >> of pmcd_hi_openfds (src/pmcd/src/pmcd.h) which is actually a high >> water >> mark of the highest ever open fd number. It is perhaps coincidentally >> true that native fd numbers are monotonically increasing and that, >> after >> installation, the number of open file descriptors is also the number >> of >> the highest fd number as the test expects. However, with NSS/NSPR >> enabled, while the native fd numbers are still in the range 0-1023, >> the >> NSPR ones are in the range 1024-2047 and so this assumption is no >> longer >> true. >> >> I'm thinking that we should fix the metric to actually count the >> number >> of open fds (in the IPC table?). Can you see another solution? > Not really, as mentioned this metric is defined as follows: > > $ pminfo -Tt pmcd.openfds > > pmcd.openfds [highest PMCD file descriptor] > Help: > The highest file descriptor index used by PMCD for a Client or PMDA > connection. > > So its name is a little misleading. I liked Franks suggestion though, > which was: > > | Counting actual open fd's is not that hard even in general POSIX - > | iterate over the valid fd range, calling dup(i); if it returns >=0, > | close it and increment the openfds counter. With the IPC table, it > | sounds even easier and sounds like the way to go. > > Its more expensive during the fetch method, but more accurate. > I think Ken may have written this code originally though, so be > good to again seek his thoughts before reimplementing it. Frank's suggestion would be ok, if what we want is the number of currently open fds, as would my suggest examiniation of the IPC table. However, the help text for the metric clearly implies that it is the highest fd number used by PMCD, i.e. the high water mark. According to this definition, the current result returned for the NSS-enabled build is technically correct, but not what the test case expects. If this metric and the code which implements it were indeed written by Ken, then I think we need some clarification from him regarding the original intent before we can come up with the proper solution. Dave From brolley@redhat.com Fri Nov 30 10:35:37 2012 X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.4.0-r929098 Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qAUGZadr195823 for ; Fri, 30 Nov 2012 10:35:36 -0600 X-ASG-Debug-ID: 1354293475-04cb6c05a7c9450001-S8gJnT Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id icKQ73t8DPYFpkVq for ; Fri, 30 Nov 2012 08:37:55 -0800 (PST) X-Barracuda-Envelope-From: brolley@redhat.com X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAUGbrDW023178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Nov 2012 11:37:53 -0500 Received: from [10.11.8.80] (vpn-8-80.rdu.redhat.com [10.11.8.80]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAUGbphL019795; Fri, 30 Nov 2012 11:37:52 -0500 Message-ID: <50B8E0DF.4010307@redhat.com> Date: Fri, 30 Nov 2012 11:37:51 -0500 From: Dave Brolley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Nathan Scott CC: Ken McDonell , pcp@oss.sgi.com Subject: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) References: <1855860738.36149046.1354263511386.JavaMail.root@redhat.com> X-ASG-Orig-Subj: Re: More cleverer QA config needed? (was Re: [pcp] NSS/NSPR Testing Status) In-Reply-To: <1855860738.36149046.1354263511386.JavaMail.root@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1354293475 X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sgi.com On 11/30/2012 03:18 AM, Nathan Scott wrote: > ----- Original Message ----- >> ... >> So, approach used so far is to add the sort of tests we have now >> (PCP version based) as an initial "will this compile at all" check, >> then a subsequent "dynamic" check is done via a call into a libpcp >> routine that was added at the time of the initial feature commit. >> >> There's pros and cons. NSS doesn't actually have a routine like >> this and we'd have to add something. Need to think further on the >> best option I think - maybe adding in a feature-test interface to >> libpcp (analogous to sysconf(3), but less int-based) and also a >> helper tool (something like getconf(1), for QA)? >> >> Another option would be to use the pkg-config tool I guess. Or we >> continue on the query-interface-per-feature path, which works too. > Attached patch is an initial pass (untested) at approach #1 for your > consideration & amusement. I came across the existing pmconfig(1) & > made this fit into that tool, with similar APIs. > > Thoughts? > I like the idea of being able to query the library regarding its features/capabilities. This would certainly be useful for testing and would likely be useful for applications using the library. Dave