141191 2015-02-02 22:12:23 -0800 [Win] Attempt to improve reliability of HTTP service 2015-02-03 09:39:03 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham ap bfulgham commit-queue glenn rniwa oldest_to_newest 1066371 0 bfulgham 2015-02-02 22:12:23 -0800 The Windows test bots are periodically getting stuck in a mode where the httpd server is leaving a pidfile around. When this happens on Windows, the existing recovery code doesn't really work properly; I think this is primarily because webkitpy doesn't provide code to check for a running Windows PID, so the fallback code that tries to decide if a server is really running is just a no-op. This patch does two things: 1. Instead of using the Cygwin /tmp folder to hold the PID file, it switches to using the XAMPP's standard file location. Since Apache is running as a Windows Service there is some confusing interactions with Windows vs. Cygwin file ownership. I am hoping that leaving this file where the XAMPP build (and Windows service) expects it to live. 2. Since the Windows webkitpy implementation doesn't actually check whether the PID is actually running, we skip the code path where the abandoned PID file is deleted. This patch makes sure we delete the abandoned file in the case where asking httpd to stop (which will do nothing if it wasn't running) doesn't cause the file to go away. 1066375 1 245927 bfulgham 2015-02-02 22:15:29 -0800 Created attachment 245927 Patch 1066460 2 bfulgham 2015-02-03 09:39:03 -0800 Committed r179550: <http://trac.webkit.org/changeset/179550> 245927 2015-02-02 22:15:29 -0800 2015-02-03 08:46:29 -0800 Patch bug-141191-20150202222235.patch text/plain 2254 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3OTU0MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE1LTAyLTAyICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEF0dGVtcHQgdG8gaW1wcm92ZSB0aGUgcmVsaWFiaWxpdHkgb2Yg SFRUUCBzZXJ2aWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDExOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBf c2VydmVyLnB5OgorICAgICAgICAoTGF5b3V0VGVzdEFwYWNoZUh0dHBkLl9faW5pdF9fKTogVXNl IGRlZmF1bHQgWEFNUFAgcGlkZmlsZSBsb2NhdGlvbi4KKyAgICAgICAgKExheW91dFRlc3RBcGFj aGVIdHRwZC5fc3RvcF9ydW5uaW5nX3NlcnZlcik6IERlbGV0ZSB0aGUgYWJhbmRvbmVkIFBJRCBm aWxlCisgICAgICAgIHdoZW4gc3RvcHBpbmcgdGhlIHNlcnZpY2UgZG9lc24ndCBkbyBzbyBvbiBp dHMgb3duIChmb3IgV2luZG93cyBydW5zKS4KKwogMjAxNS0wMi0wMiAgU2FhbSBCYXJhdGkgIDxz YWFtYmFyYXRpMUBnbWFpbC5jb20+CiAKICAgICAgICAgQ3JlYXRlIHRlc3RzIGZvciBKU0MncyBD b250cm9sIEZsb3cgUHJvZmlsZXIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVy LnB5CShyZXZpc2lvbiAxNzk1MzEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weQkod29ya2luZyBjb3B5KQpAQCAtNzAs NyArNzAsNyBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9zZXJ2ZXJfCiAgICAg ICAgICAgICBvdXRwdXRfZGlyID0gcHJlY29tcGlsZWREcml2ZS5zdWIoIkM6Iiwgb3V0cHV0X2Rp cikKICAgICAgICAgICAgIHRlc3RfZGlyID0gcHJlY29tcGlsZWRCdWlsZGJvdC5zdWIoIkM6L2N5 Z3dpbi9ob21lL2J1aWxkYm90IiwgdGVzdF9kaXIpCiAgICAgICAgICAgICB0ZXN0X2RpciA9IHBy ZWNvbXBpbGVkRHJpdmUuc3ViKCJDOiIsIHRlc3RfZGlyKQotICAgICAgICAgICAgc2VsZi5fcGlk X2ZpbGUgPSBzZWxmLl9waWRfZmlsZS5yZXBsYWNlKCIvdG1wIiwgIkM6L2N5Z3dpbi90bXAiKQor ICAgICAgICAgICAgc2VsZi5fcGlkX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oIkM6L3hh bXBwL2FwYWNoZS9sb2dzIiwgJyVzLnBpZCcgJSBzZWxmLl9uYW1lKQogCiAgICAgICAgIGpzX3Rl c3RfcmVzb3VyY2VzX2RpciA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbih0ZXN0X2RpciwgInJlc291 cmNlcyIpCiAgICAgICAgIG1lZGlhX3Jlc291cmNlc19kaXIgPSBzZWxmLl9maWxlc3lzdGVtLmpv aW4odGVzdF9kaXIsICJtZWRpYSIpCkBAIC0xOTgsNiArMTk4LDEwIEBAIGNsYXNzIExheW91dFRl c3RBcGFjaGVIdHRwZChodHRwX3NlcnZlcl8KICAgICAgICAgIyB0aGUgc3RvcCBjb21tYW5kIHJl dHVybnMsIHNvIHdlIHdhaXQgYSBsaXR0bGUgd2hpbGUgbG9uZ2VyIGZvciB0aGUKICAgICAgICAg IyBwaWQgZmlsZSB0byBiZSByZW1vdmVkLgogICAgICAgICBpZiBub3Qgc2VsZi5fd2FpdF9mb3Jf YWN0aW9uKGxhbWJkYTogbm90IHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX3BpZF9maWxl KSk6CisgICAgICAgICAgICBpZiBzZWxmLl9wb3J0X29iai5ob3N0LnBsYXRmb3JtLmlzX3dpbigp OgorICAgICAgICAgICAgICAgIHNlbGYuX3JlbW92ZV9waWRfZmlsZSgpCisgICAgICAgICAgICAg ICAgcmV0dXJuCisKICAgICAgICAgICAgIHJhaXNlIGh0dHBfc2VydmVyX2Jhc2UuU2VydmVyRXJy b3IoJ0ZhaWxlZCB0byBzdG9wICVzOiBwaWQgZmlsZSBzdGlsbCBleGlzdHMnICUgc2VsZi5fbmFt ZSkKIAogICAgIGRlZiBfcnVuKHNlbGYsIGNtZCk6Cg==