147435 2006-09-13 03:39 0000 sys-cluster/heartbeat-2.0.7 fails to increase a resource's failcount under certain circumstances (patch included) 2006-09-17 15:48:39 0000 1 1 1 Unclassified Gentoo Linux Applications 2006.1 All Linux RESOLVED FIXED P2 normal --- 1 ua_bugz_gentoo@mortal-soul.de hp-cluster@gentoo.org ua_bugz_gentoo@mortal-soul.de 2006-09-13 03:39:37 0000 see summary please. more infos are available on the heartbeat mailing list: entire thread http://lists.linux-ha.org/pipermail/linux-ha/2006-September/021644.html message with patch http://lists.linux-ha.org/pipermail/linux-ha/2006-September/021662.html I have attached the patch to this bug report, just in case. Works perfectly here btw. Could someone please get this into the official ebuild? ua_bugz_gentoo@mortal-soul.de 2006-09-13 03:41:21 0000 Created an attachment (id=96862) fixes failcount fix provided by developers. xmerlin@gentoo.org 2006-09-17 15:48:39 0000 Fixed in CVS. Thanks. 96862 2006-09-13 03:41 0000 fixes failcount heartbeat-2.0.7-fix-failcount.patch text/plain CiMgSEcgY2hhbmdlc2V0IHBhdGNoCiMgVXNlciBBbmRyZXcgQmVla2hvZiA8YmVla2hvZkBnbWFp bC5jb20+CiMgRGF0ZSAxMTU4MDc3ODMwIC03MjAwCiMgTm9kZSBJRCA2MmYxYjM2MDc5NzUxZmRl ZTBlNzViY2M5MTI1NzFjNmM2MmU0YWE0CiMgUGFyZW50IGIyMWUzOWE4NDgwMzczMTE4YWM3YmJk MzNiYmNhN2M1ODdiOWY0MDgKVEU6IFVwZGF0ZSByZXNvdXJjZSBmYWlsY291bnQgaW4gYWxsIHJl cXVpcmVkIGNhc2VzCgpQcmV2aW91c2x5IHRoaXMgd2FzIG5vdCBvY2N1cmluZyB3aGVuIHRoZSBh Y3Rpb24gd2FzIG5vdAogaW4gdGhlIGxhc3QgdHJhbnNpdGlvbiBncmFwaAoKLS0tIGEvY3JtL3Rl bmdpbmUvZXZlbnRzLmMJV2VkIFNlcCAwNiAxMTo0MDo0MCAyMDA2ICswMjAwCisrKyBiL2NybS90 ZW5naW5lL2V2ZW50cy5jCVR1ZSBTZXAgMTIgMTg6MTc6MTAgMjAwNiArMDIwMApAQCAtMTk4LDUx ICsxOTgsODEgQEAgZXh0cmFjdF9ldmVudChjcm1fZGF0YV90ICptc2cpCiB9CiAKIHN0YXRpYyB2 b2lkCi11cGRhdGVfZmFpbGNvdW50KGNybV9hY3Rpb25fdCAqYWN0aW9uLCBpbnQgcmMpIAotewot CWNybV9kYXRhX3QgKnJzYyA9IE5VTEw7Cit1cGRhdGVfZmFpbGNvdW50KGNybV9kYXRhX3QgKmV2 ZW50LCBjb25zdCBjaGFyICpldmVudF9ub2RlLCBpbnQgcmMpIAorewogCWNoYXIgKmF0dHJfbmFt ZSA9IE5VTEw7CiAJCi0JY29uc3QgY2hhciAqdGFzayAgICAgPSBOVUxMOwotCWNvbnN0IGNoYXIg KnJzY19pZCAgID0gTlVMTDsKLQljb25zdCBjaGFyICpvbl9ub2RlICA9IE5VTEw7Ci0JY29uc3Qg Y2hhciAqb25fdXVpZCAgPSBOVUxMOwotCWNvbnN0IGNoYXIgKmludGVydmFsID0gTlVMTDsKKwlj aGFyICp0YXNrICAgICA9IE5VTEw7CisJY2hhciAqcnNjX2lkICAgPSBOVUxMOworCWNvbnN0IGNo YXIgKm9uX25vZGUgID0gZXZlbnRfbm9kZTsKKwljb25zdCBjaGFyICpvbl91dWlkICA9IGV2ZW50 X25vZGU7CisJaW50IGludGVydmFsID0gMDsKIAogCWlmKHJjID09IDk5KSB7CiAJCS8qIHRoaXMg aXMgYW4gaW50ZXJuYWwgY29kZSBmb3IgIndlJ3JlIGJ1c3ksIHRyeSBhZ2FpbiIgKi8KIAkJcmV0 dXJuOwogCX0KIAotCWludGVydmFsID0gZ19oYXNoX3RhYmxlX2xvb2t1cCgKLQkJYWN0aW9uLT5w YXJhbXMsIGNybV9tZXRhX25hbWUoImludGVydmFsIikpOwotCWlmKGludGVydmFsID09IE5VTEwp IHsKLQkJcmV0dXJuOwotCX0KLQotCUNSTV9DSEVDSyhhY3Rpb24tPnhtbCAhPSBOVUxMLCByZXR1 cm4pOwotCi0JcnNjID0gZmluZF94bWxfbm9kZShhY3Rpb24tPnhtbCwgWE1MX0NJQl9UQUdfUkVT T1VSQ0UsIFRSVUUpOwotCUNSTV9DSEVDSyhyc2MgIT0gTlVMTCwgcmV0dXJuKTsKLQlyc2NfaWQg PSBJRChyc2MpOwotCUNSTV9DSEVDSyhyc2NfaWQgIT0gTlVMTCwgcmV0dXJuKTsKLQkKLQl0YXNr ICAgPSBjcm1fZWxlbWVudF92YWx1ZShhY3Rpb24tPnhtbCwgWE1MX0xSTV9BVFRSX1RBU0spOwot CW9uX25vZGUgPSBjcm1fZWxlbWVudF92YWx1ZShhY3Rpb24tPnhtbCwgWE1MX0xSTV9BVFRSX1RB UkdFVCk7Ci0Jb25fdXVpZCA9IGNybV9lbGVtZW50X3ZhbHVlKGFjdGlvbi0+eG1sLCBYTUxfTFJN X0FUVFJfVEFSR0VUX1VVSUQpOwotCi0JQ1JNX0NIRUNLKHRhc2sgIT0gTlVMTCwgcmV0dXJuKTsK IAlDUk1fQ0hFQ0sob25fdXVpZCAhPSBOVUxMLCByZXR1cm4pOwotCUNSTV9DSEVDSyhvbl9ub2Rl ICE9IE5VTEwsIHJldHVybik7Ci0JCi0JYXR0cl9uYW1lID0gY3JtX2NvbmNhdCgiZmFpbC1jb3Vu dCIsIHJzY19pZCwgJy0nKTsKLQljcm1fd2FybigiVXBkYXRpbmcgZmFpbGNvdW50IGZvciAlcyBv biAlcyBhZnRlciBmYWlsZWQgJXM6IHJjPSVkIiwKLQkJIHJzY19pZCwgb25fbm9kZSwgdGFzaywg cmMpOwotCQotCXVwZGF0ZV9hdHRyKHRlX2NpYl9jb25uLCBjaWJfbm9uZSwgWE1MX0NJQl9UQUdf U1RBVFVTLAotCQkgICAgb25fdXVpZCwgTlVMTCxOVUxMLCBhdHRyX25hbWUsIFhNTF9OVlBBSVJf QVRUUl9WQUxVRSIrKyIpOwotCQotCWNybV9mcmVlKGF0dHJfbmFtZSk7CQorCisJQ1JNX0NIRUNL KHBhcnNlX29wX2tleShJRChldmVudCksICZyc2NfaWQsICZ0YXNrLCAmaW50ZXJ2YWwpLHJldHVy bik7CisJQ1JNX0NIRUNLKHRhc2sgIT0gTlVMTCwgY3JtX2ZyZWUocnNjX2lkKTsgcmV0dXJuKTsK KwlDUk1fQ0hFQ0socnNjX2lkICE9IE5VTEwsIGNybV9mcmVlKHRhc2spOyByZXR1cm4pOworCS8q IENSTV9DSEVDSyhvbl9ub2RlICE9IE5VTEwsIHJldHVybik7ICovCisJCisJaWYoaW50ZXJ2YWwg PiAwKSB7CisJCWF0dHJfbmFtZSA9IGNybV9jb25jYXQoImZhaWwtY291bnQiLCByc2NfaWQsICct Jyk7CisJCWNybV93YXJuKCJVcGRhdGluZyBmYWlsY291bnQgZm9yICVzIG9uICVzIGFmdGVyIGZh aWxlZCAlczogcmM9JWQiLAorCQkJIHJzY19pZCwgb25fbm9kZSwgdGFzaywgcmMpOworCQorCQl1 cGRhdGVfYXR0cih0ZV9jaWJfY29ubiwgY2liX25vbmUsIFhNTF9DSUJfVEFHX1NUQVRVUywKKwkJ CSAgICBvbl91dWlkLCBOVUxMLE5VTEwsIGF0dHJfbmFtZSwKKwkJCSAgICBYTUxfTlZQQUlSX0FU VFJfVkFMVUUiKysiKTsKKwkJY3JtX2ZyZWUoYXR0cl9uYW1lKTsJCisJfQorCisJY3JtX2ZyZWUo cnNjX2lkKTsKKwljcm1fZnJlZSh0YXNrKTsKK30KKworc3RhdGljIGludAorc3RhdHVzX2Zyb21f cmMoY3JtX2FjdGlvbl90ICphY3Rpb24sIGludCBvcmlnX3N0YXR1cywgaW50IHJjKQoreworCWlu dCBzdGF0dXMgPSBvcmlnX3N0YXR1czsKKwljb25zdCBjaGFyICp0YXJnZXRfcmNfcyA9IGdfaGFz aF90YWJsZV9sb29rdXAoCisJCWFjdGlvbi0+cGFyYW1zLCBjcm1fbWV0YV9uYW1lKFhNTF9BVFRS X1RFX1RBUkdFVF9SQykpOworCisJaWYodGFyZ2V0X3JjX3MgIT0gTlVMTCkgeworCQlpbnQgdGFy Z2V0X3JjID0gMDsKKwkJY3JtX2RlYnVnXzIoIlRhcmdldCByYzogJXMgdnMuICVkIiwgdGFyZ2V0 X3JjX3MsIHJjKTsKKwkJdGFyZ2V0X3JjID0gY3JtX3BhcnNlX2ludCh0YXJnZXRfcmNfcywgTlVM TCk7CisJCWlmKHRhcmdldF9yYyA9PSByYykgeworCQkJY3JtX2RlYnVnXzIoIlRhcmdldCByYzog PT0gJWQiLCByYyk7CisJCQlpZihzdGF0dXMgIT0gTFJNX09QX0RPTkUpIHsKKwkJCQljcm1fZGVi dWdfMigiUmUtbWFwcGluZyBvcCBzdGF0dXMgdG8iCisJCQkJCSAgICAiIExSTV9PUF9ET05FIGZv ciByYz0lZCIsIHJjKTsKKwkJCQlzdGF0dXMgPSBMUk1fT1BfRE9ORTsKKwkJCX0KKwkJfSBlbHNl IHsKKwkJCWNybV9kZWJ1Z18yKCJUYXJnZXQgcmM6ICE9ICVkIiwgcmMpOworCQkJaWYoc3RhdHVz ICE9IExSTV9PUF9FUlJPUikgeworCQkJCWNybV9pbmZvKCJSZS1tYXBwaW5nIG9wIHN0YXR1cyB0 byIKKwkJCQkJICIgTFJNX09QX0VSUk9SIGZvciByYz0lZCIsIHJjKTsKKwkJCQlzdGF0dXMgPSBM Uk1fT1BfRVJST1I7CisJCQl9CisJCX0KKwl9CisJCisJLyogOTkgaXMgdGhlIGNvZGUgd2UgdXNl IGZvciBkaXJlY3QgbmFjaydzICovCisJaWYocmMgIT0gOTkgJiYgc3RhdHVzICE9IExSTV9PUF9E T05FKSB7CisJCWNvbnN0IGNoYXIgKnRhc2ssICp1bmFtZTsKKwkJdGFzayA9IGNybV9lbGVtZW50 X3ZhbHVlKGFjdGlvbi0+eG1sLCBYTUxfTFJNX0FUVFJfVEFTSyk7CisJCXVuYW1lICA9IGNybV9l bGVtZW50X3ZhbHVlKGFjdGlvbi0+eG1sLCBYTUxfTFJNX0FUVFJfVEFSR0VUKTsKKwkJY3JtX3dh cm4oIkFjdGlvbiAlcyBvbiAlcyBmYWlsZWQgKHRhcmdldDogJXMgdnMuIHJjOiAlZCk6ICVzIiwK KwkJCSB0YXNrLCB1bmFtZSwgdGFyZ2V0X3JjX3MsIHJjLCBvcF9zdGF0dXMydGV4dChzdGF0dXMp KTsKKwl9CisKKwlyZXR1cm4gc3RhdHVzOwogfQogCiAvKgpAQCAtMjU1LDkgKzI4NSw2IEBAIG1h dGNoX2dyYXBoX2V2ZW50KAogbWF0Y2hfZ3JhcGhfZXZlbnQoCiAJY3JtX2FjdGlvbl90ICphY3Rp b24sIGNybV9kYXRhX3QgKmV2ZW50LCBjb25zdCBjaGFyICpldmVudF9ub2RlKQogewotCWludCBs b2dfbGV2ZWxfZmFpbCA9IExPR19FUlI7Ci0JaW50IHRhcmdldF9yYyA9IDA7Ci0JY29uc3QgY2hh ciAqdGFyZ2V0X3JjX3MgPSBOVUxMOwogCWNvbnN0IGNoYXIgKmFsbG93X2ZhaWwgID0gTlVMTDsK IAljb25zdCBjaGFyICp0aGlzX2FjdGlvbiA9IE5VTEw7CiAJY29uc3QgY2hhciAqdGhpc19ub2Rl ICAgPSBOVUxMOwpAQCAtMjk2LDE1ICszMjMsMTkgQEAgbWF0Y2hfZ3JhcGhfZXZlbnQoCiAJCWNy bV9kZWJ1Z18yKCJBY3Rpb24gJWQgOiBOb2RlIG1pc21hdGNoICVzICglcykgdnMuICVzIiwKIAkJ CSAgICBhY3Rpb24tPmlkLCB0aGlzX25vZGUsIHRoaXNfdW5hbWUsIGV2ZW50X25vZGUpOwogCQly ZXR1cm4gLTE7Ci0KLQl9Ci0KKwl9CisJCiAJY3JtX2RlYnVnXzIoIk1hdGNoZWQgYWN0aW9uICgl ZCkgJXMiLCBhY3Rpb24tPmlkLCB0aGlzX2V2ZW50KTsKIAogCUNSTV9DSEVDSyhkZWNvZGVfdHJh bnNpdGlvbl9tYWdpYygKIAkJCSAgICAgICBtYWdpYywgJnVwZGF0ZV90ZV91dWlkLAogCQkJICAg ICAgICZ0cmFuc2l0aW9uX2ksICZvcF9zdGF0dXNfaSwgJm9wX3JjX2kpLCByZXR1cm4gLTIpOwog CisJb3Bfc3RhdHVzX2kgPSBzdGF0dXNfZnJvbV9yYyhhY3Rpb24sIG9wX3N0YXR1c19pLCBvcF9y Y19pKTsKKwlpZihvcF9zdGF0dXNfaSAhPSBMUk1fT1BfRE9ORSkgeworCQl1cGRhdGVfZmFpbGNv dW50KGV2ZW50LCBldmVudF9ub2RlLCBvcF9yY19pKTsKKwl9CisJCiAJaWYodHJhbnNpdGlvbl9p ID09IC0xKSB7CiAJCS8qIHdlIG5ldmVyIGV4cGVjdCB0aGVzZSAtIHJlY29tcHV0ZSAqLwogCQlj cm1fZXJyKCJEZXRlY3RlZCBhY3Rpb24gJXMgaW5pdGlhdGVkIG91dHNpZGUgb2YgYSB0cmFuc2l0 aW9uIiwKQEAgLTMzNCwyOCArMzY1LDYgQEAgbWF0Y2hfZ3JhcGhfZXZlbnQoCiAJLyogc3RvcCB0 aGlzIGV2ZW50J3MgdGltZXIgaWYgaXQgaGFkIG9uZSAqLwogCXN0b3BfdGVfdGltZXIoYWN0aW9u LT50aW1lcik7CiAJYWN0aW9uLT5jb25maXJtZWQgPSBUUlVFOwotCi0JdGFyZ2V0X3JjX3MgPSBn X2hhc2hfdGFibGVfbG9va3VwKAotCQlhY3Rpb24tPnBhcmFtcyxjcm1fbWV0YV9uYW1lKFhNTF9B VFRSX1RFX1RBUkdFVF9SQykpOwotCWlmKHRhcmdldF9yY19zICE9IE5VTEwpIHsKLQkJY3JtX2Rl YnVnXzIoIlRhcmdldCByYzogJXMgdnMuICVkIiwgdGFyZ2V0X3JjX3MsIG9wX3JjX2kpOwotCQl0 YXJnZXRfcmMgPSBjcm1fcGFyc2VfaW50KHRhcmdldF9yY19zLCBOVUxMKTsKLQkJaWYodGFyZ2V0 X3JjID09IG9wX3JjX2kpIHsKLQkJCWNybV9kZWJ1Z18yKCJUYXJnZXQgcmM6ID09ICVkIiwgb3Bf cmNfaSk7Ci0JCQlpZihvcF9zdGF0dXNfaSAhPSBMUk1fT1BfRE9ORSkgewotCQkJCWNybV9kZWJ1 Z18yKCJSZS1tYXBwaW5nIG9wIHN0YXR1cyB0byIKLQkJCQkJICAgICIgTFJNX09QX0RPTkUgZm9y ICVzIix1cGRhdGVfZXZlbnQpOwotCQkJCW9wX3N0YXR1c19pID0gTFJNX09QX0RPTkU7Ci0JCQl9 Ci0JCX0gZWxzZSB7Ci0JCQljcm1fZGVidWdfMigiVGFyZ2V0IHJjOiAhPSAlZCIsIG9wX3JjX2kp OwotCQkJaWYob3Bfc3RhdHVzX2kgIT0gTFJNX09QX0VSUk9SKSB7Ci0JCQkJY3JtX2luZm8oIlJl LW1hcHBpbmcgb3Agc3RhdHVzIHRvIgotCQkJCQkgIiBMUk1fT1BfRVJST1IgZm9yICVzIiwgdXBk YXRlX2V2ZW50KTsKLQkJCQlvcF9zdGF0dXNfaSA9IExSTV9PUF9FUlJPUjsKLQkJCX0KLQkJfQot CX0KIAkKIAkvKiBQcm9jZXNzIE9QIHN0YXR1cyAqLwogCXN3aXRjaChvcF9zdGF0dXNfaSkgewpA QCAtMzcxLDE4ICszODAsOSBAQCBtYXRjaF9ncmFwaF9ldmVudCgKIAkJY2FzZSBMUk1fT1BfRE9O RToKIAkJCWJyZWFrOwogCQljYXNlIExSTV9PUF9FUlJPUjoKLQkJCS8qIFRoaXMgaXMgdGhlIGNv ZGUgd2UgdXNlIGZvciBkaXJlY3QgbmFjaydzICovCi0JCQlpZihvcF9yY19pID09IDk5KSB7Ci0J CQkJbG9nX2xldmVsX2ZhaWwgPSBMT0dfV0FSTklORzsKLQkJCX0KLQkJCS8qIGZhbGwgdGhyb3Vn aCAqLwogCQljYXNlIExSTV9PUF9USU1FT1VUOgogCQljYXNlIExSTV9PUF9OT1RTVVBQT1JURUQ6 CiAJCQlhY3Rpb24tPmZhaWxlZCA9IFRSVUU7Ci0JCQljcm1fbG9nX21heWJlKGxvZ19sZXZlbF9m YWlsLAotCQkJCSJBY3Rpb24gJXMgb24gJXMgZmFpbGVkICh0YXJnZXQ6ICVkIHZzLiByYzogJWQp OiAlcyIsCi0JCQkJdXBkYXRlX2V2ZW50LCB0aGlzX3VuYW1lLCB0YXJnZXRfcmMsCi0JCQkJb3Bf cmNfaSwgb3Bfc3RhdHVzMnRleHQob3Bfc3RhdHVzX2kpKTsKIAkJCWJyZWFrOwogCQljYXNlIExS TV9PUF9DQU5DRUxMRUQ6CiAJCQkvKiBkbyBub3RoaW5nPz8gKi8KQEAgLTQwNSwxMCArNDA1LDYg QEAgbWF0Y2hfZ3JhcGhfZXZlbnQoCiAJfQogCiAJaWYoYWN0aW9uLT5mYWlsZWQpIHsKLQkJLyog aWdub3JlIHByb2JlcyAqLwotCQlpZih0YXJnZXRfcmMgIT0gRVhFQ1JBX05PVF9SVU5OSU5HKSB7 Ci0JCQl1cGRhdGVfZmFpbGNvdW50KGFjdGlvbiwgb3BfcmNfaSk7Ci0JCX0KIAkJYWJvcnRfdHJh bnNpdGlvbihhY3Rpb24tPnN5bmFwc2UtPnByaW9yaXR5KzEsCiAJCQkJIHRnX3Jlc3RhcnQsICJF dmVudCBmYWlsZWQiLCBldmVudCk7CiAKQEAgLTU0NCw2ICs1NDAsOSBAQCBwcm9jZXNzX2dyYXBo X2V2ZW50KGNybV9kYXRhX3QgKmV2ZW50LCBjCiAJLyogdW5leHBlY3RlZCBldmVudCwgdHJpZ2dl ciBhIHBlLXJlY29tcHV0ZSAqLwogCS8qIHBvc3NpYmx5IGRvIHRoaXMgb25seSBmb3IgY2VydGFp biB0eXBlcyBvZiBhY3Rpb25zICovCiAJY3JtX3dhcm4oIkV2ZW50IG5vdCBmb3VuZC4iKTsKKwlp ZihyYyAhPSBFWEVDUkFfT0spIHsKKwkJdXBkYXRlX2ZhaWxjb3VudChldmVudCwgZXZlbnRfbm9k ZSwgcmMpOworCX0KIAljcm1fbG9nX3htbF9pbmZvKGV2ZW50LCAibWF0Y2g6bm90LWZvdW5kIik7 CiAJYWJvcnRfdHJhbnNpdGlvbihJTkZJTklUWSwgdGdfcmVzdGFydCwgIlVuZXhwZWN0ZWQgZXZl bnQiLCBldmVudCk7CiAJcmV0dXJuOwoK